调整监控设备常量，区分萤石云设备与海康设备

src/main/java/com/yunfeiyun/agmp/iots/core/mqtt/DeviceTopicService.java

@@ -95,7 +95,7 @@ public class DeviceTopicService {
     }
 
     private String[] getHKBatchSubTopic() {
-        List<IotDevice> iotDeviceList = iotDeviceService.selectAllDeviceByDeviceServiceName(ServiceNameConst.SERVICE_HIK_EZVIZ_MINITOR);
+        List<IotDevice> iotDeviceList = iotDeviceService.selectAllDeviceByDeviceServiceName(ServiceNameConst.SERVICE_EZVIZ_MINITOR);
         String[] topics = new String[0];
         if (iotDeviceList != null) {
             topics = new String[iotDeviceList.size()];

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/IotBigDataMonitorDeviceImpl.java

@@ -32,7 +32,7 @@ public class IotBigDataMonitorDeviceImpl implements Device {
     public Object receiveData(String topic, JSONObject cmdJson) throws Exception {
         String devCode = cmdJson.getString("imei");
         String picUrl = cmdJson.getString("Image");
-        IotDevice iotDevice = iotDeviceService.selectDeviceByDeviceServiceNameAndDevCode(ServiceNameConst.SERVICE_HIK_EZVIZ_MINITOR,devCode);
+        IotDevice iotDevice = iotDeviceService.selectDeviceByDeviceServiceNameAndDevCode(ServiceNameConst.SERVICE_EZVIZ_MINITOR,devCode);
         if(null != iotDevice){
             IotMonitorCapture iotMonitorCapture = new IotMonitorCapture();
             iotMonitorCapture.setDevBid(iotDevice.getDevBid());

src/main/java/com/yunfeiyun/agmp/iots/service/checker/CmdResultCheckService.java

@@ -236,7 +236,7 @@ public class CmdResultCheckService {
     private CmdResultChecker newChecker(IotDevice iotDevice, CmdExecModel cmdExecModel) {
         if (IotDeviceDictConst.TYPE_YF_CBD.equals(iotDevice.getDevtypeBid()) || IotDeviceDictConst.TYPE_YF_GKCBD.equals(iotDevice.getDevtypeBid())) {
             return new YfCbdCmdResultChecker(cmdExecModel);
-        } else if (IotDeviceDictConst.TYPE_YF_JKSB.equals(iotDevice.getDevtypeBid())) {
+        } else if (IotDeviceDictConst.TYPE_EZVIZ_JKSB.equals(iotDevice.getDevtypeBid())) {
             return new EzvizCmdResultChecker(cmdExecModel);
         }
         return null;

src/main/java/com/yunfeiyun/agmp/iots/service/impl/WarnService.java

@@ -776,7 +776,7 @@ public class WarnService {
         if(count==null){
 
             IotDevice findDev = iotDeviceService.selectIotDeviceByDevBid(devBid);
-            if(IotDeviceDictConst.TYPE_YF_JKSB.equals(findDev.getDevtypeBid())){
+            if(IotDeviceDictConst.TYPE_EZVIZ_JKSB.equals(findDev.getDevtypeBid())){
                 count = statCbdCountHaikang(devBid,dataitemCode,hours,pestBid);
             }else{
                 count = statCbdCount(devBid,dataitemCode,hours,pestBid);
@@ -2188,7 +2188,7 @@ public class WarnService {
                 retCount = pestclassCount;
             }
 
-        }else if(findDevice.getDevtypeBid().equals(IotDeviceDictConst.TYPE_YF_JKSB)){
+        }else if(findDevice.getDevtypeBid().equals(IotDeviceDictConst.TYPE_EZVIZ_JKSB)){
 
             params.put("time_recogCreatedate"
                     , timeCond);