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 b137c4ea..61a0467f 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 @@ -54,7 +54,6 @@ public class EquPlanServiceImpl implements IEquPlanService { private EquPlanEquMapper equPlanEquMapper; @Autowired private EquPlanEquSpareMapper equPlanEquSpareMapper; - // 备件mapper @Autowired private SparePartsLedgerMapper sparePartsLedgerMapper; @@ -135,7 +134,6 @@ public class EquPlanServiceImpl implements IEquPlanService { @Override @DS("#header.poolName") public AjaxResult insertEquPlan(EquPlan equPlan) { - // 处理计划信息 // 获取计划流水号 String planSerialNum = String.format("%03d", equPlanMapper.selectSerialNumber()); @@ -491,6 +489,25 @@ public class EquPlanServiceImpl implements IEquPlanService { equPlanEquMapper.insertEquPlanEqu(equipment); } + // 保养逻辑-备件 + if (equPlan.getPlanType().equals("maintenance")) { + List spareList = equipment.getSpareList(); + if (spareList != null) { + for (EquPlanEquSpare spare : spareList) { + spare.setId(IdUtils.fastSimpleUUID()); + spare.setPlanCode(equPlan.getPlanCode()); + spare.setParentCode(equipment.getId()); + spare.setFactoryCode(factory); + spare.setCreateBy(SecurityContextHolder.getUserName()); + spare.setCreateTime(DateUtils.getNowDate()); + spare.setUpdateBy(SecurityContextHolder.getUserName()); + spare.setUpdateTime(DateUtils.getNowDate()); + + equPlanEquSpareMapper.insertEquPlanEquSpare(spare); + } + } + } + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java index 259af103..dba1743b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java @@ -31,16 +31,6 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { private EquCheckItemMapper equCheckItemMapper; @Autowired private EquCheckItemDetailMapper equCheckItemDetailMapper; - @Autowired - private EquPlanStandardMapper equPlanStandardMapper; - @Autowired - private EquPlanDetailMapper equPlanDetailMapper; - @Autowired - private EquPlanEquMapper equPlanEquMapper; - @Autowired - private EquPlanEquSpareMapper equPlanEquSpareMapper; - @Autowired - private EquPlanPersonMapper equPlanPersonMapper; /** * 查询保养计划 @@ -75,36 +65,7 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { @Override @DS("#header.poolName") public AjaxResult insertEquPlan(EquPlan equPlan) { - - // 获取当前所选工厂 - 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); - - // 计划流水号 - String planSerialNum = String.format("%03d", equPlanMapper.selectSerialNumber()); - - // 处理计划信息 - equPlan.setPlanId(IdUtils.fastSimpleUUID()); - equPlan.setPlanCode((DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + planSerialNum)); - if (equPlan.getPlanTimeArray().size() > 0) { - 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()); - - // 主计划插入数据库 - equPlanMapper.insertEquPlan(equPlan); - - insertCommonInfo(equPlan,factory); - - return success(equPlan); + return success(); } /** @@ -116,28 +77,7 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { @Override @DS("#header.poolName") public AjaxResult updateEquPlan(EquPlan equPlan) { - // 更新巡检计划 - equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0)); - equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1)); - equPlanMapper.updateEquPlan(equPlan); - // 删除该计划下设备、人员、检查项、标准、备件信息 - equPlanPersonMapper.deleteEquPlanPersonByPlanCode(equPlan.getPlanCode()); - equPlanDetailMapper.deleteEquPlanDetailByPlanCode(equPlan.getPlanCode()); - equPlanEquMapper.deleteEquPlanEquByPlanCode(equPlan.getPlanCode()); - equPlanStandardMapper.deleteEquPlanStandardByPlanCode(equPlan.getPlanCode()); - equPlanEquSpareMapper.deleteEquPlanEquSpareByPlanCode(equPlan.getPlanCode()); - - //获取当前所选工厂 - 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); - - // 插入设备、人员、检查项、标准信息 - insertCommonInfo(equPlan, factory); - - return success("修改成功"); + return success(); } /** @@ -237,124 +177,4 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { return success(equPlanEquList); } - /** - * 修改未改动：（有问题）插入设备、人员、检查项、标准、备件 - * - * @param equPlan - * @param factory - */ - private void insertCommonInfo(EquPlan equPlan, String factory) { - // 处理计划-巡检人员信息 - List personList = equPlan.getPersonList(); - - 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); - } - - // 处理计划1-n设备信息 - List equipmentItemList = equPlan.getEquipmentItem(); - - // 计划-设备流水号 - int equipmentCodeTemp = 0; - - for (EquPlanEqu equipment : equipmentItemList) { - equipment.setId(IdUtils.fastSimpleUUID()); - equipment.setPlanCode(equPlan.getPlanCode()); - equipment.setCode("E" + equPlan.getPlanCode() + String.format("%02d", ++equipmentCodeTemp)); - equipment.setParentCode(equPlan.getPlanId()); - equipment.setFactoryCode(factory); - equipment.setCreateBy(SecurityContextHolder.getUserName()); - equipment.setCreateTime(DateUtils.getNowDate()); - equipment.setUpdateBy(SecurityContextHolder.getUserName()); - equipment.setUpdateTime(DateUtils.getNowDate()); - - // 处理检查项信息 - List detailList = equipment.getEquPlanDetailList(); - if (detailList != null) { - // 计划检查项流水号 - int itemCodeTemp = 0; - - for (EquPlanDetail item : detailList) { - - if (item != null) { - item.setId(IdUtils.fastSimpleUUID()); - item.setPlanCode(equPlan.getPlanCode()); - item.setCode("C" + equipment.getCode() + String.format("%02d", ++itemCodeTemp)); - item.setParentCode(equipment.getId()); - item.setCreateBy(SecurityContextHolder.getUserName()); - item.setCreateTime(DateUtils.getNowDate()); - item.setUpdateBy(SecurityContextHolder.getUserName()); - item.setUpdateTime(DateUtils.getNowDate()); - - // 处理标准 - List standardList = item.getEquPlanStandardList(); - - // 判断是否插入检查项 - boolean checkInsert = false; - - for (EquPlanStandard standard : standardList) { - - if (standard.getShowFlag()) { - - checkInsert = true; - - standard.setId(IdUtils.fastSimpleUUID()); - standard.setParentCode(item.getId()); - standard.setPlanCode(equPlan.getPlanCode()); - standard.setCreateBy(SecurityContextHolder.getUserName()); - standard.setCreateTime(DateUtils.getNowDate()); - standard.setUpdateBy(SecurityContextHolder.getUserName()); - standard.setUpdateTime(DateUtils.getNowDate()); - - // 详情插入数据库 - equPlanStandardMapper.insertEquPlanStandard(standard); - } - - } - - // 检查项详情为空则不生成检查项信息-检查项插入数据库 - if (checkInsert) { - equPlanDetailMapper.insertEquPlanDetail(item); - } - } - - } - - // 设备插入数据库 - equPlanEquMapper.insertEquPlanEqu(equipment); - } - - // 处理备件信息 - List spareList = equipment.getSpareList(); - // 计划备件流水号 - int spareCodeTemp = 0; - if (spareList != null) { - for (EquPlanEquSpare spare : spareList) { - spare.setId(IdUtils.fastSimpleUUID()); - spare.setPlanCode(equPlan.getPlanCode()); - spare.setParentCode(equipment.getId()); - spare.setFactoryCode(factory); - spare.setCreateBy(SecurityContextHolder.getUserName()); - spare.setCreateTime(DateUtils.getNowDate()); - spare.setUpdateBy(SecurityContextHolder.getUserName()); - spare.setUpdateTime(DateUtils.getNowDate()); - - equPlanEquSpareMapper.insertEquPlanEquSpare(spare); - } - } - - } - } - }