From 473533d2c9aa431eb330e43cc0d0f359fde95a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 11 Nov 2025 09:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E6=AF=8F10=E5=88=86=E9=92=9F=E8=8E=B7=E5=8F=96=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=BD=93=E5=89=8D=E6=9C=BA=E6=9E=84=E7=9A=84=E7=89=A9?= =?UTF-8?q?=E8=81=94=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=BF=9B=E8=A1=8C=E4=B8=80=E6=AC=A1=E6=8A=84?= =?UTF-8?q?=E8=A1=A8=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../camera/job/CameraDeviceSyncJob.java | 54 +++++++------------ .../electricity/job/ElectricityReadJob.java | 2 +- .../nu/modules/tq/water/job/WaterReadJob.java | 2 +- .../yiweilian/humid/job/HumidReadJob.java | 2 +- 4 files changed, 22 insertions(+), 38 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraDeviceSyncJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraDeviceSyncJob.java index 7932c671..3f0e6ac5 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/job/CameraDeviceSyncJob.java +++ b/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 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 list = service.findAllList(); + if(list!=null&&list.size()>0){ + for(int i=0;i< list.size();i++){ + CameraInfo cameraInfo = list.get(i); + Map map = new HashMap<>(); + map.put("deviceIndex",cameraInfo.getDeviceIndex()); + map.put("type","switch"); + try{ + Result result = service.getImageCommon(map); + log.error("CameraDeviceSyncJob:{}-{}", DateUtils.now(),result.getResult()); + + }catch (Exception e){ + log.info(e.getMessage()); } } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/job/ElectricityReadJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/job/ElectricityReadJob.java index 67b5d56e..340d5803 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/job/ElectricityReadJob.java +++ b/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 */ diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/job/WaterReadJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/job/WaterReadJob.java index 210e74c3..e9252fc2 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/job/WaterReadJob.java +++ b/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 */ diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/job/HumidReadJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/job/HumidReadJob.java index 05fb1184..95ae01a4 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/job/HumidReadJob.java +++ b/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 */