diff --git a/pom.xml b/pom.xml index 44fc6373b..669adb035 100644 --- a/pom.xml +++ b/pom.xml @@ -220,6 +220,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common + productManager pom diff --git a/productManager/pom.xml b/productManager/pom.xml new file mode 100644 index 000000000..4359307df --- /dev/null +++ b/productManager/pom.xml @@ -0,0 +1,33 @@ + + + + ruoyi + com.ruoyi + 3.7.0 + + 4.0.0 + + productManager + + + org.springframework + spring-web + 5.3.10 + compile + + + com.ruoyi + ruoyi-common + + + io.swagger + swagger-annotations + 1.6.2 + compile + + + + + \ No newline at end of file diff --git a/productManager/src/main/java/com/ruoyi/productionManager/domain/StandardInfo.java b/productManager/src/main/java/com/ruoyi/productionManager/domain/StandardInfo.java new file mode 100644 index 000000000..1e4f8aad5 --- /dev/null +++ b/productManager/src/main/java/com/ruoyi/productionManager/domain/StandardInfo.java @@ -0,0 +1,112 @@ +package com.ruoyi.productionManager.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 标准信息对象 standard_info + * + * @author ruoyi + * @date 2021-10-13 + */ +public class StandardInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 标准id */ + private Long standardId; + + /** 区域分类 */ + @Excel(name = "区域分类") + private String areaCategory; + + /** 标准名称 */ + @Excel(name = "标准名称") + private String standardName; + + /** 标准类型 */ + @Excel(name = "标准类型") + private String standardCategory; + + /** 实施日期 */ + @Excel(name = "实施日期") + private String standardBeginDate; + + /** 标准状态 */ + @Excel(name = "标准状态") + private String standardStatus; + + public void setStandardId(Long standardId) + { + this.standardId = standardId; + } + + public Long getStandardId() + { + return standardId; + } + public void setAreaCategory(String areaCategory) + { + this.areaCategory = areaCategory; + } + + public String getAreaCategory() + { + return areaCategory; + } + public void setStandardName(String standardName) + { + this.standardName = standardName; + } + + public String getStandardName() + { + return standardName; + } + public void setStandardCategory(String standardCategory) + { + this.standardCategory = standardCategory; + } + + public String getStandardCategory() + { + return standardCategory; + } + public void setStandardBeginDate(String standardBeginDate) + { + this.standardBeginDate = standardBeginDate; + } + + public String getStandardBeginDate() + { + return standardBeginDate; + } + public void setStandardStatus(String standardStatus) + { + this.standardStatus = standardStatus; + } + + public String getStandardStatus() + { + return standardStatus; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("standardId", getStandardId()) + .append("areaCategory", getAreaCategory()) + .append("standardName", getStandardName()) + .append("standardCategory", getStandardCategory()) + .append("standardBeginDate", getStandardBeginDate()) + .append("standardStatus", getStandardStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/productManager/src/main/java/com/ruoyi/productionManager/mapper/StandardInfoMapper.java b/productManager/src/main/java/com/ruoyi/productionManager/mapper/StandardInfoMapper.java new file mode 100644 index 000000000..6aa230726 --- /dev/null +++ b/productManager/src/main/java/com/ruoyi/productionManager/mapper/StandardInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.productionManager.mapper; + +import java.util.List; +import com.ruoyi.productionManager.domain.StandardInfo; + +/** + * 标准信息Mapper接口 + * + * @author ruoyi + * @date 2021-10-13 + */ +public interface StandardInfoMapper +{ + /** + * 查询标准信息 + * + * @param standardId 标准信息主键 + * @return 标准信息 + */ + public StandardInfo selectStandardInfoByStandardId(Long standardId); + + /** + * 查询标准信息列表 + * + * @param standardInfo 标准信息 + * @return 标准信息集合 + */ + public List selectStandardInfoList(StandardInfo standardInfo); + + /** + * 新增标准信息 + * + * @param standardInfo 标准信息 + * @return 结果 + */ + public int insertStandardInfo(StandardInfo standardInfo); + + /** + * 修改标准信息 + * + * @param standardInfo 标准信息 + * @return 结果 + */ + public int updateStandardInfo(StandardInfo standardInfo); + + /** + * 删除标准信息 + * + * @param standardId 标准信息主键 + * @return 结果 + */ + public int deleteStandardInfoByStandardId(Long standardId); + + /** + * 批量删除标准信息 + * + * @param standardIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteStandardInfoByStandardIds(Long[] standardIds); +} diff --git a/productManager/src/main/java/com/ruoyi/productionManager/service/IStandardInfoService.java b/productManager/src/main/java/com/ruoyi/productionManager/service/IStandardInfoService.java new file mode 100644 index 000000000..2efa5c602 --- /dev/null +++ b/productManager/src/main/java/com/ruoyi/productionManager/service/IStandardInfoService.java @@ -0,0 +1,62 @@ +package com.ruoyi.productionManager.service; + +import com.ruoyi.productionManager.domain.StandardInfo; + +import java.util.List; + +/** + * 标准信息Service接口 + * + * @author ruoyi + * @date 2021-10-13 + */ +public interface IStandardInfoService +{ + /** + * 查询标准信息 + * + * @param standardId 标准信息主键 + * @return 标准信息 + */ + public StandardInfo selectStandardInfoByStandardId(Long standardId); + + /** + * 查询标准信息列表 + * + * @param standardInfo 标准信息 + * @return 标准信息集合 + */ + public List selectStandardInfoList(StandardInfo standardInfo); + + /** + * 新增标准信息 + * + * @param standardInfo 标准信息 + * @return 结果 + */ + public int insertStandardInfo(StandardInfo standardInfo); + + /** + * 修改标准信息 + * + * @param standardInfo 标准信息 + * @return 结果 + */ + public int updateStandardInfo(StandardInfo standardInfo); + + /** + * 批量删除标准信息 + * + * @param standardIds 需要删除的标准信息主键集合 + * @return 结果 + */ + public int deleteStandardInfoByStandardIds(Long[] standardIds); + + /** + * 删除标准信息信息 + * + * @param standardId 标准信息主键 + * @return 结果 + */ + public int deleteStandardInfoByStandardId(Long standardId); +} diff --git a/productManager/src/main/java/com/ruoyi/productionManager/service/impl/StandardInfoServiceImpl.java b/productManager/src/main/java/com/ruoyi/productionManager/service/impl/StandardInfoServiceImpl.java new file mode 100644 index 000000000..168836299 --- /dev/null +++ b/productManager/src/main/java/com/ruoyi/productionManager/service/impl/StandardInfoServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.productionManager.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.productionManager.domain.StandardInfo; +import com.ruoyi.productionManager.mapper.StandardInfoMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.productionManager.service.IStandardInfoService; + +/** + * 标准信息Service业务层处理 + * + * @author ruoyi + * @date 2021-10-13 + */ +@Service +public class StandardInfoServiceImpl implements IStandardInfoService +{ + @Autowired + private StandardInfoMapper standardInfoMapper; + + /** + * 查询标准信息 + * + * @param standardId 标准信息主键 + * @return 标准信息 + */ + @Override + public StandardInfo selectStandardInfoByStandardId(Long standardId) + { + return standardInfoMapper.selectStandardInfoByStandardId(standardId); + } + + /** + * 查询标准信息列表 + * + * @param standardInfo 标准信息 + * @return 标准信息 + */ + @Override + public List selectStandardInfoList(StandardInfo standardInfo) + { + return standardInfoMapper.selectStandardInfoList(standardInfo); + } + + /** + * 新增标准信息 + * + * @param standardInfo 标准信息 + * @return 结果 + */ + @Override + public int insertStandardInfo(StandardInfo standardInfo) + { + standardInfo.setCreateTime(DateUtils.getNowDate()); + return standardInfoMapper.insertStandardInfo(standardInfo); + } + + /** + * 修改标准信息 + * + * @param standardInfo 标准信息 + * @return 结果 + */ + @Override + public int updateStandardInfo(StandardInfo standardInfo) + { + standardInfo.setUpdateTime(DateUtils.getNowDate()); + return standardInfoMapper.updateStandardInfo(standardInfo); + } + + /** + * 批量删除标准信息 + * + * @param standardIds 需要删除的标准信息主键 + * @return 结果 + */ + @Override + public int deleteStandardInfoByStandardIds(Long[] standardIds) + { + return standardInfoMapper.deleteStandardInfoByStandardIds(standardIds); + } + + /** + * 删除标准信息信息 + * + * @param standardId 标准信息主键 + * @return 结果 + */ + @Override + public int deleteStandardInfoByStandardId(Long standardId) + { + return standardInfoMapper.deleteStandardInfoByStandardId(standardId); + } +} diff --git a/productManager/src/main/resources/mapper/productionManager/StandardInfoMapper.xml b/productManager/src/main/resources/mapper/productionManager/StandardInfoMapper.xml new file mode 100644 index 000000000..5ac601caa --- /dev/null +++ b/productManager/src/main/resources/mapper/productionManager/StandardInfoMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + select standard_id, area_category, standard_name, standard_category, standard_begin_date, standard_status, create_by, create_time, update_by, update_time, remark from standard_info + + + + + + + + insert into standard_info + + area_category, + standard_name, + standard_category, + standard_begin_date, + standard_status, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{areaCategory}, + #{standardName}, + #{standardCategory}, + #{standardBeginDate}, + #{standardStatus}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update standard_info + + area_category = #{areaCategory}, + standard_name = #{standardName}, + standard_category = #{standardCategory}, + standard_begin_date = #{standardBeginDate}, + standard_status = #{standardStatus}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where standard_id = #{standardId} + + + + delete from standard_info where standard_id = #{standardId} + + + + delete from standard_info where standard_id in + + #{standardId} + + + \ No newline at end of file diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 1d1d687b4..be081bc7d 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -60,6 +60,12 @@ com.ruoyi ruoyi-generator + + com.ruoyi + productManager + 3.7.0 + compile + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/productionManager/StandardInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/productionManager/StandardInfoController.java new file mode 100644 index 000000000..a9199d32b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/productionManager/StandardInfoController.java @@ -0,0 +1,103 @@ +package com.ruoyi.web.controller.productionManager; + +import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.productionManager.domain.StandardInfo; +import com.ruoyi.productionManager.service.IStandardInfoService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 标准信息Controller + * + * @author ruoyi + * @date 2021-10-13 + */ +@RestController +@RequestMapping("/productionManager/standard") +public class StandardInfoController extends BaseController +{ + @Autowired + private IStandardInfoService standardInfoService; + + /** + * 查询标准信息列表 + */ + @PreAuthorize("@ss.hasPermi('productionManager:standard:list')") + @GetMapping("/list") + public TableDataInfo list(StandardInfo standardInfo) + { + startPage(); + List list = standardInfoService.selectStandardInfoList(standardInfo); + return getDataTable(list); + } + + /** + * 导出标准信息列表 + */ + @PreAuthorize("@ss.hasPermi('productionManager:standard:export')") + @Log(title = "标准信息", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(StandardInfo standardInfo) + { + List list = standardInfoService.selectStandardInfoList(standardInfo); + ExcelUtil util = new ExcelUtil(StandardInfo.class); + return util.exportExcel(list, "标准信息数据"); + } + + /** + * 获取标准信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('productionManager:standard:query')") + @GetMapping(value = "/{standardId}") + public AjaxResult getInfo(@PathVariable("standardId") Long standardId) + { + return AjaxResult.success(standardInfoService.selectStandardInfoByStandardId(standardId)); + } + + /** + * 新增标准信息 + */ + @PreAuthorize("@ss.hasPermi('productionManager:standard:add')") + @Log(title = "标准信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody StandardInfo standardInfo) + { + return toAjax(standardInfoService.insertStandardInfo(standardInfo)); + } + + /** + * 修改标准信息 + */ + @PreAuthorize("@ss.hasPermi('productionManager:standard:edit')") + @Log(title = "标准信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody StandardInfo standardInfo) + { + return toAjax(standardInfoService.updateStandardInfo(standardInfo)); + } + + /** + * 删除标准信息 + */ + @PreAuthorize("@ss.hasPermi('productionManager:standard:remove')") + @Log(title = "标准信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{standardIds}") + public AjaxResult remove(@PathVariable Long[] standardIds) + { + return toAjax(standardInfoService.deleteStandardInfoByStandardIds(standardIds)); + } +} diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml index 4544c8c24..9f3372f58 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/ruoyi-generator/src/main/resources/generator.yml @@ -3,7 +3,7 @@ gen: # 作者 author: ruoyi # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system + packageName: com.ruoyi.productionManager # 自动去除表前缀，默认是false autoRemovePre: false # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）