优化

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -18,6 +18,7 @@ import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.sb.SbInfoService;
+import com.platform.service.sb.SbMeasureLogService;
 import com.platform.service.upms.SysFileService;
 import com.platform.service.upms.SysUserService;
 import com.platform.service.wechat.util.WeChatMessageUtil;
@@ -39,6 +40,8 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
     protected SysUserService sysUserService;
     @Resource
     protected SbPositionMapper sbPositionMapper;
+    @Resource
+    protected SbMeasureLogService sbMeasureLogService;
 
     @Override
     public void nonPlanToPlan(RepairApplicationFormDTO model) {
@@ -60,6 +63,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
             throw new DeniedException("设备录入方式不能为空");
         }
         SbInfo sb = null;
+        String sbId = "";
         if(model.getInputType() == 1){
             if(StringUtils.isBlank(model.getSbName()) && StringUtils.isBlank(model.getPositionNo())){
                 throw new DeniedException("请填写报修设备信息");
@@ -71,7 +75,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
             if(StringUtils.isBlank(model.getSbId())){
                 throw new DeniedException("请填写报修设备");
             }
-            String sbId = model.getSbId();
+            sbId = model.getSbId();
             sb = sbInfoService.getModelById(sbId);
             if (sb == null) {
                 throw new DeniedException("设备不存在，无法报修");
@@ -118,7 +122,8 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         }
         // 如果选择了设备停机，则要修改设备状态，记录设备状态变更变
         if (model.getNeedStop() != null && model.getNeedStop().intValue() == RepairApplicationFormStopEnum.STOP.getValue()) {
-//            info.setStatus(SbInfoStatusEnum.IN_STOP.getValue());
+            // 记录生命周期数据
+            sbMeasureLogService.addUseOrUnUseLog(sbId,SbMeasureLogOtherTypeEnum.STOP.getValue(), "停机");
             updateSb = true;
         }
         if (updateSb) {

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -18,7 +18,6 @@ import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
 import com.platform.dao.mapper.sb.SbPositionMapper;
-import com.platform.dao.mapper.upms.SysUserDeptMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.mapper.upms.SysUserRoleMapper;
 import com.platform.dao.util.MessageTemplateUtil;
@@ -26,6 +25,7 @@ import com.platform.dao.vo.SysUserRoleVO;
 import com.platform.dao.vo.SysUserVO;
 import com.platform.service.part.PartInfoService;
 import com.platform.service.repair.strategy.AbstractRepairBaseStrategy;
+import com.platform.service.sb.SbMeasureLogService;
 import com.platform.service.upms.SysConfigService;
 import com.platform.service.util.SendMessageUtils;
 import org.springframework.stereotype.Component;
@@ -57,8 +57,6 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
     @Resource
     private SbPositionMapper sbPositionMapper;
     @Resource
-    private SysUserDeptMapper sysUserDeptMapper;
-    @Resource
     private SysConfigService sysConfigService;
     @Resource
     private SysUserRoleMapper sysUserRoleMapper;
@@ -1057,6 +1055,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         repairApplicationFormMapper.updateByPrimaryKeySelective(form);
         // 添加状态记录
         addRepairStatusRecord(form,"维修完成待审");
+        sbMeasureLogService.addUseOrUnUseLog(dto.getId(),SbMeasureLogOtherTypeEnum.REPAIR.getValue(),"维修");
         // 通知工程师审核
         SysUserVO vo = BeanConverterUtil.copyObjectProperties(sysUserMapper.selectByPrimaryKey(form.getDispatchUserId()),SysUserVO.class);
         sendMessageToRepairManger(form,ListUtils.newArrayList(vo),CommonConstants.REPAIR_COMPLETE_NOTICE);