坤泰日志功能对接

@@ -47,7 +47,7 @@
 以下为设备的标准命名前缀、示例及说明（采用区域 A 示例）：
 
 | 设备名称   | 前缀（大写） | 示例               | 示例说明                       |
-|--------|--------|-----------------|------------------------------|
+|--------|--------|------------------|----------------------------|
 | 系统级别参数 | SYS    | A_SYS_0_SZGD     | A 区 市政电源供电信号，<br/>这里的编号0表示不是plc下挂 |
 | 喂料机    | TLJ    | A_TLJ_1_RUN      | A 区 1 号喂料机运行状态             |
 | 增氧机    | ZYJ    | A_ZYJ_2_ALARM    | A 区 2 号增氧机告警状态             |
@@ -73,10 +73,19 @@
 | 变频控制柜  | BPKZG  | A_BPKZG_1_STATUS | A 区 1 号变频控制柜状态             |
 | 液位计    | YWJ    | A_YWJ_1_VALUE    | A 区 1 号液位计读数               |
 | 热泵     | RB     | A_RB_1_RUN       | A 区 1 号热泵运行状态              |
+| 吸污     | XW     | A_XW_1_RUN       | A 区 1 号吸污泵设备运行状态 |
+| 循环水供水泵     | XHSGSB     | A_XHSGSB_1_RUN       | A 区 1 号循环水供水泵运行状态 |
+| 循环水回水泵     | XHSHSB     | A_XHSHSB_1_RUN       | A 区 1 号循环水回水泵运行状态 |
+| 转鼓电机     | ZGDJ     | A_ZGDJ_1_RUN       | A 区 1 号转鼓电机运行状态 |
+| 冲洗水泵     | CXSB     | A_CXSB_1_RUN       | A 区 1 号冲洗水泵运行状态 |
+| 臭氧发生器     | CYFSQ     | A_CYFSQ_1_RUN       | A 区 1 号臭氧发生器运行状态 |
+| 紫外线杀菌器     | ZWXSJQ     | A_ZWXSJQ_1_RUN       | A 区 1 号紫外线杀菌器运行状态 |
+| 鼓风机     | GFJ     | A_GFJ_1_RUN       | A 区 1 号鼓风机运行状态 |
+| 车间供水泵     | CJGSB     | A_CJGSB_1_RUN       | A 区 1 号车间供水泵运行状态 |
 ---
 
 ## 三、命名示例说明
-
+``
 ### 1. 状态型
 
 ```

@@ -100,4 +100,5 @@ public class DeviceCach {
     {
          parserDeviceHostDtoMap.remove(deviceId);
     }
+
 }

@@ -51,6 +51,7 @@ public class SysCommandListenService implements RocketMQReplyListener<MessageExt
                 return new Message(MessageCode.DEFAULT_SUCCESS_CODE,"指令发送成功");
             case upIotThingsModel:
                 iotThingsModelService.upIotThingsModel(deviceCommand.getData().get("product_id").getAsInt());
+                log.info("更新产品模型成功:{}",IotThingsModelService.getIotProductTranslateMap());
                 return new Message(MessageCode.DEFAULT_SUCCESS_CODE,"指令发送成功");
             case upIotThingsModelTranslate:
                 iotThingsModelService.upIotThingsModelTranslate(deviceCommand.getData().get("product_id").getAsInt());

@@ -334,4 +334,11 @@ public class IotThingsModelService {
         return thingsModel;
     }
 
+    public static Map<Integer, Map<String, String>> getIotProductTranslateMap() {
+        return iotProductTranslateMap;
+    }
+
+    public static Map<Integer, Map<String, IotThingsModel>> getIotThingsModelMap() {
+        return iotThingsModelMap;
+    }
 }

+package com.zhonglai.luhui.mqtt.service.proxy.controller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.zhonglai.luhui.device.domain.IotThingsModel;
+import com.zhonglai.luhui.device.protocol.factory.config.DeviceCach;
+import com.zhonglai.luhui.device.protocol.factory.control.DeviceCommandListenService;
+import com.zhonglai.luhui.device.protocol.factory.service.IotThingsModelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.Map;
+
+@Api(tags = "系统运行接口")
+@Controller
+@RequestMapping("/sys")
+public class SysConfigController {
+
+    @Autowired
+    private IotThingsModelService thingsModelService;
+    @ApiOperation("获取缓存物模型")
+    @RequestMapping(value = "getIotThingsModelMap",method = RequestMethod.GET)
+    public AjaxResult getIotThingsModelMap()
+    {
+        return AjaxResult.success(thingsModelService.getIotThingsModelMap());
+    }
+
+    @ApiOperation("获取翻译缓存物模型")
+    @RequestMapping(value = "getIotProductTranslateMap",method = RequestMethod.GET)
+    public AjaxResult getIotProductTranslateMap()
+    {
+        return AjaxResult.success(thingsModelService.getIotProductTranslateMap());
+    }
+
+    @ApiOperation("获取缓存设备")
+    @RequestMapping(value = "getDeviceInfo",method = RequestMethod.GET)
+    public AjaxResult getDeviceInfo(String deviceInfoId)
+    {
+        return AjaxResult.success(DeviceCach.getDeviceInfo(deviceInfoId));
+    }
+
+    @ApiOperation("获取缓存主机")
+    @RequestMapping(value = "getDeviceHost",method = RequestMethod.GET)
+    public AjaxResult getDeviceHost(String deviceId)
+    {
+        return AjaxResult.success(DeviceCach.getDeviceHost(deviceId));
+    }
+}

@@ -29,7 +29,7 @@ mqtt:
   client:
     #客户端操作时间
     operationTime: 10
-  productids: 40
+  productids: 39
 
 #rocketmq配置信息
 rocketmq: