From dc2b7d407018f4beebd85a3044edfdf993f2c0e8 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Tue, 10 May 2022 22:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=99=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MdWorkstationController.java | 118 +++++++++ .../com/ktg/mes/md/domain/MdWorkstation.java | 234 ++++++++++++++++++ .../mes/md/mapper/MdWorkstationMapper.java | 65 +++++ .../mes/md/service/IMdWorkstationService.java | 75 ++++++ .../impl/MdWorkstationServiceImpl.java | 120 +++++++++ .../mapper/md/MdWorkstationMapper.xml | 147 +++++++++++ 6 files changed, 759 insertions(+) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMapper.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationService.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationServiceImpl.java create mode 100644 ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java new file mode 100644 index 0000000..d28eb95 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java @@ -0,0 +1,118 @@ +package com.ktg.mes.md.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.md.domain.MdWorkstation; +import com.ktg.mes.md.service.IMdWorkstationService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 工作站Controller + * + * @author yinjinlu + * @date 2022-05-10 + */ +@RestController +@RequestMapping("/mes/md/workstation") +public class MdWorkstationController extends BaseController +{ + @Autowired + private IMdWorkstationService mdWorkstationService; + + /** + * 查询工作站列表 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstation:list')") + @GetMapping("/list") + public TableDataInfo list(MdWorkstation mdWorkstation) + { + startPage(); + List list = mdWorkstationService.selectMdWorkstationList(mdWorkstation); + return getDataTable(list); + } + + /** + * 导出工作站列表 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstation:export')") + @Log(title = "工作站", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MdWorkstation mdWorkstation) + { + List list = mdWorkstationService.selectMdWorkstationList(mdWorkstation); + ExcelUtil util = new ExcelUtil(MdWorkstation.class); + util.exportExcel(response, list, "工作站数据"); + } + + /** + * 获取工作站详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstation:query')") + @GetMapping(value = "/{workstationId}") + public AjaxResult getInfo(@PathVariable("workstationId") Long workstationId) + { + return AjaxResult.success(mdWorkstationService.selectMdWorkstationByWorkstationId(workstationId)); + } + + /** + * 新增工作站 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstation:add')") + @Log(title = "工作站", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MdWorkstation mdWorkstation) + { + if(UserConstants.NOT_UNIQUE.equals(mdWorkstationService.checkWorkStationCodeUnique(mdWorkstation))){ + return AjaxResult.error("工作站编码已存在！"); + } + if(UserConstants.NOT_UNIQUE.equals(mdWorkstationService.checkWorkStationNameUnique(mdWorkstation))){ + return AjaxResult.error("工作站名称已存在！"); + } + return toAjax(mdWorkstationService.insertMdWorkstation(mdWorkstation)); + } + + /** + * 修改工作站 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstation:edit')") + @Log(title = "工作站", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MdWorkstation mdWorkstation) + { + if(UserConstants.NOT_UNIQUE.equals(mdWorkstationService.checkWorkStationCodeUnique(mdWorkstation))){ + return AjaxResult.error("工作站编码已存在！"); + } + if(UserConstants.NOT_UNIQUE.equals(mdWorkstationService.checkWorkStationNameUnique(mdWorkstation))){ + return AjaxResult.error("工作站名称已存在！"); + } + return toAjax(mdWorkstationService.updateMdWorkstation(mdWorkstation)); + } + + /** + * 删除工作站 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstation:remove')") + @Log(title = "工作站", businessType = BusinessType.DELETE) + @DeleteMapping("/{workstationIds}") + public AjaxResult remove(@PathVariable Long[] workstationIds) + { + return toAjax(mdWorkstationService.deleteMdWorkstationByWorkstationIds(workstationIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java new file mode 100644 index 0000000..f8aa52e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstation.java @@ -0,0 +1,234 @@ +package com.ktg.mes.md.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; + +/** + * 工作站对象 md_workstation + * + * @author yinjinlu + * @date 2022-05-10 + */ +public class MdWorkstation extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 工作站ID */ + private Long workstationId; + + /** 工作站编码 */ + @Excel(name = "工作站编码") + private String workstationCode; + + /** 工作站名称 */ + @Excel(name = "工作站名称") + private String workstationName; + + /** 工作站地点 */ + @Excel(name = "工作站地点") + private String workstationAddress; + + /** 所在车间ID */ + @Excel(name = "所在车间ID") + private Long workshopId; + + /** 所在车间编码 */ + @Excel(name = "所在车间编码") + private String workshopCode; + + /** 所在车间名称 */ + @Excel(name = "所在车间名称") + private String workshopName; + + /** 工序ID */ + @Excel(name = "工序ID") + private Long processId; + + /** 工序编码 */ + @Excel(name = "工序编码") + private String processCode; + + /** 工序名称 */ + @Excel(name = "工序名称") + private String processName; + + /** 是否启用 */ + @Excel(name = "是否启用") + private String enableFlag; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setWorkstationId(Long workstationId) + { + this.workstationId = workstationId; + } + + public Long getWorkstationId() + { + return workstationId; + } + public void setWorkstationCode(String workstationCode) + { + this.workstationCode = workstationCode; + } + + public String getWorkstationCode() + { + return workstationCode; + } + public void setWorkstationName(String workstationName) + { + this.workstationName = workstationName; + } + + public String getWorkstationName() + { + return workstationName; + } + public void setWorkstationAddress(String workstationAddress) + { + this.workstationAddress = workstationAddress; + } + + public String getWorkstationAddress() + { + return workstationAddress; + } + public void setWorkshopId(Long workshopId) + { + this.workshopId = workshopId; + } + + public Long getWorkshopId() + { + return workshopId; + } + public void setWorkshopCode(String workshopCode) + { + this.workshopCode = workshopCode; + } + + public String getWorkshopCode() + { + return workshopCode; + } + public void setWorkshopName(String workshopName) + { + this.workshopName = workshopName; + } + + public String getWorkshopName() + { + return workshopName; + } + public void setProcessId(Long processId) + { + this.processId = processId; + } + + public Long getProcessId() + { + return processId; + } + public void setProcessCode(String processCode) + { + this.processCode = processCode; + } + + public String getProcessCode() + { + return processCode; + } + public void setProcessName(String processName) + { + this.processName = processName; + } + + public String getProcessName() + { + return processName; + } + public void setEnableFlag(String enableFlag) + { + this.enableFlag = enableFlag; + } + + public String getEnableFlag() + { + return enableFlag; + } + 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("workstationId", getWorkstationId()) + .append("workstationCode", getWorkstationCode()) + .append("workstationName", getWorkstationName()) + .append("workstationAddress", getWorkstationAddress()) + .append("workshopId", getWorkshopId()) + .append("workshopCode", getWorkshopCode()) + .append("workshopName", getWorkshopName()) + .append("processId", getProcessId()) + .append("processCode", getProcessCode()) + .append("processName", getProcessName()) + .append("enableFlag", getEnableFlag()) + .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/md/mapper/MdWorkstationMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMapper.java new file mode 100644 index 0000000..57b6fcd --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMapper.java @@ -0,0 +1,65 @@ +package com.ktg.mes.md.mapper; + +import java.util.List; +import com.ktg.mes.md.domain.MdWorkstation; + +/** + * 工作站Mapper接口 + * + * @author yinjinlu + * @date 2022-05-10 + */ +public interface MdWorkstationMapper +{ + /** + * 查询工作站 + * + * @param workstationId 工作站主键 + * @return 工作站 + */ + public MdWorkstation selectMdWorkstationByWorkstationId(Long workstationId); + + /** + * 查询工作站列表 + * + * @param mdWorkstation 工作站 + * @return 工作站集合 + */ + public List selectMdWorkstationList(MdWorkstation mdWorkstation); + + public MdWorkstation checkWorkStationCodeUnique(MdWorkstation mdWorkstation); + public MdWorkstation checkWorkStationNameUnique(MdWorkstation mdWorkstation); + + + /** + * 新增工作站 + * + * @param mdWorkstation 工作站 + * @return 结果 + */ + public int insertMdWorkstation(MdWorkstation mdWorkstation); + + /** + * 修改工作站 + * + * @param mdWorkstation 工作站 + * @return 结果 + */ + public int updateMdWorkstation(MdWorkstation mdWorkstation); + + /** + * 删除工作站 + * + * @param workstationId 工作站主键 + * @return 结果 + */ + public int deleteMdWorkstationByWorkstationId(Long workstationId); + + /** + * 批量删除工作站 + * + * @param workstationIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMdWorkstationByWorkstationIds(Long[] workstationIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationService.java new file mode 100644 index 0000000..ab26825 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationService.java @@ -0,0 +1,75 @@ +package com.ktg.mes.md.service; + +import java.util.List; +import com.ktg.mes.md.domain.MdWorkstation; + +/** + * 工作站Service接口 + * + * @author yinjinlu + * @date 2022-05-10 + */ +public interface IMdWorkstationService +{ + /** + * 查询工作站 + * + * @param workstationId 工作站主键 + * @return 工作站 + */ + public MdWorkstation selectMdWorkstationByWorkstationId(Long workstationId); + + /** + * 查询工作站列表 + * + * @param mdWorkstation 工作站 + * @return 工作站集合 + */ + public List selectMdWorkstationList(MdWorkstation mdWorkstation); + + /** + * 检查编码是否存在 + * @param mdWorkstation + * @return + */ + public String checkWorkStationCodeUnique(MdWorkstation mdWorkstation); + + /** + * 检查名称是否存在 + * @param mdWorkstation + * @return + */ + public String checkWorkStationNameUnique(MdWorkstation mdWorkstation); + + /** + * 新增工作站 + * + * @param mdWorkstation 工作站 + * @return 结果 + */ + public int insertMdWorkstation(MdWorkstation mdWorkstation); + + /** + * 修改工作站 + * + * @param mdWorkstation 工作站 + * @return 结果 + */ + public int updateMdWorkstation(MdWorkstation mdWorkstation); + + /** + * 批量删除工作站 + * + * @param workstationIds 需要删除的工作站主键集合 + * @return 结果 + */ + public int deleteMdWorkstationByWorkstationIds(Long[] workstationIds); + + /** + * 删除工作站信息 + * + * @param workstationId 工作站主键 + * @return 结果 + */ + public int deleteMdWorkstationByWorkstationId(Long workstationId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationServiceImpl.java new file mode 100644 index 0000000..df343e7 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationServiceImpl.java @@ -0,0 +1,120 @@ +package com.ktg.mes.md.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.apache.catalina.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.md.mapper.MdWorkstationMapper; +import com.ktg.mes.md.domain.MdWorkstation; +import com.ktg.mes.md.service.IMdWorkstationService; + +/** + * 工作站Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-10 + */ +@Service +public class MdWorkstationServiceImpl implements IMdWorkstationService +{ + @Autowired + private MdWorkstationMapper mdWorkstationMapper; + + /** + * 查询工作站 + * + * @param workstationId 工作站主键 + * @return 工作站 + */ + @Override + public MdWorkstation selectMdWorkstationByWorkstationId(Long workstationId) + { + return mdWorkstationMapper.selectMdWorkstationByWorkstationId(workstationId); + } + + /** + * 查询工作站列表 + * + * @param mdWorkstation 工作站 + * @return 工作站 + */ + @Override + public List selectMdWorkstationList(MdWorkstation mdWorkstation) + { + return mdWorkstationMapper.selectMdWorkstationList(mdWorkstation); + } + + @Override + public String checkWorkStationCodeUnique(MdWorkstation mdWorkstation) { + MdWorkstation workstation = mdWorkstationMapper.checkWorkStationCodeUnique(mdWorkstation); + Long workstationId = mdWorkstation.getWorkstationId()==null? -1L:mdWorkstation.getWorkstationId(); + if(StringUtils.isNotNull(workstation) && workstation.getWorkstationId().longValue() != workstationId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + @Override + public String checkWorkStationNameUnique(MdWorkstation mdWorkstation) { + MdWorkstation workstation = mdWorkstationMapper.checkWorkStationNameUnique(mdWorkstation); + Long workstationId = mdWorkstation.getWorkstationId()==null? -1L:mdWorkstation.getWorkstationId(); + if(StringUtils.isNotNull(workstation) && workstation.getWorkstationId().longValue() != workstationId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 新增工作站 + * + * @param mdWorkstation 工作站 + * @return 结果 + */ + @Override + public int insertMdWorkstation(MdWorkstation mdWorkstation) + { + mdWorkstation.setCreateTime(DateUtils.getNowDate()); + return mdWorkstationMapper.insertMdWorkstation(mdWorkstation); + } + + /** + * 修改工作站 + * + * @param mdWorkstation 工作站 + * @return 结果 + */ + @Override + public int updateMdWorkstation(MdWorkstation mdWorkstation) + { + mdWorkstation.setUpdateTime(DateUtils.getNowDate()); + return mdWorkstationMapper.updateMdWorkstation(mdWorkstation); + } + + /** + * 批量删除工作站 + * + * @param workstationIds 需要删除的工作站主键 + * @return 结果 + */ + @Override + public int deleteMdWorkstationByWorkstationIds(Long[] workstationIds) + { + return mdWorkstationMapper.deleteMdWorkstationByWorkstationIds(workstationIds); + } + + /** + * 删除工作站信息 + * + * @param workstationId 工作站主键 + * @return 结果 + */ + @Override + public int deleteMdWorkstationByWorkstationId(Long workstationId) + { + return mdWorkstationMapper.deleteMdWorkstationByWorkstationId(workstationId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml new file mode 100644 index 0000000..0c11774 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select workstation_id, workstation_code, workstation_name, workstation_address, workshop_id, workshop_code, workshop_name, process_id, process_code, process_name, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workstation + + + + + + + + + + + + insert into md_workstation + + workstation_code, + workstation_name, + workstation_address, + workshop_id, + workshop_code, + workshop_name, + process_id, + process_code, + process_name, + enable_flag, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{workstationCode}, + #{workstationName}, + #{workstationAddress}, + #{workshopId}, + #{workshopCode}, + #{workshopName}, + #{processId}, + #{processCode}, + #{processName}, + #{enableFlag}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update md_workstation + + workstation_code = #{workstationCode}, + workstation_name = #{workstationName}, + workstation_address = #{workstationAddress}, + workshop_id = #{workshopId}, + workshop_code = #{workshopCode}, + workshop_name = #{workshopName}, + process_id = #{processId}, + process_code = #{processCode}, + process_name = #{processName}, + enable_flag = #{enableFlag}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where workstation_id = #{workstationId} + + + + delete from md_workstation where workstation_id = #{workstationId} + + + + delete from md_workstation where workstation_id in + + #{workstationId} + + + \ No newline at end of file