diff --git a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java index 929c6bc..9bb9a64 100644 --- a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java +++ b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java @@ -83,6 +83,7 @@ public class UserConstants public static final String ITEM_CODE ="ITEM_CODE"; public static final String MACHINERY_TYPE_CODE="MACHINERY_TYPE_CODE"; public static final String TASK_CODE="TASK_CODE"; + public static final String DEFECT_CODE = "DEFECT_CODE"; /** diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcDefectController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcDefectController.java new file mode 100644 index 0000000..6230ff6 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcDefectController.java @@ -0,0 +1,111 @@ +package com.ktg.mes.qc.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.constant.UserConstants; +import com.ktg.system.strategy.AutoCodeUtil; +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.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.qc.domain.QcDefect; +import com.ktg.mes.qc.service.IQcDefectService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 常见缺陷Controller + * + * @author yinjinlu + * @date 2022-05-19 + */ +@RestController +@RequestMapping("/mes/qc/qcdefect") +public class QcDefectController extends BaseController +{ + @Autowired + private IQcDefectService qcDefectService; + + @Autowired + private AutoCodeUtil autoCodeUtil; + + /** + * 查询常见缺陷列表 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:list')") + @GetMapping("/list") + public TableDataInfo list(QcDefect qcDefect) + { + startPage(); + List list = qcDefectService.selectQcDefectList(qcDefect); + return getDataTable(list); + } + + /** + * 导出常见缺陷列表 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:export')") + @Log(title = "常见缺陷", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcDefect qcDefect) + { + List list = qcDefectService.selectQcDefectList(qcDefect); + ExcelUtil util = new ExcelUtil(QcDefect.class); + util.exportExcel(response, list, "常见缺陷数据"); + } + + /** + * 获取常见缺陷详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:query')") + @GetMapping(value = "/{defectId}") + public AjaxResult getInfo(@PathVariable("defectId") Long defectId) + { + return AjaxResult.success(qcDefectService.selectQcDefectByDefectId(defectId)); + } + + /** + * 新增常见缺陷 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:add')") + @Log(title = "常见缺陷", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcDefect qcDefect) + { + qcDefect.setDefectCode(autoCodeUtil.genSerialCode(UserConstants.DEFECT_CODE,null)); + return toAjax(qcDefectService.insertQcDefect(qcDefect)); + } + + /** + * 修改常见缺陷 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:edit')") + @Log(title = "常见缺陷", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcDefect qcDefect) + { + return toAjax(qcDefectService.updateQcDefect(qcDefect)); + } + + /** + * 删除常见缺陷 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:remove')") + @Log(title = "常见缺陷", businessType = BusinessType.DELETE) + @DeleteMapping("/{defectIds}") + public AjaxResult remove(@PathVariable Long[] defectIds) + { + return toAjax(qcDefectService.deleteQcDefectByDefectIds(defectIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcDefect.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcDefect.java new file mode 100644 index 0000000..6920af1 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcDefect.java @@ -0,0 +1,150 @@ +package com.ktg.mes.qc.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 常见缺陷对象 qc_defect + * + * @author yinjinlu + * @date 2022-05-19 + */ +public class QcDefect extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 缺陷ID */ + private Long defectId; + + /** 缺陷编码 */ + @Excel(name = "缺陷编码") + private String defectCode; + + /** 缺陷描述 */ + @Excel(name = "缺陷描述") + private String defectName; + + /** 检测项类型 */ + @Excel(name = "检测项类型") + private String indexType; + + /** 缺陷等级 */ + @Excel(name = "缺陷等级") + private String defectLevel; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setDefectId(Long defectId) + { + this.defectId = defectId; + } + + public Long getDefectId() + { + return defectId; + } + public void setDefectCode(String defectCode) + { + this.defectCode = defectCode; + } + + public String getDefectCode() + { + return defectCode; + } + public void setDefectName(String defectName) + { + this.defectName = defectName; + } + + public String getDefectName() + { + return defectName; + } + public void setIndexType(String indexType) + { + this.indexType = indexType; + } + + public String getIndexType() + { + return indexType; + } + public void setDefectLevel(String defectLevel) + { + this.defectLevel = defectLevel; + } + + public String getDefectLevel() + { + return defectLevel; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("defectId", getDefectId()) + .append("defectCode", getDefectCode()) + .append("defectName", getDefectName()) + .append("indexType", getIndexType()) + .append("defectLevel", getDefectLevel()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcDefectMapper.java b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcDefectMapper.java new file mode 100644 index 0000000..fb3c62a --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcDefectMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.qc.mapper; + +import java.util.List; +import com.ktg.mes.qc.domain.QcDefect; + +/** + * 常见缺陷Mapper接口 + * + * @author yinjinlu + * @date 2022-05-19 + */ +public interface QcDefectMapper +{ + /** + * 查询常见缺陷 + * + * @param defectId 常见缺陷主键 + * @return 常见缺陷 + */ + public QcDefect selectQcDefectByDefectId(Long defectId); + + /** + * 查询常见缺陷列表 + * + * @param qcDefect 常见缺陷 + * @return 常见缺陷集合 + */ + public List selectQcDefectList(QcDefect qcDefect); + + /** + * 新增常见缺陷 + * + * @param qcDefect 常见缺陷 + * @return 结果 + */ + public int insertQcDefect(QcDefect qcDefect); + + /** + * 修改常见缺陷 + * + * @param qcDefect 常见缺陷 + * @return 结果 + */ + public int updateQcDefect(QcDefect qcDefect); + + /** + * 删除常见缺陷 + * + * @param defectId 常见缺陷主键 + * @return 结果 + */ + public int deleteQcDefectByDefectId(Long defectId); + + /** + * 批量删除常见缺陷 + * + * @param defectIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcDefectByDefectIds(Long[] defectIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcDefectService.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcDefectService.java new file mode 100644 index 0000000..899da08 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcDefectService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.qc.service; + +import java.util.List; +import com.ktg.mes.qc.domain.QcDefect; + +/** + * 常见缺陷Service接口 + * + * @author yinjinlu + * @date 2022-05-19 + */ +public interface IQcDefectService +{ + /** + * 查询常见缺陷 + * + * @param defectId 常见缺陷主键 + * @return 常见缺陷 + */ + public QcDefect selectQcDefectByDefectId(Long defectId); + + /** + * 查询常见缺陷列表 + * + * @param qcDefect 常见缺陷 + * @return 常见缺陷集合 + */ + public List selectQcDefectList(QcDefect qcDefect); + + /** + * 新增常见缺陷 + * + * @param qcDefect 常见缺陷 + * @return 结果 + */ + public int insertQcDefect(QcDefect qcDefect); + + /** + * 修改常见缺陷 + * + * @param qcDefect 常见缺陷 + * @return 结果 + */ + public int updateQcDefect(QcDefect qcDefect); + + /** + * 批量删除常见缺陷 + * + * @param defectIds 需要删除的常见缺陷主键集合 + * @return 结果 + */ + public int deleteQcDefectByDefectIds(Long[] defectIds); + + /** + * 删除常见缺陷信息 + * + * @param defectId 常见缺陷主键 + * @return 结果 + */ + public int deleteQcDefectByDefectId(Long defectId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcDefectServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcDefectServiceImpl.java new file mode 100644 index 0000000..f3ff4d6 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcDefectServiceImpl.java @@ -0,0 +1,96 @@ +package com.ktg.mes.qc.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.qc.mapper.QcDefectMapper; +import com.ktg.mes.qc.domain.QcDefect; +import com.ktg.mes.qc.service.IQcDefectService; + +/** + * 常见缺陷Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-19 + */ +@Service +public class QcDefectServiceImpl implements IQcDefectService +{ + @Autowired + private QcDefectMapper qcDefectMapper; + + /** + * 查询常见缺陷 + * + * @param defectId 常见缺陷主键 + * @return 常见缺陷 + */ + @Override + public QcDefect selectQcDefectByDefectId(Long defectId) + { + return qcDefectMapper.selectQcDefectByDefectId(defectId); + } + + /** + * 查询常见缺陷列表 + * + * @param qcDefect 常见缺陷 + * @return 常见缺陷 + */ + @Override + public List selectQcDefectList(QcDefect qcDefect) + { + return qcDefectMapper.selectQcDefectList(qcDefect); + } + + /** + * 新增常见缺陷 + * + * @param qcDefect 常见缺陷 + * @return 结果 + */ + @Override + public int insertQcDefect(QcDefect qcDefect) + { + qcDefect.setCreateTime(DateUtils.getNowDate()); + return qcDefectMapper.insertQcDefect(qcDefect); + } + + /** + * 修改常见缺陷 + * + * @param qcDefect 常见缺陷 + * @return 结果 + */ + @Override + public int updateQcDefect(QcDefect qcDefect) + { + qcDefect.setUpdateTime(DateUtils.getNowDate()); + return qcDefectMapper.updateQcDefect(qcDefect); + } + + /** + * 批量删除常见缺陷 + * + * @param defectIds 需要删除的常见缺陷主键 + * @return 结果 + */ + @Override + public int deleteQcDefectByDefectIds(Long[] defectIds) + { + return qcDefectMapper.deleteQcDefectByDefectIds(defectIds); + } + + /** + * 删除常见缺陷信息 + * + * @param defectId 常见缺陷主键 + * @return 结果 + */ + @Override + public int deleteQcDefectByDefectId(Long defectId) + { + return qcDefectMapper.deleteQcDefectByDefectId(defectId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/qc/QcDefectMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcDefectMapper.xml new file mode 100644 index 0000000..881b39c --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/qc/QcDefectMapper.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + select defect_id, defect_code, defect_name, index_type, defect_level, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_defect + + + + + + + + insert into qc_defect + + defect_code, + defect_name, + index_type, + defect_level, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{defectCode}, + #{defectName}, + #{indexType}, + #{defectLevel}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update qc_defect + + defect_code = #{defectCode}, + defect_name = #{defectName}, + index_type = #{indexType}, + defect_level = #{defectLevel}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where defect_id = #{defectId} + + + + delete from qc_defect where defect_id = #{defectId} + + + + delete from qc_defect where defect_id in + + #{defectId} + + + \ No newline at end of file