Merge remote-tracking branch 'origin/master'

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

@@ -1,18 +1,19 @@
 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 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.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.DateUtils;
 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;
 
 /**
  * 摄像头设备信息同步
@@ -22,40 +23,23 @@ public class CameraDeviceSyncJob implements Job {
 
     @Autowired
     ICameraInfoService service;
-    @Autowired
-    IProjectInfoService pService;
-
-    @Autowired
-    private TumsApi tumsApi;
 
+    //每10分钟获取设备在线状态
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        ProjectInfo pi = new ProjectInfo();
-        pi.setStatus(1);//正常状态
-        List<ProjectInfo> projectList = pService.findList(pi);
-        if(projectList!=null&&projectList.size()>0){
-            for(int i=0;i< projectList.size();i++){
-                ProjectInfo projectInfo = projectList.get(i);
-                String jsonRequest = "{\n" +
-                        "    \"start\": 0,\n" +
-                        "    \"limit\": 1000,\n" +
-                        "    \"filterAnd\": {\n"+
-                        "        \"projectId\": \""+projectInfo.getProjectId()+"\",\n"+
-                        "        \"deviceTypeList\": [\"SURVEILLANCECAMERA\"]\n"+
-                        "    },\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"));
+        List<CameraInfo> list = service.findAllList();
+        if(list!=null&&list.size()>0){
+            for(int i=0;i< list.size();i++){
+                CameraInfo cameraInfo = list.get(i);
+                Map<String,Object> map = new HashMap<>();
+                map.put("deviceIndex",cameraInfo.getDeviceIndex());
+                map.put("type","switch");
+                try{
+                    Result<JSONObject> result = service.getImageCommon(map);
+                    log.error("CameraDeviceSyncJob:{}-{}", DateUtils.now(),result.getResult());
+
+                }catch (Exception e){
+                    log.info(e.getMessage());
                 }
             }
         }

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;
 
     /**
-     * 1小时一次
+     * 每10分钟抄表一次
      * @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;
 
     /**
-     * 1小时一次
+     * 每10分钟抄表一次
      * @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;
 
     /**
-     * 5分钟一次
+     * 每10分钟抄表一次
      * @param jobExecutionContext
      * @throws JobExecutionException
      */