Browse Source

fix: adm 信息点 类型错误 调整成同字典一致

lvxianyun 3 years ago
parent
commit
ba29ea2ec0

+ 3 - 3
src/main/java/com/persagy/proxy/object/model/AdmComponent.java

@@ -58,7 +58,7 @@ public class AdmComponent extends AdmBaseEntity<AdmComponent> {
         /** Revit族类型 */
         private String bimFamilySymbol;
         /** 部件序号 */
-        private Double equipSerial;
+        private String equipSerial;
 
         /** 部件关联部件的id */
         private String parentId;
@@ -67,11 +67,11 @@ public class AdmComponent extends AdmBaseEntity<AdmComponent> {
         /** 项目自定义类型 */
         private String customCategory;
         /** 任务状态 */
-        private Integer taskState;
+        private String taskState;
         /** 模型id */
         private String modelId;
         /** 贴码状态 */
-        private Integer codeType;
+        private String codeType;
         /** 备注 */
         private String note;
 

+ 3 - 3
src/main/java/com/persagy/proxy/object/model/AdmEquipment.java

@@ -83,7 +83,7 @@ public class AdmEquipment extends AdmBaseEntity<AdmEquipment> {
     /** Revit族类型 */
     private String bimFamilySymbol;
     /** 设备序号 */
-    private Double equipSerial;
+    private String equipSerial;
 
     /** 部件关联设备的id */
     private String parentId;
@@ -92,11 +92,11 @@ public class AdmEquipment extends AdmBaseEntity<AdmEquipment> {
     /** 项目自定义类型 */
     private String customCategory;
     /** 任务状态 */
-    private Integer taskState;
+    private String taskState;
     /** 模型id */
     private String modelId;
     /** 贴码状态 */
-    private Integer codeType  = 1;
+    private String codeType  = "1";
     /** 备注 */
     private String note;
 

+ 1 - 1
src/main/java/com/persagy/proxy/object/model/AdmFloor.java

@@ -40,7 +40,7 @@ public class AdmFloor extends AdmBaseEntity<AdmFloor> {
     /** 楼层顺序号 */
     private Integer floorSequenceID;
     /** 楼层常驻人数 */
-    private Integer permanentPeopleNum;
+    private Double permanentPeopleNum;
     /** 楼层编码 */
     private String floorIdentity;
 

+ 6 - 6
src/main/java/com/persagy/proxy/object/model/AdmISpace.java

@@ -42,15 +42,15 @@ public class AdmISpace {
     private String funcType;
 
     /** 井深 */
-    private Float depth;
+    private Double depth;
     /** 面宽 */
-    private Float width;
+    private Double width;
     /** 建筑面积 */
-    private Float buildArea;
+    private Double buildArea;
     /** 使用面积 */
-    private Float netArea;
+    private Double netArea;
     /** 高 */
-    private Float height;
+    private Double height;
 
     /** 图片 */
     private ArrayNode pic;
@@ -60,7 +60,7 @@ public class AdmISpace {
     private Integer permanentPeopleNum;
 
     /** 配电容量 */
-    private Float elecCap;
+    private Double elecCap;
     /** 污染等级 */
     private String pollutionDegree;
 

+ 1 - 1
src/main/java/com/persagy/proxy/object/model/AdmShaft.java

@@ -38,7 +38,7 @@ public class AdmShaft extends AdmBaseEntity<AdmShaft> {
     /** BIM模型中坐标 */
     private String bimLocation;
     /** 竖井顺序码 */
-    private Integer shaftSequenceId;
+    private String shaftSequenceId;
     /** 功能类型 */
     private String shaftfunctype;
 

+ 13 - 14
src/main/java/com/persagy/proxy/object/model/AdmSpace.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -46,26 +45,26 @@ public class AdmSpace extends AdmBaseEntity<AdmSpace> {
     /** 图片 - 信息点里已存在的信息点不应在实体中重复定义为其他格式 */
     private ArrayNode pic;
     /** 空间是否受影响 */
-    private Integer state;
+    private String state;
     /** 空间常驻人数 */
-    private Integer permanentPeopleNum;
+    private Double permanentPeopleNum;
 
     /** 井深 */
-    private Float depth;
+    private Double depth;
     /** 面宽 */
-    private Float width;
+    private Double width;
     /** 建筑面积 */
-    private Float buildArea;
+    private Double buildArea;
     /** 使用面积 */
-    private Float netArea;
+    private Double netArea;
     /** 高 */
-    private Float height;
+    private Double height;
     /** 备注文字 */
     private String intro;
     /** 设计供冷功率 */
-    private Float ratedCoolingp;
+    private Double ratedCoolingp;
     /** 设计供热功率 */
-    private Float ratedHeatingp;
+    private Double ratedHeatingp;
     /** 空调形式 */
     private String acType;
     /** 空间朝向 */
@@ -74,19 +73,19 @@ public class AdmSpace extends AdmBaseEntity<AdmSpace> {
     private String roomFuncType;
 
     /** 空间序号 */
-    private Float roomSerial;
+    private String roomSerial;
     /** 项目空间功能区类型 */
     private String projRoomFuncType;
     /** 设计照明功率 */
-    private Float ratedLightp;
+    private Double ratedLightp;
     /** 内外区分类 */
     private String zoneType;
     /** 租赁业态类型 */
-    private Integer tenantType;
+    private String tenantType;
     /** 所属租户 */
     private String tenant;
     /** 配电容量 */
-    private Float elecCap;
+    private Double elecCap;
     /** 污染等级 */
     private String pollutionDegree;