Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfigHzims.java

@@ -60,11 +60,11 @@ public class MqttConfigHzims {
             log.info(fdpClient.toString()+fdpClient.getClientId());
             //drools
             DroolsSoeSubscribe droolsSoeSubscribe = new DroolsSoeSubscribe();
-            MqttAsyncClient droolsClient = droolsSoeSubscribe.subscribe(mqttConfig, "#",Collections.singletonList("#"), droolsMqttConsumer);
+            MqttAsyncClient droolsClient = droolsSoeSubscribe.subscribe(mqttConfig, Collections.singletonList("#"), droolsMqttConsumer);
             log.info(droolsClient.toString()+droolsClient.getClientId());
             //Soe
             SoeSubscribe soeSubscribe = new SoeSubscribe();
-            MqttAsyncClient soeClient = soeSubscribe.subscribe(mqttConfig, "#",Collections.singletonList("#"), soeMqttConsumer);
+            MqttAsyncClient soeClient = soeSubscribe.subscribe(mqttConfig, Collections.singletonList("#"), soeMqttConsumer);
             log.info(soeClient.toString()+soeClient.getClientId());
             //hz3000
             HZ3000SoeSubscribe hz3000SoeSubscribe = new HZ3000SoeSubscribe();
@@ -72,7 +72,7 @@ public class MqttConfigHzims {
             log.info(hz3000Client.toString()+hz3000Client.getClientId());
             //视频
             SoeSubscribe subscribe = new SoeSubscribe();
-            MqttAsyncClient videoClient = subscribe.subscribe(mqttConfig, "#",Collections.singletonList("#"), videoMqttConsumer);
+            MqttAsyncClient videoClient = subscribe.subscribe(mqttConfig, Collections.singletonList("#"), videoMqttConsumer);
             log.info(videoClient.toString()+videoClient.getClientId());
         }catch (Exception e){
             log.error(e.toString()) ;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/controller/HistoryController.java

@@ -1,14 +1,11 @@
 package com.hnac.hzims.operational.history.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.operational.history.service.AlarmService;
 import com.hnac.hzims.operational.history.service.PointService;
 import com.hnac.hzims.operational.history.vo.HistoricalCurveVo;
 import com.hnac.hzims.operational.history.vo.HistoryProjectAlarmVo;
-import com.hnac.hzinfo.dataconfig.entity.Device;
-import com.hnac.hzinfo.datasearch.soe.domian.SoeData;
-import com.hnac.hzinfo.datasearch.soe.domian.SoeQueryCondition;
+import com.hnac.hzinfo.sdk.v5.common.Query;
 import com.hnac.hzinfo.sdk.v5.device.vo.DeviceInstanceAttrVO;
 import com.hnac.hzinfo.sdk.v5.device.vo.DeviceInstanceVO;
 import com.hnac.hzinfo.sdk.v5.hzfac.vo.FacDeviceAttrVO;
@@ -20,7 +17,6 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
-import javax.management.Query;
 import java.util.List;
 import java.util.Map;
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/AlarmService.java

@@ -1,13 +1,8 @@
 package com.hnac.hzims.operational.history.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.operational.history.vo.HistoryProjectAlarmVo;
-import com.hnac.hzinfo.datasearch.soe.domian.SoeData;
-import com.hnac.hzinfo.datasearch.soe.domian.SoeQueryCondition;
-import com.hnac.hzinfo.sdk.v5.device.vo.DeviceInstanceAttrVO;
+import com.hnac.hzinfo.sdk.v5.common.Query;
 
-import javax.management.Query;
-import java.util.List;
 import java.util.Map;
 
 /**

hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/impl/AlarmServiceImpl.java

@@ -3,13 +3,13 @@ package com.hnac.hzims.operational.history.service.impl;
 import com.hnac.hzims.operational.history.service.AlarmService;
 import com.hnac.hzims.operational.history.vo.HistoryProjectAlarmVo;
 import com.hnac.hzinfo.sdk.core.response.Result;
+import com.hnac.hzinfo.sdk.v5.common.Query;
 import com.hnac.hzinfo.sdk.v5.soe.SoeDataClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springframework.stereotype.Service;
 
-import javax.management.Query;
 import java.util.HashMap;
 import java.util.Map;