From 6c8a0a6e8e2926cdec01ad9652ef419ee073af0e Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Tue, 17 May 2022 21:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C-=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/qc/controller/QcIndexController.java | 118 ++++++++++++++ .../java/com/ktg/mes/qc/domain/QcIndex.java | 150 ++++++++++++++++++ .../com/ktg/mes/qc/mapper/QcIndexMapper.java | 66 ++++++++ .../ktg/mes/qc/service/IQcIndexService.java | 77 +++++++++ .../qc/service/impl/QcIndexServiceImpl.java | 119 ++++++++++++++ .../resources/mapper/qc/QcIndexMapper.xml | 117 ++++++++++++++ 6 files changed, 647 insertions(+) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIndexController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIndexMapper.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIndexService.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIndexServiceImpl.java create mode 100644 ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIndexController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIndexController.java new file mode 100644 index 0000000..a4f000a --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIndexController.java @@ -0,0 +1,118 @@ +package com.ktg.mes.qc.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.constant.UserConstants; +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.QcIndex; +import com.ktg.mes.qc.service.IQcIndexService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 检测项Controller + * + * @author yinjinlu + * @date 2022-05-17 + */ +@RestController +@RequestMapping("/mes/qc/qcindex") +public class QcIndexController extends BaseController +{ + @Autowired + private IQcIndexService qcIndexService; + + /** + * 查询检测项列表 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcindex:list')") + @GetMapping("/list") + public TableDataInfo list(QcIndex qcIndex) + { + startPage(); + List list = qcIndexService.selectQcIndexList(qcIndex); + return getDataTable(list); + } + + /** + * 导出检测项列表 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcindex:export')") + @Log(title = "检测项", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcIndex qcIndex) + { + List list = qcIndexService.selectQcIndexList(qcIndex); + ExcelUtil util = new ExcelUtil(QcIndex.class); + util.exportExcel(response, list, "检测项数据"); + } + + /** + * 获取检测项详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcindex:query')") + @GetMapping(value = "/{indexId}") + public AjaxResult getInfo(@PathVariable("indexId") Long indexId) + { + return AjaxResult.success(qcIndexService.selectQcIndexByIndexId(indexId)); + } + + /** + * 新增检测项 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcindex:add')") + @Log(title = "检测项", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcIndex qcIndex) + { + if(UserConstants.NOT_UNIQUE.equals(qcIndexService.checkIndexCodeUnique(qcIndex))){ + return AjaxResult.error("检测项编号已存在！"); + } + if(UserConstants.NOT_UNIQUE.equals(qcIndexService.checkIndexNameUnique(qcIndex))){ + return AjaxResult.error("检测项名称已存在！"); + } + return toAjax(qcIndexService.insertQcIndex(qcIndex)); + } + + /** + * 修改检测项 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcindex:edit')") + @Log(title = "检测项", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcIndex qcIndex) + { + if(UserConstants.NOT_UNIQUE.equals(qcIndexService.checkIndexCodeUnique(qcIndex))){ + return AjaxResult.error("检测项编号已存在！"); + } + if(UserConstants.NOT_UNIQUE.equals(qcIndexService.checkIndexNameUnique(qcIndex))){ + return AjaxResult.error("检测项名称已存在！"); + } + return toAjax(qcIndexService.updateQcIndex(qcIndex)); + } + + /** + * 删除检测项 + */ + @PreAuthorize("@ss.hasPermi('mes:qc:qcindex:remove')") + @Log(title = "检测项", businessType = BusinessType.DELETE) + @DeleteMapping("/{indexIds}") + public AjaxResult remove(@PathVariable Long[] indexIds) + { + return toAjax(qcIndexService.deleteQcIndexByIndexIds(indexIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java new file mode 100644 index 0000000..ddd1fcc --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.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_index + * + * @author yinjinlu + * @date 2022-05-17 + */ +public class QcIndex extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 检测项ID */ + private Long indexId; + + /** 检测项编码 */ + @Excel(name = "检测项编码") + private String indexCode; + + /** 检测项名称 */ + @Excel(name = "检测项名称") + private String indexName; + + /** 检测项类型 */ + @Excel(name = "检测项类型") + private String indexType; + + /** 检测工具 */ + @Excel(name = "检测工具") + private String qcTool; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setIndexId(Long indexId) + { + this.indexId = indexId; + } + + public Long getIndexId() + { + return indexId; + } + public void setIndexCode(String indexCode) + { + this.indexCode = indexCode; + } + + public String getIndexCode() + { + return indexCode; + } + public void setIndexName(String indexName) + { + this.indexName = indexName; + } + + public String getIndexName() + { + return indexName; + } + public void setIndexType(String indexType) + { + this.indexType = indexType; + } + + public String getIndexType() + { + return indexType; + } + public void setQcTool(String qcTool) + { + this.qcTool = qcTool; + } + + public String getQcTool() + { + return qcTool; + } + 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("indexId", getIndexId()) + .append("indexCode", getIndexCode()) + .append("indexName", getIndexName()) + .append("indexType", getIndexType()) + .append("qcTool", getQcTool()) + .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/QcIndexMapper.java b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIndexMapper.java new file mode 100644 index 0000000..e27e1f1 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIndexMapper.java @@ -0,0 +1,66 @@ +package com.ktg.mes.qc.mapper; + +import java.util.List; +import com.ktg.mes.qc.domain.QcIndex; + +/** + * 检测项Mapper接口 + * + * @author yinjinlu + * @date 2022-05-17 + */ +public interface QcIndexMapper +{ + /** + * 查询检测项 + * + * @param indexId 检测项主键 + * @return 检测项 + */ + public QcIndex selectQcIndexByIndexId(Long indexId); + + /** + * 查询检测项列表 + * + * @param qcIndex 检测项 + * @return 检测项集合 + */ + public List selectQcIndexList(QcIndex qcIndex); + + + public QcIndex checkIndexCodeUnique(QcIndex qcIndex); + public QcIndex checkIndexNameUnique(QcIndex qcIndex); + + + /** + * 新增检测项 + * + * @param qcIndex 检测项 + * @return 结果 + */ + public int insertQcIndex(QcIndex qcIndex); + + /** + * 修改检测项 + * + * @param qcIndex 检测项 + * @return 结果 + */ + public int updateQcIndex(QcIndex qcIndex); + + /** + * 删除检测项 + * + * @param indexId 检测项主键 + * @return 结果 + */ + public int deleteQcIndexByIndexId(Long indexId); + + /** + * 批量删除检测项 + * + * @param indexIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcIndexByIndexIds(Long[] indexIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIndexService.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIndexService.java new file mode 100644 index 0000000..b1bc846 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIndexService.java @@ -0,0 +1,77 @@ +package com.ktg.mes.qc.service; + +import java.util.List; +import com.ktg.mes.qc.domain.QcIndex; + +/** + * 检测项Service接口 + * + * @author yinjinlu + * @date 2022-05-17 + */ +public interface IQcIndexService +{ + /** + * 查询检测项 + * + * @param indexId 检测项主键 + * @return 检测项 + */ + public QcIndex selectQcIndexByIndexId(Long indexId); + + /** + * 查询检测项列表 + * + * @param qcIndex 检测项 + * @return 检测项集合 + */ + public List selectQcIndexList(QcIndex qcIndex); + + /** + * 检测项编号是否唯一 + * @param qcIndex + * @return + */ + public String checkIndexCodeUnique(QcIndex qcIndex); + + /** + * 检测项名称是否唯一 + * @param qcIndex + * @return + */ + public String checkIndexNameUnique(QcIndex qcIndex); + + + + /** + * 新增检测项 + * + * @param qcIndex 检测项 + * @return 结果 + */ + public int insertQcIndex(QcIndex qcIndex); + + /** + * 修改检测项 + * + * @param qcIndex 检测项 + * @return 结果 + */ + public int updateQcIndex(QcIndex qcIndex); + + /** + * 批量删除检测项 + * + * @param indexIds 需要删除的检测项主键集合 + * @return 结果 + */ + public int deleteQcIndexByIndexIds(Long[] indexIds); + + /** + * 删除检测项信息 + * + * @param indexId 检测项主键 + * @return 结果 + */ + public int deleteQcIndexByIndexId(Long indexId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIndexServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIndexServiceImpl.java new file mode 100644 index 0000000..1573fa0 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIndexServiceImpl.java @@ -0,0 +1,119 @@ +package com.ktg.mes.qc.service.impl; + +import java.util.List; + +import com.ktg.common.constant.UserConstants; +import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.qc.mapper.QcIndexMapper; +import com.ktg.mes.qc.domain.QcIndex; +import com.ktg.mes.qc.service.IQcIndexService; + +/** + * 检测项Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-17 + */ +@Service +public class QcIndexServiceImpl implements IQcIndexService +{ + @Autowired + private QcIndexMapper qcIndexMapper; + + /** + * 查询检测项 + * + * @param indexId 检测项主键 + * @return 检测项 + */ + @Override + public QcIndex selectQcIndexByIndexId(Long indexId) + { + return qcIndexMapper.selectQcIndexByIndexId(indexId); + } + + /** + * 查询检测项列表 + * + * @param qcIndex 检测项 + * @return 检测项 + */ + @Override + public List selectQcIndexList(QcIndex qcIndex) + { + return qcIndexMapper.selectQcIndexList(qcIndex); + } + + @Override + public String checkIndexCodeUnique(QcIndex qcIndex) { + QcIndex index = qcIndexMapper.checkIndexCodeUnique(qcIndex); + Long indexId = qcIndex.getIndexId()==null?-1L:qcIndex.getIndexId(); + if(StringUtils.isNotNull(index) &&index.getIndexId().longValue() != indexId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + @Override + public String checkIndexNameUnique(QcIndex qcIndex) { + QcIndex index = qcIndexMapper.checkIndexNameUnique(qcIndex); + Long indexId = qcIndex.getIndexId()==null?-1L:qcIndex.getIndexId(); + if(StringUtils.isNotNull(index) &&index.getIndexId().longValue() != indexId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 新增检测项 + * + * @param qcIndex 检测项 + * @return 结果 + */ + @Override + public int insertQcIndex(QcIndex qcIndex) + { + qcIndex.setCreateTime(DateUtils.getNowDate()); + return qcIndexMapper.insertQcIndex(qcIndex); + } + + /** + * 修改检测项 + * + * @param qcIndex 检测项 + * @return 结果 + */ + @Override + public int updateQcIndex(QcIndex qcIndex) + { + qcIndex.setUpdateTime(DateUtils.getNowDate()); + return qcIndexMapper.updateQcIndex(qcIndex); + } + + /** + * 批量删除检测项 + * + * @param indexIds 需要删除的检测项主键 + * @return 结果 + */ + @Override + public int deleteQcIndexByIndexIds(Long[] indexIds) + { + return qcIndexMapper.deleteQcIndexByIndexIds(indexIds); + } + + /** + * 删除检测项信息 + * + * @param indexId 检测项主键 + * @return 结果 + */ + @Override + public int deleteQcIndexByIndexId(Long indexId) + { + return qcIndexMapper.deleteQcIndexByIndexId(indexId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml new file mode 100644 index 0000000..5f406e8 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + select index_id, index_code, index_name, index_type, qc_tool, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_index + + + + + + + + + + + + insert into qc_index + + index_code, + index_name, + index_type, + qc_tool, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{indexCode}, + #{indexName}, + #{indexType}, + #{qcTool}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update qc_index + + index_code = #{indexCode}, + index_name = #{indexName}, + index_type = #{indexType}, + qc_tool = #{qcTool}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where index_id = #{indexId} + + + + delete from qc_index where index_id = #{indexId} + + + + delete from qc_index where index_id in + + #{indexId} + + + \ No newline at end of file