/*基础数据模块跟设备网关通信的日志打印。*/

inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/ClientController.java

@@ -103,4 +103,20 @@ public class ClientController {
          throw new ServiceException("SYSTEM BUSY, TRY LATER!");
       }
    }
+
+   @PostMapping({"/syncModel"})
+   public AjaxResult syncModel(@RequestBody String msg) {
+      try {
+         JSONObject.parseObject(msg);
+         JSONObject jsonObject = clientService.callDeviceCommand(msg);
+         logger.info("[=>TCPSERVER] 巡视主机下发同步模型命令: {}, 结果: {}", msg, jsonObject);
+         return StringUtils.equals(jsonObject.getString("code"), "500")?AjaxResult.fail(500, jsonObject.getString("msg")):AjaxResult.success();
+      } catch (ServiceException e) {
+         logger.error("[=>TCPSERVER] 巡视主机下发同步模型命令服务异常: {}", e.getMessage());
+         throw new ServiceException(e.getMessage());
+      } catch (Exception e) {
+         logger.error("[=>TCPSERVER] 巡视主机下发同步模型命令: {}", e.getMessage());
+         throw new ServiceException("下发数据失败，msg格式不正确");
+      }
+   }
 }

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/BasedataMontDataMqAcceptHandle.java

@@ -43,9 +43,10 @@ public class BasedataMontDataMqAcceptHandle {
     )
     @RabbitHandler
     public void onOrderMessage(@Payload String order, Channel channel, @Headers Map<String, Object> headers) throws Exception {
-        log.info("MSG BUS RECV MSG: {}", order);
         JSONObject jsonObject = JSONObject.parseObject(order);
         String Type = jsonObject.getString("Type");
+        String uuid = jsonObject.getString("uuid");
+        log.info("[METADATA] RECV MSG FROM RABBITMQ 会话: {}, 类型: {}, 消息体: {}", uuid, Type, order);
         if (null != Type && !Type.isEmpty()) {
             Long deliveryTag = (Long) headers.get("amqp_deliveryTag");
             channel.basicAck(deliveryTag, false);

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java

@@ -3,6 +3,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBook;
 import com.inspect.metadata.eqpbook.domain.BasedataEqpBookChannel;
 import com.inspect.metadata.eqpbook.domain.vo.BasedataEqpBookChannelQueryVo;
@@ -20,6 +21,8 @@ import com.inspect.base.redis.service.RedisService;
 import java.util.Date;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -27,6 +30,8 @@ import javax.annotation.Resource;
 
 @Component("basedataMont-heartbeat")
 public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHandleService {
+    private final Logger log = LoggerFactory.getLogger(BasedataMontHeartBeatConsumerHandle.class);
+
     @Resource
     private IBasedataEqpBookService basedataEqpBookService;
     @Resource
@@ -39,6 +44,10 @@ public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHan
     private String liveSIPB_URL;
 
     public void handMontData(JSONObject jsonObject) {
+        String Type = jsonObject.getString("Type");
+        String uuid = jsonObject.getString("uuid");
+        log.info(Color.GREEN + "[METADATA] handMontData 会话: {}, 类型: {}, 消息体: {}" + Color.END, uuid, Type, jsonObject.toJSONString());
+
         String SendCode = jsonObject.getString("SendCode");
         if (null != SendCode && !SendCode.isEmpty()) {
             if ("nvrGwbMedia".equals(SendCode)) {
@@ -53,6 +62,11 @@ public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHan
     public void robotVavOnlineStatusHandle(String SendCode, JSONObject jsonObject) {
         BasedataEqpBook basedataEqpbook = new BasedataEqpBook();
         basedataEqpbook.setMainSystemCode(SendCode);
+
+        String Type = jsonObject.getString("Type");
+        String uuid = jsonObject.getString("uuid");
+        log.info(Color.GREEN + "[METADATA] handMontData 会话: {}, 类型: {}, 消息体: {}, 台账: {}" + Color.END, uuid, Type, jsonObject.toJSONString(), basedataEqpbook);
+
         List<BasedataEqpBook> eqpBooks = this.basedataEqpBookService.selectBasedataEqpBookList(basedataEqpbook);
         if (null != eqpBooks && !eqpBooks.isEmpty()) {
             for (BasedataEqpBook book : eqpBooks) {
@@ -63,8 +77,9 @@ public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHan
                 Date nowTime = DateUtils.getNowDate();
                 this.patrolDeviceOnlineHandle(patrolDeviceCode, eqpBookId, heart_beat_interval, heartBeatInterval, nowTime);
             }
+        } else {
+            basedataEqpBookService.insertBasedataEqpBook(basedataEqpbook);
         }
-
     }
 
     public void ipcNvrOnlineStatusHandle(JSONObject jsonObject) {