优化 设备离线检测增加待激活设备离线检测

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/resvo/IotHomeDeviceListResVo.java

@@ -14,6 +14,11 @@ public class IotHomeDeviceListResVo {
     private String devName;
 
     /**
+     * 设备状态
+     */
+    private String devStatus;
+
+    /**
      * 设备型号业务标识
      */
     private String devtypeBid;

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/resvo/IotHomeTypeStatResVo.java

@@ -14,4 +14,6 @@ public class IotHomeTypeStatResVo {
 
     /** 型号图示 */
     private String devtypePreview;
+
+    private String devtypeMapicon;
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotHomeServiceImpl.java

@@ -110,14 +110,19 @@ public class IotHomeServiceImpl implements IIotHomeService {
         for(IotHomeDeviceListResVo item : dataList) {
             IotDevice deviceInfo = deviceMap.get(item.getDevBid());
             // 测试使用
+            String devStatus = "0";
             if(deviceInfo == null) {
                 deviceInfo = new IotDevice();
-//                continue;
+            }else{
+                devStatus = deviceInfo.getDevStatus();
             }
+            item.setDevStatus(devStatus);
             // 正式使用
 //            if(deviceInfo == null){
 //                continue;
 //            }
+//            item.setDevStatus(deviceInfo.getDevStatus());
+
             item.setDevName(deviceInfo.getDevName());
             resultList.add(item);
         }

src/main/resources/mapper/IotDeviceMapper.xml

@@ -276,7 +276,7 @@
 
     <select id="selectHomeDeviceTypeStat" parameterType="IotDevice"
             resultType="com.yunfeiyun.agmp.iotm.web.domain.resvo.IotHomeTypeStatResVo">
-        SELECT d.devtypeBid, COUNT(d.devtypeBid) AS count, dt.devtypeName, dt.devtypePreview
+        SELECT d.devtypeBid, COUNT(d.devtypeBid) AS count, dt.devtypeName, dt.devtypePreview, dt.devtypeMapicon
         FROM IotDevice AS d
             LEFT JOIN TosDevicetype AS dt ON dt.devtypeBid = d.devtypeBid
         WHERE d.tid = #{tid}