From 8e4a8bb12b794c834a836d38dc440658c82cd580 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Mon, 16 Oct 2023 13:56:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/EquPlanController.java | 97 +++++ .../java/com/op/device/domain/EquPlan.java | 362 ++++++++++++++++++ .../com/op/device/mapper/EquPlanMapper.java | 61 +++ .../op/device/service/IEquPlanService.java | 60 +++ .../service/impl/EquPlanServiceImpl.java | 114 ++++++ .../resources/mapper/device/EquPlanMapper.xml | 183 +++++++++ 6 files changed, 877 insertions(+) create mode 100644 op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java new file mode 100644 index 00000000..a03f50cc --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquPlanController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquPlan; +import com.op.device.service.IEquPlanService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 计划Controller + * + * @author Open Platform + * @date 2023-10-16 + */ +@RestController +@RequestMapping("/plan") +public class EquPlanController extends BaseController { + @Autowired + private IEquPlanService equPlanService; + + /** + * 查询计划列表 + */ + @RequiresPermissions("device:plan:list") + @GetMapping("/list") + public TableDataInfo list(EquPlan equPlan) { + startPage(); + List list = equPlanService.selectEquPlanList(equPlan); + return getDataTable(list); + } + + /** + * 导出计划列表 + */ + @RequiresPermissions("device:plan:export") + @Log(title = "计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquPlan equPlan) { + List list = equPlanService.selectEquPlanList(equPlan); + ExcelUtil util = new ExcelUtil(EquPlan.class); + util.exportExcel(response, list, "计划数据"); + } + + /** + * 获取计划详细信息 + */ + @RequiresPermissions("device:plan:query") + @GetMapping(value = "/{planId}") + public AjaxResult getInfo(@PathVariable("planId") String planId) { + return success(equPlanService.selectEquPlanByPlanId(planId)); + } + + /** + * 新增计划 + */ + @RequiresPermissions("device:plan:add") + @Log(title = "计划", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquPlan equPlan) { + return toAjax(equPlanService.insertEquPlan(equPlan)); + } + + /** + * 修改计划 + */ + @RequiresPermissions("device:plan:edit") + @Log(title = "计划", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquPlan equPlan) { + return toAjax(equPlanService.updateEquPlan(equPlan)); + } + + /** + * 删除计划 + */ + @RequiresPermissions("device:plan:remove") + @Log(title = "计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{planIds}") + public AjaxResult remove(@PathVariable String[] planIds) { + return toAjax(equPlanService.deleteEquPlanByPlanIds(planIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java new file mode 100644 index 00000000..727018fa --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlan.java @@ -0,0 +1,362 @@ +package com.op.device.domain; + +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 计划对象 equ_plan + * + * @author Open Platform + * @date 2023-10-16 + */ +public class EquPlan extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String planId; + + /** 计划编码 */ + @Excel(name = "计划编码") + private String planCode; + + /** 计划名称 */ + @Excel(name = "计划名称") + private String planName; + + /** 车间 */ + @Excel(name = "车间") + private String planWorkshop; + + /** 产线 */ + @Excel(name = "产线") + private String planProdLine; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String equipmentName; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String equipmentCode; + + /** 循环周期 */ + @Excel(name = "循环周期") + private String planLoop; + + /** 循环周期类型 */ + @Excel(name = "循环周期类型") + private String planLoopType; + + /** 循环执行时间开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "循环执行时间开始", width = 30, dateFormat = "yyyy-MM-dd") + private Date planLoopStart; + + /** 循环执行时间结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "循环执行时间结束", width = 30, dateFormat = "yyyy-MM-dd") + private Date planLoopEnd; + + /** 巡检人员 */ + @Excel(name = "巡检人员") + private String planPerson; + + /** 计划状态 */ + @Excel(name = "计划状态") + private String planStatus; + + /** 是否可生产-限制 */ + @Excel(name = "是否可生产-限制") + private String planRestrict; + + /** 维护类型 */ + @Excel(name = "维护类型") + private String planType; + + /** 是否委外 */ + @Excel(name = "是否委外") + private String planOutsource; + + /** 委外工单编码 */ + @Excel(name = "委外工单编码") + private String workCode; + + /** 工厂 */ + @Excel(name = "工厂") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getPlanId() { + return planId; + } + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + + public String getPlanCode() { + return planCode; + } + public void setPlanName(String planName) { + this.planName = planName; + } + + public String getPlanName() { + return planName; + } + public void setPlanWorkshop(String planWorkshop) { + this.planWorkshop = planWorkshop; + } + + public String getPlanWorkshop() { + return planWorkshop; + } + public void setPlanProdLine(String planProdLine) { + this.planProdLine = planProdLine; + } + + public String getPlanProdLine() { + return planProdLine; + } + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentName() { + return equipmentName; + } + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getEquipmentCode() { + return equipmentCode; + } + public void setPlanLoop(String planLoop) { + this.planLoop = planLoop; + } + + public String getPlanLoop() { + return planLoop; + } + public void setPlanLoopType(String planLoopType) { + this.planLoopType = planLoopType; + } + + public String getPlanLoopType() { + return planLoopType; + } + public void setPlanLoopStart(Date planLoopStart) { + this.planLoopStart = planLoopStart; + } + + public Date getPlanLoopStart() { + return planLoopStart; + } + public void setPlanLoopEnd(Date planLoopEnd) { + this.planLoopEnd = planLoopEnd; + } + + public Date getPlanLoopEnd() { + return planLoopEnd; + } + public void setPlanPerson(String planPerson) { + this.planPerson = planPerson; + } + + public String getPlanPerson() { + return planPerson; + } + public void setPlanStatus(String planStatus) { + this.planStatus = planStatus; + } + + public String getPlanStatus() { + return planStatus; + } + public void setPlanRestrict(String planRestrict) { + this.planRestrict = planRestrict; + } + + public String getPlanRestrict() { + return planRestrict; + } + public void setPlanType(String planType) { + this.planType = planType; + } + + public String getPlanType() { + return planType; + } + public void setPlanOutsource(String planOutsource) { + this.planOutsource = planOutsource; + } + + public String getPlanOutsource() { + return planOutsource; + } + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + + public String getWorkCode() { + return workCode; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("planId", getPlanId()) + .append("planCode", getPlanCode()) + .append("planName", getPlanName()) + .append("planWorkshop", getPlanWorkshop()) + .append("planProdLine", getPlanProdLine()) + .append("equipmentName", getEquipmentName()) + .append("equipmentCode", getEquipmentCode()) + .append("planLoop", getPlanLoop()) + .append("planLoopType", getPlanLoopType()) + .append("planLoopStart", getPlanLoopStart()) + .append("planLoopEnd", getPlanLoopEnd()) + .append("planPerson", getPlanPerson()) + .append("planStatus", getPlanStatus()) + .append("planRestrict", getPlanRestrict()) + .append("planType", getPlanType()) + .append("planOutsource", getPlanOutsource()) + .append("workCode", getWorkCode()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java new file mode 100644 index 00000000..b6d5e50e --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlan; + +/** + * 计划Mapper接口 + * + * @author Open Platform + * @date 2023-10-16 + */ +public interface EquPlanMapper { + /** + * 查询计划 + * + * @param planId 计划主键 + * @return 计划 + */ + public EquPlan selectEquPlanByPlanId(String planId); + + /** + * 查询计划列表 + * + * @param equPlan 计划 + * @return 计划集合 + */ + public List selectEquPlanList(EquPlan equPlan); + + /** + * 新增计划 + * + * @param equPlan 计划 + * @return 结果 + */ + public int insertEquPlan(EquPlan equPlan); + + /** + * 修改计划 + * + * @param equPlan 计划 + * @return 结果 + */ + public int updateEquPlan(EquPlan equPlan); + + /** + * 删除计划 + * + * @param planId 计划主键 + * @return 结果 + */ + public int deleteEquPlanByPlanId(String planId); + + /** + * 批量删除计划 + * + * @param planIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanByPlanIds(String[] planIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java new file mode 100644 index 00000000..24c60365 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquPlanService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.EquPlan; + +/** + * 计划Service接口 + * + * @author Open Platform + * @date 2023-10-16 + */ +public interface IEquPlanService { + /** + * 查询计划 + * + * @param planId 计划主键 + * @return 计划 + */ + public EquPlan selectEquPlanByPlanId(String planId); + + /** + * 查询计划列表 + * + * @param equPlan 计划 + * @return 计划集合 + */ + public List selectEquPlanList(EquPlan equPlan); + + /** + * 新增计划 + * + * @param equPlan 计划 + * @return 结果 + */ + public int insertEquPlan(EquPlan equPlan); + + /** + * 修改计划 + * + * @param equPlan 计划 + * @return 结果 + */ + public int updateEquPlan(EquPlan equPlan); + + /** + * 批量删除计划 + * + * @param planIds 需要删除的计划主键集合 + * @return 结果 + */ + public int deleteEquPlanByPlanIds(String[] planIds); + + /** + * 删除计划信息 + * + * @param planId 计划主键 + * @return 结果 + */ + public int deleteEquPlanByPlanId(String planId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java new file mode 100644 index 00000000..96afd6ec --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -0,0 +1,114 @@ +package com.op.device.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquPlanMapper; +import com.op.device.domain.EquPlan; +import com.op.device.service.IEquPlanService; + +/** + * 计划Service业务层处理 + * + * @author Open Platform + * @date 2023-10-16 + */ +@Service +public class EquPlanServiceImpl implements IEquPlanService { + @Autowired + private EquPlanMapper equPlanMapper; + + /** + * 查询计划 + * + * @param planId 计划主键 + * @return 计划 + */ + @Override + @DS("#header.poolName") + public EquPlan selectEquPlanByPlanId(String planId) { + return equPlanMapper.selectEquPlanByPlanId(planId); + } + + /** + * 查询计划列表 + * + * @param equPlan 计划 + * @return 计划 + */ + @Override + @DS("#header.poolName") + public List selectEquPlanList(EquPlan equPlan) { + if (equPlan.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equPlan.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equPlan.setCreateTimeStart(formatter.format(equPlan.getCreateTimeArray().get(0))); + equPlan.setCreateTimeEnd(formatter.format(equPlan.getCreateTimeArray().get(1))); + } + } + if (equPlan.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equPlan.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equPlan.setUpdateTimeStart(formatter.format(equPlan.getUpdateTimeArray().get(0))); + equPlan.setUpdateTimeEnd(formatter.format(equPlan.getUpdateTimeArray().get(1))); + } + } + return equPlanMapper.selectEquPlanList(equPlan); + } + + /** + * 新增计划 + * + * @param equPlan 计划 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertEquPlan(EquPlan equPlan) { + equPlan.setCreateTime(DateUtils.getNowDate()); + return equPlanMapper.insertEquPlan(equPlan); + } + + /** + * 修改计划 + * + * @param equPlan 计划 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateEquPlan(EquPlan equPlan) { + equPlan.setUpdateTime(DateUtils.getNowDate()); + return equPlanMapper.updateEquPlan(equPlan); + } + + /** + * 批量删除计划 + * + * @param planIds 需要删除的计划主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquPlanByPlanIds(String[] planIds) { + return equPlanMapper.deleteEquPlanByPlanIds(planIds); + } + + /** + * 删除计划信息 + * + * @param planId 计划主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquPlanByPlanId(String planId) { + return equPlanMapper.deleteEquPlanByPlanId(planId); + } +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml new file mode 100644 index 00000000..f42a047b --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select plan_id, plan_code, plan_name, plan_workshop, plan_prod_line, equipment_name, equipment_code, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, plan_person, plan_status, plan_restrict, plan_type, plan_outsource, work_code, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan + + + + + + + + insert into equ_plan + + plan_id, + plan_code, + plan_name, + plan_workshop, + plan_prod_line, + equipment_name, + equipment_code, + plan_loop, + plan_loop_type, + plan_loop_start, + plan_loop_end, + plan_person, + plan_status, + plan_restrict, + plan_type, + plan_outsource, + work_code, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{planId}, + #{planCode}, + #{planName}, + #{planWorkshop}, + #{planProdLine}, + #{equipmentName}, + #{equipmentCode}, + #{planLoop}, + #{planLoopType}, + #{planLoopStart}, + #{planLoopEnd}, + #{planPerson}, + #{planStatus}, + #{planRestrict}, + #{planType}, + #{planOutsource}, + #{workCode}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan + + plan_code = #{planCode}, + plan_name = #{planName}, + plan_workshop = #{planWorkshop}, + plan_prod_line = #{planProdLine}, + equipment_name = #{equipmentName}, + equipment_code = #{equipmentCode}, + plan_loop = #{planLoop}, + plan_loop_type = #{planLoopType}, + plan_loop_start = #{planLoopStart}, + plan_loop_end = #{planLoopEnd}, + plan_person = #{planPerson}, + plan_status = #{planStatus}, + plan_restrict = #{planRestrict}, + plan_type = #{planType}, + plan_outsource = #{planOutsource}, + work_code = #{workCode}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + and CONVERT(date,create_time) >= #{createTimeStart} + and #{createTimeEnd} >= CONVERT(date,create_time) + and create_by like concat('%', #{createBy}, '%') + and CONVERT(date,update_time) >= #{updateTimeStart} + and #{updateTimeEnd} >= CONVERT(date,update_time) + and update_by like concat('%', #{updateBy}, '%') + and del_flag = '0' + + where plan_id = #{planId} + + + + delete from equ_plan where plan_id = #{planId} + + + + delete from equ_plan where plan_id in + + #{planId} + + + \ No newline at end of file