From 85bdd16f04ec1c8f6601d593f776166c0b191eac Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Thu, 12 May 2022 16:27:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=99=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MdWorkstationMachineController.java | 117 +++++++++++++ .../mes/md/domain/MdWorkstationMachine.java | 164 ++++++++++++++++++ .../md/mapper/MdWorkstationMachineMapper.java | 63 +++++++ .../service/IMdWorkstationMachineService.java | 63 +++++++ .../impl/MdWorkstationMachineServiceImpl.java | 111 ++++++++++++ .../mapper/md/MdWorkstationMachineMapper.xml | 117 +++++++++++++ 6 files changed, 635 insertions(+) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationMachineController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstationMachine.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMachineMapper.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationMachineService.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationMachineServiceImpl.java create mode 100644 ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationMachineController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationMachineController.java new file mode 100644 index 0000000..7b10c96 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationMachineController.java @@ -0,0 +1,117 @@ +package com.ktg.mes.md.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.constant.UserConstants; +import com.ktg.common.utils.StringUtils; +import com.ktg.mes.md.domain.MdWorkstation; +import com.ktg.mes.md.service.IMdWorkstationService; +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.MdWorkstationMachine; +import com.ktg.mes.md.service.IMdWorkstationMachineService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 设备资源Controller + * + * @author yinjinlu + * @date 2022-05-12 + */ +@RestController +@RequestMapping("/mes/md/workstationmachine") +public class MdWorkstationMachineController extends BaseController +{ + @Autowired + private IMdWorkstationMachineService mdWorkstationMachineService; + + @Autowired + private IMdWorkstationService mdWorkstationService; + + /** + * 查询设备资源列表 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationmachine:list')") + @GetMapping("/list") + public TableDataInfo list(MdWorkstationMachine mdWorkstationMachine) + { + startPage(); + List list = mdWorkstationMachineService.selectMdWorkstationMachineList(mdWorkstationMachine); + return getDataTable(list); + } + + /** + * 导出设备资源列表 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationmachine:export')") + @Log(title = "设备资源", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MdWorkstationMachine mdWorkstationMachine) + { + List list = mdWorkstationMachineService.selectMdWorkstationMachineList(mdWorkstationMachine); + ExcelUtil util = new ExcelUtil(MdWorkstationMachine.class); + util.exportExcel(response, list, "设备资源数据"); + } + + /** + * 获取设备资源详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationmachine:query')") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") Long recordId) + { + return AjaxResult.success(mdWorkstationMachineService.selectMdWorkstationMachineByRecordId(recordId)); + } + + /** + * 新增设备资源 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationmachine:add')") + @Log(title = "设备资源", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MdWorkstationMachine mdWorkstationMachine) + { + MdWorkstationMachine machine = mdWorkstationMachineService.checkMachineryExists(mdWorkstationMachine); + if(StringUtils.isNotNull(machine)){ + MdWorkstation workstation = mdWorkstationService.selectMdWorkstationByWorkstationId(machine.getWorkstationId()); + return AjaxResult.error("设备已分配至工作站:"+workstation.getWorkstationName()); + } + return toAjax(mdWorkstationMachineService.insertMdWorkstationMachine(mdWorkstationMachine)); + } + + /** + * 修改设备资源 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationmachine:edit')") + @Log(title = "设备资源", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MdWorkstationMachine mdWorkstationMachine) + { + return toAjax(mdWorkstationMachineService.updateMdWorkstationMachine(mdWorkstationMachine)); + } + + /** + * 删除设备资源 + */ + @PreAuthorize("@ss.hasPermi('mes:md:workstationmachine:remove')") + @Log(title = "设备资源", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable Long[] recordIds) + { + return toAjax(mdWorkstationMachineService.deleteMdWorkstationMachineByRecordIds(recordIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstationMachine.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstationMachine.java new file mode 100644 index 0000000..280053e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkstationMachine.java @@ -0,0 +1,164 @@ +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_machine + * + * @author yinjinlu + * @date 2022-05-12 + */ +public class MdWorkstationMachine extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 记录ID */ + private Long recordId; + + /** 工作站ID */ + @Excel(name = "工作站ID") + private Long workstationId; + + /** 设备ID */ + @Excel(name = "设备ID") + private Long machineryId; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String machineryCode; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String machineryName; + + /** 数量 */ + @Excel(name = "数量") + private Integer quantity; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setRecordId(Long recordId) + { + this.recordId = recordId; + } + + public Long getRecordId() + { + return recordId; + } + public void setWorkstationId(Long workstationId) + { + this.workstationId = workstationId; + } + + public Long getWorkstationId() + { + return workstationId; + } + public void setMachineryId(Long machineryId) + { + this.machineryId = machineryId; + } + + public Long getMachineryId() + { + return machineryId; + } + public void setMachineryCode(String machineryCode) + { + this.machineryCode = machineryCode; + } + + public String getMachineryCode() + { + return machineryCode; + } + public void setMachineryName(String machineryName) + { + this.machineryName = machineryName; + } + + public String getMachineryName() + { + return machineryName; + } + public void setQuantity(Integer quantity) + { + this.quantity = quantity; + } + + public Integer getQuantity() + { + return quantity; + } + 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("recordId", getRecordId()) + .append("workstationId", getWorkstationId()) + .append("machineryId", getMachineryId()) + .append("machineryCode", getMachineryCode()) + .append("machineryName", getMachineryName()) + .append("quantity", getQuantity()) + .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/MdWorkstationMachineMapper.java b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMachineMapper.java new file mode 100644 index 0000000..9eb61bb --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/mapper/MdWorkstationMachineMapper.java @@ -0,0 +1,63 @@ +package com.ktg.mes.md.mapper; + +import java.util.List; +import com.ktg.mes.md.domain.MdWorkstationMachine; + +/** + * 设备资源Mapper接口 + * + * @author yinjinlu + * @date 2022-05-12 + */ +public interface MdWorkstationMachineMapper +{ + /** + * 查询设备资源 + * + * @param recordId 设备资源主键 + * @return 设备资源 + */ + public MdWorkstationMachine selectMdWorkstationMachineByRecordId(Long recordId); + + /** + * 查询设备资源列表 + * + * @param mdWorkstationMachine 设备资源 + * @return 设备资源集合 + */ + public List selectMdWorkstationMachineList(MdWorkstationMachine mdWorkstationMachine); + + public MdWorkstationMachine checkMachineryExists(MdWorkstationMachine mdWorkstationMachine); + + /** + * 新增设备资源 + * + * @param mdWorkstationMachine 设备资源 + * @return 结果 + */ + public int insertMdWorkstationMachine(MdWorkstationMachine mdWorkstationMachine); + + /** + * 修改设备资源 + * + * @param mdWorkstationMachine 设备资源 + * @return 结果 + */ + public int updateMdWorkstationMachine(MdWorkstationMachine mdWorkstationMachine); + + /** + * 删除设备资源 + * + * @param recordId 设备资源主键 + * @return 结果 + */ + public int deleteMdWorkstationMachineByRecordId(Long recordId); + + /** + * 批量删除设备资源 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMdWorkstationMachineByRecordIds(Long[] recordIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationMachineService.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationMachineService.java new file mode 100644 index 0000000..60eff4f --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/IMdWorkstationMachineService.java @@ -0,0 +1,63 @@ +package com.ktg.mes.md.service; + +import java.util.List; +import com.ktg.mes.md.domain.MdWorkstationMachine; + +/** + * 设备资源Service接口 + * + * @author yinjinlu + * @date 2022-05-12 + */ +public interface IMdWorkstationMachineService +{ + /** + * 查询设备资源 + * + * @param recordId 设备资源主键 + * @return 设备资源 + */ + public MdWorkstationMachine selectMdWorkstationMachineByRecordId(Long recordId); + + /** + * 查询设备资源列表 + * + * @param mdWorkstationMachine 设备资源 + * @return 设备资源集合 + */ + public List selectMdWorkstationMachineList(MdWorkstationMachine mdWorkstationMachine); + + public MdWorkstationMachine checkMachineryExists(MdWorkstationMachine mdWorkstationMachine); + + /** + * 新增设备资源 + * + * @param mdWorkstationMachine 设备资源 + * @return 结果 + */ + public int insertMdWorkstationMachine(MdWorkstationMachine mdWorkstationMachine); + + /** + * 修改设备资源 + * + * @param mdWorkstationMachine 设备资源 + * @return 结果 + */ + public int updateMdWorkstationMachine(MdWorkstationMachine mdWorkstationMachine); + + /** + * 批量删除设备资源 + * + * @param recordIds 需要删除的设备资源主键集合 + * @return 结果 + */ + public int deleteMdWorkstationMachineByRecordIds(Long[] recordIds); + + /** + * 删除设备资源信息 + * + * @param recordId 设备资源主键 + * @return 结果 + */ + public int deleteMdWorkstationMachineByRecordId(Long recordId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationMachineServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationMachineServiceImpl.java new file mode 100644 index 0000000..55d157e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/MdWorkstationMachineServiceImpl.java @@ -0,0 +1,111 @@ +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.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.md.mapper.MdWorkstationMachineMapper; +import com.ktg.mes.md.domain.MdWorkstationMachine; +import com.ktg.mes.md.service.IMdWorkstationMachineService; + +/** + * 设备资源Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-12 + */ +@Service +public class MdWorkstationMachineServiceImpl implements IMdWorkstationMachineService +{ + @Autowired + private MdWorkstationMachineMapper mdWorkstationMachineMapper; + + /** + * 查询设备资源 + * + * @param recordId 设备资源主键 + * @return 设备资源 + */ + @Override + public MdWorkstationMachine selectMdWorkstationMachineByRecordId(Long recordId) + { + return mdWorkstationMachineMapper.selectMdWorkstationMachineByRecordId(recordId); + } + + /** + * 查询设备资源列表 + * + * @param mdWorkstationMachine 设备资源 + * @return 设备资源 + */ + @Override + public List selectMdWorkstationMachineList(MdWorkstationMachine mdWorkstationMachine) + { + return mdWorkstationMachineMapper.selectMdWorkstationMachineList(mdWorkstationMachine); + } + + /** + * 检查机器资源是否已经被占用 + * 一台机器只能被分配到一个工作站中，且只能分配一次 + * @param mdWorkstationMachine + * @return + */ + @Override + public MdWorkstationMachine checkMachineryExists(MdWorkstationMachine mdWorkstationMachine) { + MdWorkstationMachine machine = mdWorkstationMachineMapper.checkMachineryExists(mdWorkstationMachine); + return machine; + } + + /** + * 新增设备资源 + * + * @param mdWorkstationMachine 设备资源 + * @return 结果 + */ + @Override + public int insertMdWorkstationMachine(MdWorkstationMachine mdWorkstationMachine) + { + mdWorkstationMachine.setCreateTime(DateUtils.getNowDate()); + return mdWorkstationMachineMapper.insertMdWorkstationMachine(mdWorkstationMachine); + } + + /** + * 修改设备资源 + * + * @param mdWorkstationMachine 设备资源 + * @return 结果 + */ + @Override + public int updateMdWorkstationMachine(MdWorkstationMachine mdWorkstationMachine) + { + mdWorkstationMachine.setUpdateTime(DateUtils.getNowDate()); + return mdWorkstationMachineMapper.updateMdWorkstationMachine(mdWorkstationMachine); + } + + /** + * 批量删除设备资源 + * + * @param recordIds 需要删除的设备资源主键 + * @return 结果 + */ + @Override + public int deleteMdWorkstationMachineByRecordIds(Long[] recordIds) + { + return mdWorkstationMachineMapper.deleteMdWorkstationMachineByRecordIds(recordIds); + } + + /** + * 删除设备资源信息 + * + * @param recordId 设备资源主键 + * @return 结果 + */ + @Override + public int deleteMdWorkstationMachineByRecordId(Long recordId) + { + return mdWorkstationMachineMapper.deleteMdWorkstationMachineByRecordId(recordId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml new file mode 100644 index 0000000..0e43a38 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + select record_id, workstation_id, machinery_id, machinery_code, machinery_name, quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workstation_machine + + + + + + + + + + insert into md_workstation_machine + + workstation_id, + machinery_id, + machinery_code, + machinery_name, + quantity, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{workstationId}, + #{machineryId}, + #{machineryCode}, + #{machineryName}, + #{quantity}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update md_workstation_machine + + workstation_id = #{workstationId}, + machinery_id = #{machineryId}, + machinery_code = #{machineryCode}, + machinery_name = #{machineryName}, + quantity = #{quantity}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where record_id = #{recordId} + + + + delete from md_workstation_machine where record_id = #{recordId} + + + + delete from md_workstation_machine where record_id in + + #{recordId} + + + \ No newline at end of file