From 435e7adcd4ce344151ac985726bd50aef00c0153 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Wed, 18 Oct 2023 18:13:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A5=E5=8F=A3=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/device/domain/EquPlan.java | 14 +- .../com/op/device/mapper/EquPlanMapper.java | 6 + .../service/impl/EquPlanServiceImpl.java | 124 ++++++++++++++++-- .../resources/mapper/device/EquPlanMapper.xml | 6 + 4 files changed, 136 insertions(+), 14 deletions(-) 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 c8fa43a51..16c0c2ee9 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 @@ -131,6 +131,18 @@ public class EquPlan extends BaseEntity { private List equipmentItem; + private List personList; + + private List planTimeArray; + + public List getPlanTimeArray() { + return planTimeArray; + } + + public void setPlanTimeArray(List planTimeArray) { + this.planTimeArray = planTimeArray; + } + public List getEquipmentItem() { return equipmentItem; } @@ -139,8 +151,6 @@ public class EquPlan extends BaseEntity { this.equipmentItem = equipmentItem; } - private List personList; - public List getPersonList() { return personList; } 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 2695e4b49..804017702 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 @@ -62,4 +62,10 @@ public interface EquPlanMapper { * @return 结果 */ public int deleteEquPlanByPlanIds(String[] planIds); + + /** + * 获取计划流水号 + * @return + */ + int selectSerialNumber(); } 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 efecbfc2c..d72d35206 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 @@ -4,14 +4,21 @@ import java.text.SimpleDateFormat; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.*; import com.op.device.mapper.*; import com.op.system.api.domain.SysUser; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.service.IEquPlanService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; import static com.op.common.core.web.domain.AjaxResult.success; @@ -31,8 +38,8 @@ public class EquPlanServiceImpl implements IEquPlanService { private EquCheckItemDetailMapper equCheckItemDetailMapper; @Autowired private SysUserMapper sysUserMapper; - @Autowired - private EquEquipmentMapper equEquipmentMapper; + @Autowired + private EquEquipmentMapper equEquipmentMapper; /** * 查询计划 @@ -83,7 +90,100 @@ public class EquPlanServiceImpl implements IEquPlanService { @Override @DS("#header.poolName") public AjaxResult insertEquPlan(EquPlan equPlan) { + // 处理计划信息 + // 获取计划流水号 + String planSerialNum = String.format("%03d", equPlanMapper.selectSerialNumber()); + + //获取当前所选工厂 + 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); + + equPlan.setPlanId(IdUtils.fastSimpleUUID()); + equPlan.setPlanCode((DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + planSerialNum)); + equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0)); + equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1)); + equPlan.setFactoryCode(factory); + equPlan.setCreateBy(SecurityContextHolder.getUserName()); equPlan.setCreateTime(DateUtils.getNowDate()); + equPlan.setUpdateBy(SecurityContextHolder.getUserName()); + equPlan.setUpdateTime(DateUtils.getNowDate()); + + System.out.println("1"); + + // TODO:处理计划-巡检人员信息 + + // 处理计划1-n设备信息 + List equipmentItemList = equPlan.getEquipmentItem(); + + // 计划-设备流水号 + int equipmentCodeTemp = 0; + + for (EquPlanEqu equipment : equipmentItemList) { + equipment.setId(IdUtils.fastSimpleUUID()); + equipment.setCode("E"+equPlan.getPlanCode()+String.format("%02d", ++equipmentCodeTemp)); + equipment.setParentCode(equPlan.getPlanCode()); + equipment.setFactoryCode(factory); + equipment.setCreateBy(SecurityContextHolder.getUserName()); + equipment.setCreateTime(DateUtils.getNowDate()); + equipment.setUpdateBy(SecurityContextHolder.getUserName()); + equipment.setUpdateTime(DateUtils.getNowDate()); + + System.out.println("2"); + // 处理检查项信息 + List equCheckItemList = equipment.getEquCheckItemList(); + + // 计划检查项流水号 + int itemCodeTemp = 0; + + for (EquCheckItem item : equCheckItemList) { + + EquPlanDetail planDetail = new EquPlanDetail(); + BeanUtils.copyProperties(item,planDetail); + + planDetail.setId(IdUtils.fastSimpleUUID()); + 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; + + for (EquCheckItemDetail detail : equCheckItemDetailList) { + + EquPlanStandard planStandard = new EquPlanStandard(); + BeanUtils.copyProperties(detail,planStandard); + + 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()); + + // TODO 详情插入数据库 + + + System.out.println("4"); + + } + + // TODO 检查项详情为空则不生成检查项信息-检查项插入数据库 + } + + // TODO 设备插入数据库 + + } return success(); } @@ -124,16 +224,16 @@ public class EquPlanServiceImpl implements IEquPlanService { return equPlanMapper.deleteEquPlanByPlanId(planId); } - /** - * 获取设备信息list - * @param equEquipment - * @return - */ - @Override - @DS("#header.poolName") - public List getEquList(EquEquipment equEquipment) { - return equEquipmentMapper.selectEquEquipmentList(equEquipment); - } + /** + * 获取设备信息list + * @param equEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List getEquList(EquEquipment equEquipment) { + return equEquipmentMapper.selectEquEquipmentList(equEquipment); + } /** * 处理计划-设备信息 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 f42a047b5..4bfdf53e8 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 @@ -75,6 +75,12 @@ where plan_id = #{planId} + + insert into equ_plan