优化

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -27,6 +27,11 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoDTO extends BaseDTO implements Serializable {
+    /**
+     * 强检：1，非强检：2
+     */
+    private Integer checkType;
+
     /**
      * 设备识别码
      */

platform-dao/src/main/java/com/platform/dao/dto/sb/SbMeasureLogDTO.java

@@ -25,6 +25,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbMeasureLogDTO extends BaseDTO implements Serializable {
+    /**
+     * 异常描述
+     */
+    private String exceptionDescription;
     private String content;
     private String positionNo;
 

platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfo.java

@@ -20,6 +20,10 @@ import java.time.LocalDateTime;
 @Table(name = "t_sb_info")
 @Data
 public class SbInfo implements Serializable {
+    /**
+     * 强检：1，非强检：2
+     */
+    private Integer checkType;
     /**
      * 设备识别码
      */

platform-dao/src/main/java/com/platform/dao/entity/sb/SbMeasureLog.java

@@ -4,6 +4,7 @@ import com.platform.common.bean.DataScope;
 import com.platform.dao.entity.check.CheckStandardParam;
 import com.platform.dao.entity.upms.SysFile;
 import lombok.Data;
+import org.omg.CORBA.PRIVATE_MEMBER;
 import org.springframework.cglib.core.Local;
 
 import javax.persistence.Id;
@@ -24,6 +25,11 @@ import java.util.List;
 @Data
 public class SbMeasureLog implements Serializable {
 
+    /**
+     * 异常描述
+     */
+    private String exceptionDescription;
+
     private String content;
     /**
      * 1：检定，2：更换，3：维修，4：退库，5：报废

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

@@ -37,7 +37,11 @@ public enum SbMeasureLogOtherTypeEnum {
     /**
      * 报废
      */
-    BAO_FEI(5);
+    BAO_FEI(5),
+    /**
+     * 删除
+     */
+    DELETE(6);
 
 
     private final Integer value;

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbMeasureLogVO2.java

@@ -51,6 +51,18 @@ public class ExportSbMeasureLogVO2 implements Serializable {
     @Excel(name = "操作时间")
     private LocalDateTime createdTime;
 
+    /**
+     * 处理人
+     */
+    @Excel(name = "处理人")
+    private String updateUserName;
+
+    /**
+     * 异常描述
+     */
+    @Excel(name = "异常描述")
+    private LocalDateTime exceptionDescription;
+
 
 
 

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbMeasureLogVO.java

@@ -24,6 +24,10 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbMeasureLogVO extends BaseVO implements Serializable{
+    /**
+     * 异常描述
+     */
+    private String exceptionDescription;
     private String content;
     /**
      * 1：检定，2：更换，3：维修，4：退库，5：报废

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -25,6 +25,12 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoVO extends BaseVO implements Serializable {
+
+    /**
+     * 强检：1，非强检：2
+     */
+    private Integer checkType;
+
     /**
      * 设备识别码
      */

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

@@ -362,9 +362,13 @@ sb.use_position
                 #{item}
             </foreach>
         </if>
+        <if test="checkType!=null">
+            and sb.check_type = #{checkType}
+        </if>
         <if test="ascriptionDept != null and ascriptionDept">
             <include refid="deptSql"/>
         </if>
+
     </select>
 
     <select id="selectVOListStandard" parameterType="com.platform.dao.dto.sb.SbInfoDTO"

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

@@ -2,17 +2,24 @@ package com.platform.rest.controller.sb;
 
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.exception.DeniedException;
+import com.platform.common.model.OauthUser;
+import com.platform.common.model.UserInfo;
 import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.R;
 import com.platform.common.util.SecurityUtils;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.sb.SbChangeRecordDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
+import com.platform.dao.dto.sb.SbMeasureLogDTO;
 import com.platform.dao.entity.sb.SbInfo;
+import com.platform.dao.entity.sb.SbMeasureLog;
 import com.platform.dao.entity.sb.SbType;
+import com.platform.dao.enums.SbMeasureLogOtherTypeEnum;
 import com.platform.dao.enums.SysRoleCodeEnum;
 import com.platform.dao.mapper.sb.SbInfoMapper;
+import com.platform.dao.mapper.sb.SbMeasureLogMapper;
 import com.platform.dao.mapper.sb.SbTypeMapper;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.util.TreeUtil;
@@ -37,6 +44,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -57,6 +65,7 @@ public class SbInfoController {
     private final FillGatherTaskService fillGatherTaskService;
     private final SbInfoMapper sbInfoMapper;
     private final SbTypeMapper sbTypeMapper;
+    private final SbMeasureLogMapper sbMeasureLogMapper;
 
     /**
      * 设备工作台数据
@@ -252,9 +261,42 @@ public class SbInfoController {
         ids.forEach(item->{
             fillGatherTaskService.getDetailBySbId(item);
         });
+        SbInfoDTO dto = new SbInfoDTO();
+        dto.setSbIds(ids);
+        dto.setUseType(4);
+        List<SbInfoVO> sbInfoVOS = sbInfoMapper.selectVOList(dto);
         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();
+                log.setOtherType(SbMeasureLogOtherTypeEnum.DELETE.getValue());
+                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());
+                measureLogs.add(log);
+            }
+        }
+
+        sbMeasureLogMapper.insertListforComplex(measureLogs);
         return new R<>();
     }
+    public 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());
+        }
+    }
+
+
 
     /**
      * 获取分页

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

@@ -61,6 +61,7 @@ public class SbUpdateLogController {
     @PostMapping
     public R save(@Validated({AddGroup.class}) @RequestBody SbMeasureLogDTO dto) {
         setCreateUserInfo(dto);
+
         dto.setId(IdGeneratorUtils.getObjectId());
         SbMeasureLog log = BeanConverterUtil.copyObjectProperties(dto,SbMeasureLog.class);
         sbMeasureLogMapper.insert(log);
@@ -81,7 +82,7 @@ public class SbUpdateLogController {
 
     public void setCreateUserInfo(SbMeasureLogDTO model) {
         model.setCreatedTime(LocalDateTime.now());
-        model.setUpdateTime(LocalDateTime.now());
+//        model.setUpdateTime(LocalDateTime.now());
         OauthUser user = SecurityUtils.getUser();
         if (user != null) {
             UserInfo userInfo = user.getUserInfo();