物联设备管理同步调整

nursing-unit-common/src/main/java/com/nu/dto/IotCameraInfoMQDto.java

@@ -84,4 +84,6 @@ public class IotCameraInfoMQDto{
 	private String maintainStatus;
 	/**日志ID*/
 	private String logId;
+	private String dimension;//设备维度
+	private String channel;//通道号
 }

nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java

@@ -37,4 +37,5 @@ public class IotElectricityMeterMQDto{
 	private String maintainStatus;
 	/**日志ID*/
 	private String logId;
+	private String dimension;//设备维度
 }

nursing-unit-common/src/main/java/com/nu/dto/IotHumidDeviceMQDto.java

@@ -72,4 +72,5 @@ public class IotHumidDeviceMQDto{
 	private String maintainStatus;
 	/**日志ID*/
 	private String logId;
+	private String dimension;//设备维度
 }

nursing-unit-common/src/main/java/com/nu/dto/IotWaterMeterMQDto.java

@@ -42,4 +42,5 @@ public class IotWaterMeterMQDto{
 	private String maintainStatus;
 	/**日志ID*/
 	private String logId;
+	private String dimension;//设备维度
 }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/CameraInfo.java

@@ -1,9 +1,6 @@
 package com.nu.modules.syncbiz.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-
 import java.io.Serializable;
 
 /**
@@ -89,4 +86,6 @@ public class CameraInfo implements Serializable {
 	private String maintainStatus;
 	/**日志ID*/
 	private String logId;
+	private String dimension;//设备维度
+	private String channel;//通道号
 }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/ElectricityMeter.java

@@ -41,4 +41,5 @@ public class ElectricityMeter implements Serializable {
 	private String maintainStatus;
 	/**日志ID*/
 	private String logId;
+	private String dimension;//设备维度
 }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/HumidDevice.java

@@ -77,4 +77,5 @@ public class HumidDevice implements Serializable {
 	private String maintainStatus;
 	/**日志ID*/
 	private String logId;
+	private String dimension;//设备维度
 }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/WaterMeter.java

@@ -45,4 +45,5 @@ public class WaterMeter implements Serializable {
 	private String maintainStatus;
 	/**日志ID*/
 	private String logId;
+	private String dimension;//设备维度
 }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/mapper/xml/SyncBizMapper.xml

@@ -55,7 +55,8 @@
                      depart_name as departName,
                      depart_server_url as departServerUrl,
                      sync_type as syncType,
-                     maintain_status as maintainStatus
+                     maintain_status as maintainStatus,
+                     channel as channel
               from nu_iot_tplink_camera
               where nu_id = #{nuId}
               order by id asc

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java

@@ -580,6 +580,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 cameraInfo.setDeviceStatus(deviceStatus);
                 cameraInfo.setChannel(channel);
                 baseMapper.updateDeviceStatusByDevId(cameraInfo);
+                if(deviceStatus.equals("0")){
+                    return Result.error("设备已离线");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -3429,12 +3432,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @return
      */
     public Map<String,Object> getMultitransUrl(CameraInfo cameraInfo,int counter){
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
-        map.put("error","0");
+        map.put("error", "0");
-        map.put("error","0");
+        map.put("error", "0");
+        String id = cameraInfo.getVideoDevId();
+        cameraInfo.setDeviceIndex(id);
+        CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
+        String parentId = entity.getParentId();
+        String channelId = "0";
+        if(!parentId.equals("0")){
+            channelId = entity.getChannel();
+        }
         StringBuffer sb = new StringBuffer();
         sb.append("{");
-        sb.append("\"devId\"").append(":").append("\"").append(cameraInfo.getVideoDevId()).append("\"");
+        if(!parentId.equals("0")){
+            sb.append("\"devId\"").append(":").append("\"").append(id).append("\"");
+        }else{
+            sb.append("\"devId\"").append(":").append("\"").append(parentId).append("\",");
+            sb.append("\"videoDeviceIndex\"").append(":").append("\"").append(id).append("\",");
+            sb.append("\"channelId\"").append(":").append(channelId);
+        }
         sb.append("}");
         String res = tumsApi.getMultitransUrl(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
@@ -3444,12 +3461,12 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             String url = result.getStr("rtspUrl");
             String wsUrl = result.getStr("wsUrl");
             String wssUrl = result.getStr("wssUrl");
-            CameraInfo entity = new CameraInfo();
+            CameraInfo resVo = new CameraInfo();
-            entity.setVideoDevId(cameraInfo.getVideoDevId());
+            resVo.setVideoDevId(cameraInfo.getVideoDevId());
-            entity.setUrl(url);
+            resVo.setUrl(url);
-            entity.setWsUrl(wsUrl);
+            resVo.setWsUrl(wsUrl);
-            entity.setWssUrl(wssUrl);
+            resVo.setWssUrl(wssUrl);
-            map.put("data",entity);
+            map.put("data", resVo);
         }else if(errorCode.equals("-80703")){
             try {
                 if(counter>10){