防区缺陷

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/Protection.java

@@ -2,6 +2,8 @@ package com.xunmei.core.resumption.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.*;
@@ -22,6 +24,7 @@ public class Protection extends BaseEntity {
      * 编号
      */
     @TableId
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -54,6 +57,7 @@ public class Protection extends BaseEntity {
 
     private Integer allHour;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     private String orgPath;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/protection/ProtectionPageVo.java

@@ -23,6 +23,9 @@ public class ProtectionPageVo {
 //     */
 //    private  Integer order;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String orgId;
+
     @ApiModelProperty("机构名称")
     private String orgName;
 

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -17,6 +17,7 @@
         select a.id,
         a.name as name,
         a.status as status,
+        a.org_id as orgId,
         a.org_name as orgName,
         a.all_hour as allHour,
         a.status_update_time as statusUpdateTime