Browse Source

恢复主键String为Long数据格式。

bruce 2 years ago
parent
commit
375e8a040d

+ 2 - 2
imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/AndroidApi.java

@@ -510,7 +510,7 @@ public class AndroidApi
 
         // 1 接收原上报信息
         EquStatus status = EquStatus.builder()
-          .equId(equInfo.get("equId"))
+          .equId(Long.valueOf(equInfo.get("equId")))
           .status(Integer.valueOf(equInfo.get("equStatus")))
           .message(equInfo.get("errMsg"))
           .build();
@@ -523,7 +523,7 @@ public class AndroidApi
         redisTemplate.expire("equStatus" + status.getEquId(), 4, TimeUnit.SECONDS);
 
         // 3 持久化至DB
-        status.setCreateUser("-1");
+        status.setCreateUser(Long.valueOf("-1"));
         equStatusMapper.insert(status);
 
         return R.success(true, "成功");

+ 1 - 1
imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionresource/EquStatusController.java

@@ -25,7 +25,7 @@ import javax.annotation.Resource;
  */
 @Api(value = "EquStatusController", tags = "设备状态")
 @RestController @RequestMapping("/equ-status") @Validated @Slf4j
-public class EquStatusController extends SuperController<EquStatusService, String, EquStatus, EquStatusPageDTO, EquStatusSaveDTO, EquStatusUpdateDTO>
+public class EquStatusController extends SuperController<EquStatusService, Long, EquStatus, EquStatusPageDTO, EquStatusSaveDTO, EquStatusUpdateDTO>
 {
     @Resource
     private EquStatusMapper equStatusMapper;

+ 0 - 1
imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/dto/EquStatusPageDTO.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;

+ 2 - 3
imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/entity/EquStatus.java

@@ -2,7 +2,6 @@ package com.github.zuihou.business.productionresource.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.zuihou.base.entity.Entity;
 import com.github.zuihou.base.entity.SuperEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,14 +21,14 @@ import javax.validation.constraints.NotNull;
 @ApiModel(value = "EquStatus", description = "设备-状态")
 @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true)
 @Data @Builder @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true)
-public class EquStatus extends SuperEntity<String>
+public class EquStatus extends SuperEntity<Long>
 {
     /**
      * 设备ID
      */
     @ApiModelProperty(value = "设备ID")
     @NotNull(message = "缺失equId参数")
-    private String equId;
+    private Long equId;
 
     /**
      * 状态(0 - 离线,1 - 在线,2 - 异常,3 - 缺料)