Browse Source

修改主键类型为String,避免前端精度丢失。

bruce 2 years ago
parent
commit
78a3ac33f8

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

@@ -505,7 +505,7 @@ public class AndroidApi
 
         // 1 接收原上报信息
         EquStatus status = EquStatus.builder()
-          .equId(Long.valueOf(equInfo.get("equId")))
+          .equId(equInfo.get("equId"))
           .status(Integer.valueOf(equInfo.get("equStatus")))
           .message(equInfo.get("errMsg"))
           .build();
@@ -518,7 +518,7 @@ public class AndroidApi
         redisTemplate.expire("equStatus" + status.getEquId(), 4, TimeUnit.SECONDS);
 
         // 3 持久化至DB
-        status.setCreateUser(-1L);
+        status.setCreateUser("-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, Long, EquStatus, EquStatusPageDTO, EquStatusSaveDTO, EquStatusUpdateDTO>
+public class EquStatusController extends SuperController<EquStatusService, String, EquStatus, EquStatusPageDTO, EquStatusSaveDTO, EquStatusUpdateDTO>
 {
     @Resource
     private EquStatusMapper equStatusMapper;

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

@@ -1,5 +1,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;
@@ -21,19 +22,19 @@ 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<Long>
+public class EquStatus extends SuperEntity<String>
 {
     /**
      * 设备ID
      */
     @ApiModelProperty(value = "设备ID")
     @NotNull(message = "缺失equId参数")
-    private Long equId;
+    private String equId;
 
     /**
-     * 状态
+     * 状态(0 - 离线,1 - 在线,2 - 异常,3 - 缺料)
      */
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "状态(0 - 离线,1 - 在线,2 - 异常,3 - 缺料)")
     @NotNull(message = "缺失status参数")
     private Integer status;
 
@@ -45,4 +46,12 @@ public class EquStatus extends SuperEntity<Long>
     private String message;
 
     // TODO 补充分页查询映射属性列表
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private String code;
+
+    @TableField(exist = false)
+    private String plcName;
 }