Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

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

@@ -195,6 +195,16 @@ public class BaseBuild implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
     /**
      * 建筑设施总数
      */

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

@@ -132,4 +132,18 @@ public class DmpDeviceInfo implements Serializable {
      */
     @TableField(exist = false)
     private Integer deviceStatus;
+
+    /**
+     * 最后上线时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime lastOnlineTime;
+
+    /**
+     * 最后离线时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime lastOfflineTime;
+
+
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -146,6 +146,8 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                         for(int j=0;j<statusList.size();j++){
                             if(list1.get(i).getProductId().equals(statusList.get(j).getProductId()) && list1.get(i).getDeviceId().equals(statusList.get(j).getDeviceId())){
                                 list1.get(i).setDeviceStatus(statusList.get(j).getDeviceStatus());
+                                list1.get(i).setLastOnlineTime(statusList.get(j).getLastOnlineTime());
+                                list1.get(i).setLastOfflineTime(statusList.get(j).getLastOfflineTime());
                                 continue;
                             }
                         }

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

@@ -38,6 +38,8 @@
         <result column="fireproof_coat" property="fireproofCoat" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
     </resultMap>
 
 </mapper>