调整基础数据投递日志&放开掩蔽人数-双目摄像机设备类型

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/impl/BaseDataTransferService.java

@@ -143,7 +143,7 @@ public class BaseDataTransferService {
             String json = JSON.toJSONString(vo);
             String topic = "base/protectiveUnit";
 
-            log.info("发送防护单元基础信息，Topic: {}, Data: {}", topic, json);
+            log.info("发送防护单元基础信息：{}", json);
             MqttConnectionTool.MqttGateway gateway = mqttConnectionTool.connectOrRefresh(vo.getUserName(), vo.getPassword());
             gateway.sendToMqtt(topic, json);
 
@@ -249,7 +249,7 @@ public class BaseDataTransferService {
             // 30：网络监控摄像机（可兼用平时摄像机）
             // userIdToName.put(717, 30);
             // 20：人员统计-掩蔽人数双目统计摄像机
-            // userIdToName.put(719, 20);
+            userIdToName.put(719, 20);
             // 33：人员闯入-人员闯入监测传感器
             userIdToName.put(703, 33);
             userIdToName.put(704, 11);
@@ -286,7 +286,7 @@ public class BaseDataTransferService {
             Gson gson = new Gson();
             String topic = "base/sensorInfo";
             System.out.println(gson.toJson(map));
-            log.info("发送智能监管物联设施信息，Topic: {}, SensorID: {}", topic, vo.getDeviceId());
+            log.info("发送智能监管物联设施信息：{}", vo);
             MqttConnectionTool.MqttGateway gateway = mqttConnectionTool.connectOrRefresh(vo.getUserName(), vo.getPassword());
             gateway.sendToMqtt(topic, gson.toJson(map));