Merge branch 'han' into server-165

hebingfenzhi

pom.xml

@@ -58,6 +58,10 @@
     
     
     <module>service-iot</module>
+
+
+
+    <module>service-alarm</module>
                 
     
     

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

@@ -165,10 +165,10 @@ public class BaseBuildFacility implements Serializable {
     /**
      * 三维角度
      */
-    private Integer angle;
+    private String angles;
 
     /**
-     * 建筑设施备注
+     * 三维图标大小
      */
     private String scale;
 

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

@@ -92,5 +92,15 @@ public class BaseBuildFacilityType implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 三维角度
+     */
+    private String angles;
+
+    /**
+     * 三维图标大小
+     */
+    private String scale;
+
 
 }

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

@@ -27,7 +27,7 @@
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
         <result column="facility_desc" property="facilityDesc" />
-        <result column="angle" property="angle" />
+        <result column="angles" property="angles" />
         <result column="scale" property="scale" />
     </resultMap>
     <select id="baseBuildFacilityTypeList" resultType="com.usky.iot.domain.BaseBuildFacilityType">

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

@@ -18,6 +18,8 @@
         <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" />
     </resultMap>
 
 </mapper>