优化

platform-dao/src/main/java/com/platform/dao/enums/SbMeasureLogOtherTypeEnum.java

@@ -41,7 +41,12 @@ public enum SbMeasureLogOtherTypeEnum {
     /**
      * 删除
      */
-    DELETE(6);
+    DELETE(6),
+
+    /**
+     * 停用
+     */
+    STOP(7);
 
 
     private final Integer value;

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -178,7 +178,8 @@ sb.use_no,
 sb.sb_code,
 sb.install_unit,
 sb.exam_result,
-sb.use_position
+sb.use_position,
+sb.check_type
     </sql>
 
     <sql id="deptSql">
@@ -382,7 +383,7 @@ sb.use_position
         sb.status,
         sb.use_type,
         sb.type_id,
-        count( standard.id ) as standardNum
+        count( standard.id ) as standardNum,
         FROM
         t_sb_info sb
         LEFT JOIN t_check_standard standard ON sb.id = standard.sb_id

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -268,7 +268,6 @@ public class SbInfoController {
         sbInfoService.batchDelete(ids);
 
         List<SbMeasureLog> measureLogs = new ArrayList<>();
-        StringBuffer stringBuffer = new StringBuffer();
         if (sbInfoVOS!=null&&sbInfoVOS.size()>0) {
             for (SbInfoVO vo : sbInfoVOS) {
                 SbMeasureLog log = new SbMeasureLog();
@@ -276,8 +275,10 @@ public class SbInfoController {
                 log.setId(IdGeneratorUtils.getObjectId());
                 setCreateUserInfo(log);
                 log.setSbId(vo.getId());
-                stringBuffer.append("设备位号为:"+vo.getPositionNo()==null?"":vo.getPositionNo()+",设备位置为："+vo.getPositionName()==null?"":vo.getPositionName()+"的设备："+vo.getName()+"于"+log.getCreatedTime()+"被"+log.getCreatedUserName()+"删除");
-                log.setContent(stringBuffer.toString());
+                String str = "设备位号为:" + (vo.getPositionNo() == null ? "" : vo.getPositionNo() )+ ",设备位置为：" + (vo.getPositionName() == null ? "" : vo.getPositionName()) + "的设备：" + vo.getName() + "于" + log.getCreatedTime() + "被" + log.getCreatedUserName() + "停用";
+
+//                stringBuffer.append("设备位号为:"+vo.getPositionNo()==null?"":vo.getPositionNo()+",设备位置为："+vo.getPositionName()==null?"":vo.getPositionName()+"的设备："+vo.getName()+"于"+log.getCreatedTime()+"被"+log.getCreatedUserName()+"删除");
+                log.setContent(str);
                 measureLogs.add(log);
             }
         }

platform-service/src/main/java/com/platform/service/sb/impl/SbStatusLogServiceImpl.java

@@ -1,6 +1,7 @@
 package com.platform.service.sb.impl;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.exception.BusinessException;
+import com.platform.common.model.OauthUser;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.DateUtils;
 import com.platform.common.util.IdGeneratorUtils;
@@ -8,17 +9,22 @@ import com.platform.common.util.SecurityUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.bean.MyVOPage;
 import com.github.pagehelper.PageHelper;
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.entity.sb.SbMeasureLog;
 import com.platform.dao.entity.sb.SbStopLog;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.SbInfoStatusEnum;
+import com.platform.dao.enums.SbMeasureLogOtherTypeEnum;
 import com.platform.dao.mapper.sb.SbInfoMapper;
+import com.platform.dao.mapper.sb.SbMeasureLogMapper;
 import com.platform.dao.mapper.sb.SbStopLogMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.vo.query.sb.SbStatusLogVO;
 import com.platform.dao.dto.sb.SbStatusLogDTO;
 import com.platform.dao.entity.sb.SbStatusLog;
 import com.platform.dao.mapper.sb.SbStatusLogMapper;
+import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.sb.SbStatusLogService;
 import org.springframework.stereotype.Service;
 import com.platform.service.base.impl.BaseServiceImpl;
@@ -30,6 +36,7 @@ import lombok.AllArgsConstructor;
 import javax.persistence.Transient;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -46,6 +53,7 @@ public class SbStatusLogServiceImpl extends BaseServiceImpl<SbStatusLogMapper, S
     private final SysUserMapper sysUserMapper;
     private final SbStatusLogMapper sbStatusLogMapper;
     private final SbStopLogMapper sbStopLogMapper;
+    private final SbMeasureLogMapper sbMeasureLogMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -86,6 +94,29 @@ public class SbStatusLogServiceImpl extends BaseServiceImpl<SbStatusLogMapper, S
             stopLog.setStatus(0);
             stopLog.setUpdateUserId(userId);
             sbStopLogMapper.insert(stopLog);
+            if (model.getSbId()!=null) {
+                SbInfoDTO info = new SbInfoDTO();
+                info.setId(model.getSbId());
+                List<SbInfoVO> sbInfoVOS = sbInfoMapper.selectVOList(info);
+                    List<SbMeasureLog> measureLogs = new ArrayList<>();
+                    if (sbInfoVOS != null && sbInfoVOS.size() > 0) {
+                        for (SbInfoVO vo : sbInfoVOS) {
+                            SbMeasureLog log = new SbMeasureLog();
+                            log.setOtherType(SbMeasureLogOtherTypeEnum.STOP.getValue());
+                            log.setId(IdGeneratorUtils.getObjectId());
+                            setCreateUserInfo(log);
+                            log.setSbId(vo.getId());
+                            String str = "设备位号为:" + (vo.getPositionNo() == null ? "" : vo.getPositionNo() )+ ",设备位置为：" + (vo.getPositionName() == null ? "" : vo.getPositionName()) + "的设备：" + vo.getName() + "于" + log.getCreatedTime() + "被" + log.getCreatedUserName() + "停用";
+//                            stringBuffer.append("设备位号为:" + vo.getPositionNo() == null ? "" : vo.getPositionNo() + ",设备位置为：" + vo.getPositionName() == null ? "" : vo.getPositionName() + "的设备：" + vo.getName() + "于" + log.getCreatedTime() + "被" + log.getCreatedUserName() + "停用");
+//                            log.setContent(stringBuffer.toString());
+                            log.setContent(str);
+                            measureLogs.add(log);
+                        }
+
+
+                    sbMeasureLogMapper.insertListforComplex(measureLogs);
+                }
+            }
         }
 
         // 更新停机记录中的开机记录，并记录时长;如果存在多条，选择最新的一条
@@ -108,6 +139,17 @@ public class SbStatusLogServiceImpl extends BaseServiceImpl<SbStatusLogMapper, S
         return sbStatusLog;
     }
 
+    private void setCreateUserInfo(SbMeasureLog model) {
+        model.setCreatedTime(LocalDateTime.now());
+        model.setUpdateTime(LocalDateTime.now());
+        OauthUser user = SecurityUtils.getUser();
+        if (user != null) {
+            UserInfo userInfo = user.getUserInfo();
+            model.setCreatedUserId(userInfo.getUserId());
+            model.setCreatedUserName(userInfo.getRealName());
+        }
+    }
+
     @Override
     public int batchDelete(List<String> ids) {
         Weekend<SbStatusLog> weekend = new Weekend<>(SbStatusLog.class);