Parcourir la source

建筑设施增加三维模型相关字段

hanzhengyi il y a 1 an
Parent
commit
be4a5f1d31

+ 2 - 0
service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/config/smsmessage/SmsMessage.java

@@ -0,0 +1,2 @@
+package com.usky.alarm.service.config.smsmessage;public class SmsMessage {
+}

+ 23 - 3
service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacility.java

@@ -163,14 +163,34 @@ public class BaseBuildFacility implements Serializable {
     private String facilityDesc;
 
     /**
-     * 三维角度
+     * 三维角度X
      */
-    private String angles;
+    private Double anglesX;
+
+    /**
+     * 三维角度Y
+     */
+    private Double anglesY;
+
+    /**
+     * 三维角度Z
+     */
+    private Double anglesZ;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleL;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleW;
 
     /**
      * 三维图标大小
      */
-    private String scale;
+    private Double scaleH;
 
     /**
      * 模型链接

+ 23 - 3
service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseBuildFacilityType.java

@@ -93,14 +93,34 @@ public class BaseBuildFacilityType implements Serializable {
     private Integer tenantId;
 
     /**
-     * 三维角度
+     * 三维角度X
      */
-    private String angles;
+    private Double anglesX;
+
+    /**
+     * 三维角度Y
+     */
+    private Double anglesY;
+
+    /**
+     * 三维角度Z
+     */
+    private Double anglesZ;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleL;
+
+    /**
+     * 三维图标大小
+     */
+    private Double scaleW;
 
     /**
      * 三维图标大小
      */
-    private String scale;
+    private Double scaleH;
 
 
 }

+ 6 - 2
service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildFacilityMapper.xml

@@ -27,8 +27,12 @@
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
         <result column="facility_desc" property="facilityDesc" />
-        <result column="angles" property="angles" />
-        <result column="scale" property="scale" />
+        <result column="angles_x" property="anglesX" />
+        <result column="angles_y" property="anglesY" />
+        <result column="angles_z" property="anglesZ" />
+        <result column="scale_l" property="scaleL" />
+        <result column="scale_w" property="scaleW" />
+        <result column="scale_h" property="scaleH" />
     </resultMap>
     <select id="baseBuildFacilityTypeList" resultType="com.usky.iot.domain.BaseBuildFacilityType">
         select

+ 6 - 2
service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildFacilityTypeMapper.xml

@@ -18,8 +18,12 @@
         <result column="update_time" property="updateTime" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
-        <result column="angles" property="angles" />
-        <result column="scale" property="scale" />
+        <result column="angles_x" property="anglesX" />
+        <result column="angles_y" property="anglesY" />
+        <result column="angles_z" property="anglesZ" />
+        <result column="scale_l" property="scaleL" />
+        <result column="scale_w" property="scaleW" />
+        <result column="scale_h" property="scaleH" />
     </resultMap>
 
 </mapper>