Przeglądaj źródła

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

liuyaowen 1 rok temu
rodzic
commit
49d29268cf

+ 3 - 3
src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/IHikVisionEzvizDeviceImpl.java

@@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit;
 
 @Service
 @Slf4j
-@Component(value = ServiceNameConst.SERVICE_HIK_EZVIZ_MINITOR)
+@Component(value = ServiceNameConst.SERVICE_EZVIZ_MINITOR)
 public class IHikVisionEzvizDeviceImpl extends HttpDeviceAbstractImpl implements IHikVisionEzvizDevice {
     @Resource
     private EzvizHttpClient ezvizHttpClient;
@@ -109,7 +109,7 @@ public class IHikVisionEzvizDeviceImpl extends HttpDeviceAbstractImpl implements
                 JSONObject dataObject = JSONObject.from(data);
                 String picUrl = dataObject.getString("picUrl");
                 String devCode = param.getString("deviceSerial")+"-"+param.getString("channelNo");
-                IotDevice iotDevice = iotDeviceService.selectDeviceByDeviceServiceNameAndDevCode(ServiceNameConst.SERVICE_HIK_EZVIZ_MINITOR,devCode);
+                IotDevice iotDevice = iotDeviceService.selectDeviceByDeviceServiceNameAndDevCode(ServiceNameConst.SERVICE_EZVIZ_MINITOR,devCode);
                 IotMonitorCapture iotMonitorCapture = new IotMonitorCapture();
                 iotMonitorCapture.setDevBid(iotDevice.getDevBid());
                 iotMonitorCapture.setPicBid(iotMonitorCapture.getUUId());
@@ -166,7 +166,7 @@ public class IHikVisionEzvizDeviceImpl extends HttpDeviceAbstractImpl implements
         try {
             log.info("海康设备定时检测设备在线状态开始");
             List<CompletableFuture<JSONObject>> completableFutureList = new LinkedList<>();
-            List<IotDevice> iotDeviceList = iotDeviceService.selectAllDeviceByDeviceServiceName(ServiceNameConst.SERVICE_HIK_EZVIZ_MINITOR);
+            List<IotDevice> iotDeviceList = iotDeviceService.selectAllDeviceByDeviceServiceName(ServiceNameConst.SERVICE_EZVIZ_MINITOR);
             for(IotDevice iotDevice : iotDeviceList){
                 CompletableFuture<JSONObject> generateGraphics = CompletableFuture.supplyAsync(() -> {
                     try {