mqtt修改

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEquipmentLogExtService.java

@@ -29,6 +29,6 @@ public interface IMesEquipmentLogExtService {
     Boolean checkEquipQuality(Integer quality);
 
     @ApiOperation(value = "根据设备ID 查询设备ID分表所有采集数据")
-    MesEquipmentLog queryMesEquipmentLog( Integer equipId, Long equipVariableId);
+    MesEquipmentLog queryMesEquipmentLog(String organizeCode, Integer equipId, Long equipVariableId);
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java

@@ -157,11 +157,13 @@ public class MesEquipmentLogService implements IMesEquipmentLogService {
     public void updateValue(EquipLogMqttMsg equipLogMqttMsg) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(equipLogMqttMsg.getTagAddress(), "tagAddress", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(Integer.valueOf(equipLogMqttMsg.getPTCode()), "equipId", ddlPackBean);
+
         MesEquipmentVariable mesEquipmentVariable = equipmentVariableRepository.getByProperty(ddlPackBean);
         if (mesEquipmentVariable == null) {
             LOGGER.info("tagAddress 不存在【{}】", equipLogMqttMsg.getTagAddress());
         }
-        MesEquipmentLog equipmentLog = mesEquipmentLogExtService.queryMesEquipmentLog(Integer.valueOf(equipLogMqttMsg.getPTCode()), mesEquipmentVariable.getId());
+        MesEquipmentLog equipmentLog = mesEquipmentLogExtService.queryMesEquipmentLog(mesEquipmentVariable.getOrganizeCode(), Integer.valueOf(equipLogMqttMsg.getPTCode()), mesEquipmentVariable.getId());
         ConvertBean.serviceModelUpdate(equipmentLog, "mqtt");
         mesEquipmentLogRepository.update(equipmentLog);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java

@@ -171,9 +171,11 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService {
     }
 
     @Override
-    public MesEquipmentLog queryMesEquipmentLog(Integer equipId, Long equipVariableId) {
+    public MesEquipmentLog queryMesEquipmentLog(String organizeCode, Integer equipId, Long equipVariableId) {
 
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(equipId, "equipId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(equipVariableId, "equipVariableId", ddlPackBean);