维修

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

@@ -21,6 +21,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbChangeRecordDTO extends BaseDTO implements Serializable {
+    private Integer transformType;
 
     /**
      * 主键

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

@@ -21,6 +21,10 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_sb_change_record")
 public class SbChangeRecord implements Serializable{
+    /**
+     * 改变类型
+     */
+    private Integer transformType;
 
     /**
      * 主键

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

@@ -0,0 +1,35 @@
+package com.platform.dao.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description 设备状态
+ * @Author liuyu
+ * @Date 2020/05/05
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum SbTransFormTypeEnum {
+
+    /**
+     *修改
+     */
+    UPDATE(1),
+    /**
+     * 维修
+     */
+    REPAIR(2),
+    /**
+     * 检定
+     */
+    CHECK(3),
+    /**
+     * 巡检
+     */
+    FILL_CHECK(4)
+    ;
+    private final Integer value;
+
+}

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

@@ -22,6 +22,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbChangeRecordVO extends BaseVO implements Serializable {
+    private Integer transformType;
 
     /**
      * 主键

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

@@ -71,7 +71,7 @@ public class SbChangeLogController {
   }
 
 
-                                            
+
   /**
    * 通过id删除一条记录
    *
@@ -108,9 +108,13 @@ public class SbChangeLogController {
    * @param sbChangeLogDTO 设备修改记录表DTO
    * @return R
    */
+  @GetMapping("/page1")
+  public R<AbstractPageResultBean<SbChangeLogVO>> query1(SbChangeLogDTO sbChangeLogDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(sbChangeLogService.selectPageList(sbChangeLogDTO, pageNum, pageSize));
+  }
   @GetMapping("/page")
   public R<AbstractPageResultBean<SbChangeLogVO>> query(SbChangeLogDTO sbChangeLogDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(sbChangeLogService.selectPageList(sbChangeLogDTO, pageNum, pageSize));
+    return new R<>(sbChangeLogService.selectPageList(sbChangeLogDTO, pageNum, pageSize));
   }
 
   /**

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

@@ -521,6 +521,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         record.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
         record.setCreatedTime(LocalDateTime.now());
         record.setChangeType(CommonConstants.CHANGE_TYPE_SB_UPDATE);
+        record.setTransformType(SbTransFormTypeEnum.UPDATE.getValue());
         sbChangeRecordMapper.insert(record);
     }