From 6bde4f4df9a962d02a579ba17603451617482b7d Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 19 Oct 2023 16:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=88=9D=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 | 21 ++- .../java/com/op/device/domain/EquPlan.java | 10 ++ .../com/op/device/domain/EquPlanDetail.java | 11 ++ .../java/com/op/device/domain/EquPlanEqu.java | 11 ++ .../com/op/device/domain/EquPlanPerson.java | 133 ++++++++++++++ .../com/op/device/domain/EquPlanStandard.java | 31 ++++ .../java/com/op/device/domain/WorkCenter.java | 44 +++++ .../op/device/mapper/EquPlanDetailMapper.java | 7 + .../op/device/mapper/EquPlanEquMapper.java | 7 + .../com/op/device/mapper/EquPlanMapper.java | 15 ++ .../op/device/mapper/EquPlanPersonMapper.java | 68 +++++++ .../device/mapper/EquPlanStandardMapper.java | 7 + .../op/device/service/IEquPlanService.java | 13 ++ .../service/impl/EquPlanServiceImpl.java | 166 +++++++++++++++--- .../mapper/device/EquPlanDetailMapper.xml | 12 +- .../mapper/device/EquPlanEquMapper.xml | 12 +- .../resources/mapper/device/EquPlanMapper.xml | 11 ++ .../mapper/device/EquPlanPersonMapper.xml | 113 ++++++++++++ .../mapper/device/EquPlanStandardMapper.xml | 12 +- 19 files changed, 678 insertions(+), 26 deletions(-) create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquPlanPerson.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/WorkCenter.java create mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanPersonMapper.java create mode 100644 op-modules/op-device/src/main/resources/mapper/device/EquPlanPersonMapper.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 index bb24e53eb..0b765b92a 100644 --- 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 @@ -31,11 +31,30 @@ import com.op.common.core.web.page.TableDataInfo; * @date 2023-10-16 */ @RestController -@RequestMapping("/plan") +@RequestMapping("/inspectionPlan") public class EquPlanController extends BaseController { @Autowired private IEquPlanService equPlanService; + /** + * 修改计划初始化信息 + * @param equPlan + * @return + */ + @PostMapping("/initUpdatePlanInfo") + public AjaxResult initUpdatePlanInfo(@RequestBody EquPlan equPlan) { + return equPlanService.initUpdatePlanInfo(equPlan); + } + + /** + * 获取工作中心 + * @return + */ + @GetMapping("/getWorkCenter") + public AjaxResult getWorkCenter() { + return equPlanService.getWorkCenter(); + } + /** * 获取人员信息list * 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 index 16c0c2ee9..10220ddbe 100644 --- 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 @@ -135,6 +135,16 @@ public class EquPlan extends BaseEntity { private List planTimeArray; + private List personListVO; + + public List getPersonListVO() { + return personListVO; + } + + public void setPersonListVO(List personListVO) { + this.personListVO = personListVO; + } + public List getPlanTimeArray() { return planTimeArray; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java index ddb7f9701..49b55557f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanDetail.java @@ -77,6 +77,17 @@ public class EquPlanDetail extends BaseEntity { // 关联-检查项->检查详情list private List equPlanStandardList; + // 主计划code + private String planCode; + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + public List getEquPlanStandardList() { return equPlanStandardList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java index 0d61f90a9..53f044e5d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanEqu.java @@ -61,6 +61,17 @@ public class EquPlanEqu extends BaseEntity { private String itemTempName; + // 主计划code + private String planCode; + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + public String getItemTempName() { return itemTempName; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanPerson.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanPerson.java new file mode 100644 index 000000000..bd1948b9f --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanPerson.java @@ -0,0 +1,133 @@ +package com.op.device.domain; + +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_person + * + * @author Open Platform + * @date 2023-10-19 + */ +public class EquPlanPerson extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 计划编码 */ + @Excel(name = "计划编码") + private String planCode; + + /** 用户id */ + @Excel(name = "用户id") + private Long userId; + + /** 账号 */ + @Excel(name = "账号") + private String userName; + + /** 工厂 */ + @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; + + /** 删除标识 */ + private String delFlag; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + + public String getPlanCode() { + return planCode; + } + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getUserId() { + return userId; + } + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserName() { + return userName; + } + 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("id", getId()) + .append("planCode", getPlanCode()) + .append("userId", getUserId()) + .append("userName", getUserName()) + .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/domain/EquPlanStandard.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java index f5b1ae8a9..982ec2122 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquPlanStandard.java @@ -69,6 +69,37 @@ public class EquPlanStandard extends BaseEntity { /** 删除标识 */ private String delFlag; + // 主计划code + private String planCode; + + private String itemName; + + private String standardTypeName; + + public String getStandardTypeName() { + return standardTypeName; + } + + public void setStandardTypeName(String standardTypeName) { + this.standardTypeName = standardTypeName; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + public void setId(String id) { this.id = id; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/WorkCenter.java b/op-modules/op-device/src/main/java/com/op/device/domain/WorkCenter.java new file mode 100644 index 000000000..0ce0e96b7 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/WorkCenter.java @@ -0,0 +1,44 @@ +package com.op.device.domain; + +// 工作中心实体类 +public class WorkCenter { + private int factoryId; + + private String factoryName; + + private String factoryCode; + + private String fType; + + public int getFactoryId() { + return factoryId; + } + + public void setFactoryId(int factoryId) { + this.factoryId = factoryId; + } + + public String getFactoryName() { + return factoryName; + } + + public void setFactoryName(String factoryName) { + this.factoryName = factoryName; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getfType() { + return fType; + } + + public void setfType(String fType) { + this.fType = fType; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java index 4a1b453bf..377ed81d2 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanDetailMapper.java @@ -58,4 +58,11 @@ public interface EquPlanDetailMapper { * @return 结果 */ public int deleteEquPlanDetailByIds(String[] ids); + + /** + * 通过主计划code获取计划详情信息 + * @param planCode + * @return + */ + List selectEquPlanDetailByPlanCode(String planCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java index 3a8383361..4d17bbec2 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanEquMapper.java @@ -58,4 +58,11 @@ public interface EquPlanEquMapper { * @return 结果 */ public int deleteEquPlanEquByIds(String[] ids); + + /** + * 通过主计划code获取设备信息list + * @param planCode + * @return + */ + List selectEquPlanEquByPlanCode(String planCode); } 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 index 804017702..79ecec5a6 100644 --- 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 @@ -5,6 +5,7 @@ import java.util.List; import com.op.device.domain.EquCheckItem; import com.op.device.domain.EquCheckItemDetail; import com.op.device.domain.EquPlan; +import com.op.device.domain.WorkCenter; import com.op.device.domain.dto.InspectionPlanDTO; import com.op.device.domain.vo.InspectionPlanVO; @@ -68,4 +69,18 @@ public interface EquPlanMapper { * @return */ int selectSerialNumber(); + + /** + * 获取工作中心list + * @param factory + * @return + */ + List selectWorkCenter(String factory); + + /** + * 获取主计划信息 + * @param planCode + * @return + */ + EquPlan selectEquPlanByPlanCode(String planCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanPersonMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanPersonMapper.java new file mode 100644 index 000000000..b8d6fa5b8 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanPersonMapper.java @@ -0,0 +1,68 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquPlanPerson; + +/** + * 计划人员关联Mapper接口 + * + * @author Open Platform + * @date 2023-10-19 + */ +public interface EquPlanPersonMapper { + /** + * 查询计划人员关联 + * + * @param id 计划人员关联主键 + * @return 计划人员关联 + */ + public EquPlanPerson selectEquPlanPersonById(String id); + + /** + * 查询计划人员关联列表 + * + * @param equPlanPerson 计划人员关联 + * @return 计划人员关联集合 + */ + public List selectEquPlanPersonList(EquPlanPerson equPlanPerson); + + /** + * 新增计划人员关联 + * + * @param equPlanPerson 计划人员关联 + * @return 结果 + */ + public int insertEquPlanPerson(EquPlanPerson equPlanPerson); + + /** + * 修改计划人员关联 + * + * @param equPlanPerson 计划人员关联 + * @return 结果 + */ + public int updateEquPlanPerson(EquPlanPerson equPlanPerson); + + /** + * 删除计划人员关联 + * + * @param id 计划人员关联主键 + * @return 结果 + */ + public int deleteEquPlanPersonById(String id); + + /** + * 批量删除计划人员关联 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquPlanPersonByIds(String[] ids); + + /** + * 通过主计划code获取人员list + * @param planCode + * @return + */ + List selectEquPlanPersonByPlanCode(String planCode); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java index faaaeca13..9ca778285 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquPlanStandardMapper.java @@ -58,4 +58,11 @@ public interface EquPlanStandardMapper { * @return 结果 */ public int deleteEquPlanStandardByIds(String[] ids); + + /** + * 通过主计划code获取标准信息 + * @param planCode + * @return + */ + List selectEquPlanStandardByPlanCode(String planCode); } 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 index 859711c4a..fdf66a66c 100644 --- 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 @@ -83,4 +83,17 @@ public interface IEquPlanService { * @return */ AjaxResult getPersonList(); + + /** + * 获取工作中心 + * @return + */ + AjaxResult getWorkCenter(); + + /** + * 修改计划初始化信息 + * @param equPlan + * @return + */ + AjaxResult initUpdatePlanInfo(EquPlan equPlan); } 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 index d72d35206..73364e120 100644 --- 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 @@ -1,6 +1,8 @@ package com.op.device.service.impl; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; @@ -24,7 +26,7 @@ import static com.op.common.core.web.domain.AjaxResult.success; /** * 计划Service业务层处理 - * + * * @author Open Platform * @date 2023-10-16 */ @@ -40,6 +42,14 @@ public class EquPlanServiceImpl implements IEquPlanService { private SysUserMapper sysUserMapper; @Autowired private EquEquipmentMapper equEquipmentMapper; + @Autowired + private EquPlanPersonMapper equPlanPersonMapper; + @Autowired + private EquPlanStandardMapper equPlanStandardMapper; + @Autowired + private EquPlanDetailMapper equPlanDetailMapper; + @Autowired + private EquPlanEquMapper equPlanEquMapper; /** * 查询计划 @@ -111,9 +121,24 @@ public class EquPlanServiceImpl implements IEquPlanService { equPlan.setUpdateBy(SecurityContextHolder.getUserName()); equPlan.setUpdateTime(DateUtils.getNowDate()); - System.out.println("1"); + // 处理计划-巡检人员信息 + List personList = equPlan.getPersonList(); - // TODO:处理计划-巡检人员信息 + for (SysUser user : personList) { + EquPlanPerson equPlanPerson = new EquPlanPerson(); + + equPlanPerson.setId(IdUtils.fastSimpleUUID()); + equPlanPerson.setUserId(user.getUserId()); + equPlanPerson.setPlanCode(equPlan.getPlanCode()); + equPlanPerson.setFactoryCode(factory); + equPlanPerson.setCreateBy(SecurityContextHolder.getUserName()); + equPlanPerson.setCreateTime(DateUtils.getNowDate()); + equPlanPerson.setUpdateBy(SecurityContextHolder.getUserName()); + equPlanPerson.setUpdateTime(DateUtils.getNowDate()); + + equPlanPersonMapper.insertEquPlanPerson(equPlanPerson); + System.out.println("人员信息插入数据库成功"); + } // 处理计划1-n设备信息 List equipmentItemList = equPlan.getEquipmentItem(); @@ -123,7 +148,8 @@ public class EquPlanServiceImpl implements IEquPlanService { for (EquPlanEqu equipment : equipmentItemList) { equipment.setId(IdUtils.fastSimpleUUID()); - equipment.setCode("E"+equPlan.getPlanCode()+String.format("%02d", ++equipmentCodeTemp)); + equipment.setPlanCode(equPlan.getPlanCode()); + equipment.setCode("E" + equPlan.getPlanCode() + String.format("%02d", ++equipmentCodeTemp)); equipment.setParentCode(equPlan.getPlanCode()); equipment.setFactoryCode(factory); equipment.setCreateBy(SecurityContextHolder.getUserName()); @@ -131,7 +157,6 @@ public class EquPlanServiceImpl implements IEquPlanService { equipment.setUpdateBy(SecurityContextHolder.getUserName()); equipment.setUpdateTime(DateUtils.getNowDate()); - System.out.println("2"); // 处理检查项信息 List equCheckItemList = equipment.getEquCheckItemList(); @@ -141,49 +166,69 @@ public class EquPlanServiceImpl implements IEquPlanService { for (EquCheckItem item : equCheckItemList) { EquPlanDetail planDetail = new EquPlanDetail(); - BeanUtils.copyProperties(item,planDetail); + BeanUtils.copyProperties(item, planDetail); planDetail.setId(IdUtils.fastSimpleUUID()); - planDetail.setCode("C"+equPlan.getPlanCode()+String.format("%02d", ++itemCodeTemp)); + planDetail.setPlanCode(equPlan.getPlanCode()); + planDetail.setCode("C" + equPlan.getPlanCode() + String.format("%02d", ++itemCodeTemp)); planDetail.setParentCode(equipment.getCode()); planDetail.setCreateBy(SecurityContextHolder.getUserName()); planDetail.setCreateTime(DateUtils.getNowDate()); planDetail.setUpdateBy(SecurityContextHolder.getUserName()); planDetail.setUpdateTime(DateUtils.getNowDate()); - System.out.println("3"); - - // 处理检查项详情 + // 处理标准 List equCheckItemDetailList = item.getEquCheckItemDetailList(); // 检查项详情流水号 int detailCodeTemp = 0; + // 判断是否插入检查项 + boolean checkInsert = false; + for (EquCheckItemDetail detail : equCheckItemDetailList) { - EquPlanStandard planStandard = new EquPlanStandard(); - BeanUtils.copyProperties(detail,planStandard); + if (detail.getShowFlag()) { - planStandard.setId(IdUtils.fastSimpleUUID()); - planStandard.setCode("D"+equPlan.getPlanCode()+String.format("%02d", ++detailCodeTemp)); - planStandard.setCreateBy(SecurityContextHolder.getUserName()); - planStandard.setCreateTime(DateUtils.getNowDate()); - planStandard.setUpdateBy(SecurityContextHolder.getUserName()); - planStandard.setUpdateTime(DateUtils.getNowDate()); + checkInsert = true; - // TODO 详情插入数据库 + EquPlanStandard planStandard = new EquPlanStandard(); + BeanUtils.copyProperties(detail, planStandard); + planStandard.setId(IdUtils.fastSimpleUUID()); + planStandard.setParentCode(planDetail.getCode()); + planStandard.setPlanCode(equPlan.getPlanCode()); + planStandard.setCode("D" + equPlan.getPlanCode() + String.format("%02d", ++detailCodeTemp)); + planStandard.setCreateBy(SecurityContextHolder.getUserName()); + planStandard.setCreateTime(DateUtils.getNowDate()); + planStandard.setUpdateBy(SecurityContextHolder.getUserName()); + planStandard.setUpdateTime(DateUtils.getNowDate()); - System.out.println("4"); + // 详情插入数据库 + equPlanStandardMapper.insertEquPlanStandard(planStandard); + System.out.println("检查项详情插入数据库成功"); + } } - // TODO 检查项详情为空则不生成检查项信息-检查项插入数据库 + // 检查项详情为空则不生成检查项信息-检查项插入数据库 + if (checkInsert) { + equPlanDetailMapper.insertEquPlanDetail(planDetail); + System.out.println("检查项插入数据库成功"); + } + } - // TODO 设备插入数据库 + // 设备插入数据库 + equPlanEquMapper.insertEquPlanEqu(equipment); + System.out.println("设备信息插入数据库成功"); } + + // 主计划插入数据库 + equPlanMapper.insertEquPlan(equPlan); + System.out.println("巡检主计划插入数据库成功"); + return success(); } @@ -226,6 +271,7 @@ public class EquPlanServiceImpl implements IEquPlanService { /** * 获取设备信息list + * * @param equEquipment * @return */ @@ -273,6 +319,7 @@ public class EquPlanServiceImpl implements IEquPlanService { /** * 查询人员list + * * @return */ @Override @@ -282,4 +329,79 @@ public class EquPlanServiceImpl implements IEquPlanService { List personList = sysUserMapper.selectSysUserList(sysUser); return success(personList); } + + /** + * 获取工作中心 + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getWorkCenter() { + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String str = request.getHeader(key.substring(8)); + int index = str.indexOf("_"); + String factory = str.substring(index + 1); + equPlanMapper.selectWorkCenter(factory); + + return success(equPlanMapper.selectWorkCenter(factory)); + } + + /** + * 修改计划初始化信息 + * @param equPlan + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult initUpdatePlanInfo(EquPlan equPlan) { + + // 获取计划信息 + EquPlan plan = equPlanMapper.selectEquPlanByPlanCode(equPlan.getPlanCode()); + // 处理计划信息 + List planTimeArray = new ArrayList<>(); + planTimeArray.add(plan.getPlanLoopStart()); + planTimeArray.add(plan.getPlanLoopEnd()); + plan.setPlanTimeArray(planTimeArray); + + + // 获取人员信息 + List personList = equPlanPersonMapper.selectEquPlanPersonByPlanCode(equPlan.getPlanCode()); + + List persons = new ArrayList<>(); + + for (EquPlanPerson person : personList) { + persons.add(person.getUserId()); + } + + // 获取设备信息 + List equipmentList = equPlanEquMapper.selectEquPlanEquByPlanCode(equPlan.getPlanCode()); + + for (EquPlanEqu equipment : equipmentList) { + // 获取检查项list + EquPlanDetail selectDetail = new EquPlanDetail(); + selectDetail.setParentCode(equipment.getCode()); + selectDetail.setPlanCode(equPlan.getPlanCode()); + List detailList = equPlanDetailMapper.selectEquPlanDetailList(selectDetail); + for (EquPlanDetail detail : detailList) { + // 获取标准list + EquPlanStandard selectStandard = new EquPlanStandard(); + selectStandard.setParentCode(detail.getCode()); + selectStandard.setPlanCode(equPlan.getPlanCode()); + List standardList = equPlanStandardMapper.selectEquPlanStandardList(selectStandard); + + // 置入标准 + detail.setEquPlanStandardList(standardList); + } + + // 置入检查项 + equipment.setEquPlanDetailList(detailList); + } + + plan.setEquipmentItem(equipmentList); + plan.setPersonListVO(persons); + + return success(plan); + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml index 5e0a77038..9d8c83a02 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanDetailMapper.xml @@ -8,6 +8,7 @@ + @@ -27,7 +28,7 @@ - select id, code, plan_id, parent_code, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_detail + select id, code, plan_id,plan_code, parent_code, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_detail + + insert into equ_plan_detail id, code, plan_id, + plan_code, parent_code, item_code, item_name, @@ -81,6 +89,7 @@ #{id}, #{code}, #{planId}, + #{planCode}, #{parentCode}, #{itemCode}, #{itemName}, @@ -105,6 +114,7 @@ code = #{code}, plan_id = #{planId}, + plan_code = #{planCode}, parent_code = #{parentCode}, item_code = #{itemCode}, item_name = #{itemName}, diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml index c5a504629..0afd147d4 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanEquMapper.xml @@ -7,6 +7,7 @@ + @@ -22,13 +23,14 @@ - select id, code, parent_code, equipment_code, equipment_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_equ + select id, code, parent_code,plan_code, equipment_code, equipment_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_equ + + insert into equ_plan_equ id, code, parent_code, + plan_code, equipment_code, equipment_name, factory_code, @@ -66,6 +74,7 @@ #{id}, #{code}, #{parentCode}, + #{planCode}, #{equipmentCode}, #{equipmentName}, #{factoryCode}, @@ -85,6 +94,7 @@ code = #{code}, parent_code = #{parentCode}, + plan_code = #{planCode}, equipment_code = #{equipmentCode}, equipment_name = #{equipmentName}, factory_code = #{factoryCode}, 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 index 4bfdf53e8..47ccc9831 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml @@ -81,6 +81,17 @@ WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0' + + + + insert into equ_plan diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanPersonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanPersonMapper.xml new file mode 100644 index 000000000..e8b35e2fe --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanPersonMapper.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + select id, plan_code, user_id, user_name, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_person + + + + + + + + + + insert into equ_plan_person + + id, + plan_code, + user_id, + user_name, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{planCode}, + #{userId}, + #{userName}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_plan_person + + plan_code = #{planCode}, + user_id = #{userId}, + user_name = #{userName}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from equ_plan_person where id = #{id} + + + + delete from equ_plan_person where id in + + #{id} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml index 067fc5413..5d97cddba 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanStandardMapper.xml @@ -8,6 +8,7 @@ + @@ -26,7 +27,7 @@ - select id, code, parent_code, detail_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_standard + select id, code, parent_code,plan_code, detail_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_plan_standard + + insert into equ_plan_standard id, code, parent_code, + plan_code, detail_code, standard_type, standard_name, @@ -78,6 +86,7 @@ #{id}, #{code}, #{parentCode}, + #{planCode}, #{detailCode}, #{standardType}, #{standardName}, @@ -101,6 +110,7 @@ code = #{code}, parent_code = #{parentCode}, + plan_code = #{planCode}, detail_code = #{detailCode}, standard_type = #{standardType}, standard_name = #{standardName},