nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraDeviceSyncJob.java

@@ -1,19 +1,18 @@
 package com.nu.modules.tplink.camera.job;
 
 import cn.hutool.json.JSONObject;
-import com.nu.modules.tplink.camera.entity.CameraInfo;
 import lombok.extern.slf4j.Slf4j;
-import com.nu.modules.tplink.camera.service.ICameraInfoService;
-import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
+import com.nu.modules.tplink.camera.service.ICameraInfoService;
+import com.nu.modules.tplink.project.entity.ProjectInfo;
+import com.nu.modules.tplink.project.service.IProjectInfoService;
+import com.nu.modules.tplink.utils.TumsApi;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 摄像头设备信息同步
@@ -23,23 +22,40 @@ public class CameraDeviceSyncJob implements Job {
 
     @Autowired
     ICameraInfoService service;
+    @Autowired
+    IProjectInfoService pService;
+
+    @Autowired
+    private TumsApi tumsApi;
 
-    //每10分钟获取设备在线状态
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        List<CameraInfo> list = service.findAllList();
+        ProjectInfo pi = new ProjectInfo();
-        if(list!=null&&list.size()>0){
+        pi.setStatus(1);//正常状态
-            for(int i=0;i< list.size();i++){
+        List<ProjectInfo> projectList = pService.findList(pi);
-                CameraInfo cameraInfo = list.get(i);
+        if(projectList!=null&&projectList.size()>0){
-                Map<String,Object> map = new HashMap<>();
+            for(int i=0;i< projectList.size();i++){
-                map.put("deviceIndex",cameraInfo.getDeviceIndex());
+                ProjectInfo projectInfo = projectList.get(i);
-                map.put("type","switch");
+                String jsonRequest = "{\n" +
-                try{
+                        "    \"start\": 0,\n" +
-                    Result<JSONObject> result = service.getImageCommon(map);
+                        "    \"limit\": 1000,\n" +
-                    log.error("CameraDeviceSyncJob:{}-{}", DateUtils.now(),result.getResult());
+                        "    \"filterAnd\": {\n"+
-
+                        "        \"projectId\": \""+projectInfo.getProjectId()+"\",\n"+
-                }catch (Exception e){
+                        "        \"deviceTypeList\": [\"SURVEILLANCECAMERA\"]\n"+
-                    log.info(e.getMessage());
+                        "    },\n"+
+                        "    \"sort\": [{\n"+
+                        "        \"key\": \"deviceIndex\",\n"+
+                        "        \"value\": \"asc\"\n"+
+                        "    }]\n"+
+                        "}";
+//                System.out.println(jsonRequest);
+                String jsonResponse = tumsApi.getDeviceList(jsonRequest);
+                JSONObject jsonObject = new JSONObject(jsonResponse);
+                String errorCode = jsonObject.getStr("error_code");
+                if(errorCode.equals("0")){
+                    service.sync(jsonResponse);
+                }else{
+                    log.error("CameraDeviceSyncJob:{}-{}", DateUtils.now(),jsonObject.getStr("msg"));
                 }
             }
         }

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/job/ElectricityReadJob.java

@@ -21,7 +21,7 @@ public class ElectricityReadJob implements Job {
     IElectricityMeterService service;
 
     /**
-     * 每10分钟抄表一次
+     * 1小时一次
      * @param jobExecutionContext
      * @throws JobExecutionException
      */

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/job/WaterReadJob.java

@@ -22,7 +22,7 @@ public class WaterReadJob implements Job {
     IWaterMeterService service;
 
     /**
-     * 每10分钟抄表一次
+     * 1小时一次
      * @param jobExecutionContext
      * @throws JobExecutionException
      */

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/job/HumidReadJob.java

@@ -21,7 +21,7 @@ public class HumidReadJob implements Job {
     IHumidDeviceService service;
 
     /**
-     * 每10分钟抄表一次
+     * 5分钟一次
      * @param jobExecutionContext
      * @throws JobExecutionException
      */