From d4333ee497aa6c9a530311d19897ff0455388a28 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 1 Jan 2025 00:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quartz/task/PitmonitSouthsmosTask.java    | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java
index 16006b93..4e980863 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PitmonitSouthsmosTask.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.quartz.domain.*;
 import com.ruoyi.quartz.service.*;
 import okhttp3.*;
@@ -147,6 +148,9 @@ public class PitmonitSouthsmosTask {
                 .post(toJsonBody(params))
                 .build();
         String data=AttendanceTask.getResult(request);
+        if(StringUtils.isEmpty(data)){
+            return "";
+        }
         JSONObject jo=JSON.parseObject(data);
         data=jo.getJSONObject("data").getString("token");
         return data;
@@ -168,15 +172,15 @@ public class PitmonitSouthsmosTask {
         //List<DevPitmonitSouthsmosSurveypoint> spList=getSurveyPoint(token,orgId);
         //System.out.println(spList);
         //6.获取测点数据
-        List<DevPitmonitSouthsmosData> dataList=getElementData(orgId,"22","horizontal",token,DateUtil.parse("2024-01-01"),1);
-        System.out.println(dataList);
-        System.out.println(dataList.size());
+        //List<DevPitmonitSouthsmosData> dataList=getElementData(orgId,"22","horizontal",token,DateUtil.parse("2024-01-01"),1);
+        //System.out.println(dataList);
+        //System.out.println(dataList.size());
         //7.获取报警阈值
         //List<DevPitmonitSouthsmosThreshold> thList=getThreshold("53245",token);
         //System.out.println(thList);
         //8.获取报警信息
-        //List<DevPitmonitSouthsmosAlarm> alarmList=getAlarm(orgId,token,DateUtil.parse("2024-01-01"));
-        //System.out.println(alarmList);
+        List<DevPitmonitSouthsmosAlarm> alarmList=getAlarm(orgId,token,DateUtil.parse("2024-12-31"));
+        System.out.println(alarmList);
         //9.获取设备
         //List<DevPitmonitSouthsmosDevice> devList=getDevices(token,orgId);
         //System.out.println(devList);
@@ -187,6 +191,9 @@ public class PitmonitSouthsmosTask {
         Map<String, Object> params = new HashMap<>();
         params.put("structureId",orgId);
         String data=getJSON(APIBASEURL+url,token,params);
+        if(StringUtils.isEmpty(data)){
+            return  new ArrayList<>();
+        }
         JSONObject jo=JSON.parseObject(data);
         List<DevPitmonitSouthsmosDevice> list=jo.getList("data",DevPitmonitSouthsmosDevice.class);
         return  list;
@@ -202,6 +209,9 @@ public class PitmonitSouthsmosTask {
         Map<String, Object> params = new HashMap<>();
         params.put("isPaged","false");
         String data=getJSON(APIBASEURL+url,token,params);
+        if(StringUtils.isEmpty(data)){
+            return  new ArrayList<>();
+        }
         JSONArray jo=JSON.parseObject(data).getJSONArray("data");
         List<DevPitmonitSouthsmosElement> list=jo.toList(DevPitmonitSouthsmosElement.class);
         list.forEach(it->{
@@ -226,6 +236,9 @@ public class PitmonitSouthsmosTask {
         Map<String, Object> params = new HashMap<>();
         params.put("isPaged","false");
         String data=getJSON(APIBASEURL+url,token,params);
+        if(StringUtils.isEmpty(data)){
+            return  new ArrayList<>();
+        }
         JSONArray jo=JSON.parseObject(data).getJSONArray("data");
         List<DevPitmonitSouthsmosSurveypoint> list=jo.toList(DevPitmonitSouthsmosSurveypoint.class);
         return  list;
@@ -250,6 +263,9 @@ public class PitmonitSouthsmosTask {
         params.put("size",""+100);
         params.put("page",""+pageIndex);
         String data=getJSON(APIBASEURL+url,token,params);
+        if(StringUtils.isEmpty(data)){
+            return  new ArrayList<>();
+        }
         JSONObject jo=JSON.parseObject(data).getJSONObject("data");
         List<DevPitmonitSouthsmosData> list=jo.getList("list",DevPitmonitSouthsmosData.class);
         JSONArray jarr=jo.getJSONArray("list");
@@ -281,6 +297,9 @@ public class PitmonitSouthsmosTask {
         params.put("isPaged","false");
         params.put("spId",spId);
         String data=getJSON(APIBASEURL+url,token,params);
+        if(StringUtils.isEmpty(data)){
+            return  new ArrayList<>();
+        }
         JSONObject jo=JSON.parseObject(data);
         List<DevPitmonitSouthsmosThreshold> list=jo.getList("data",DevPitmonitSouthsmosThreshold.class);
         list.forEach(d->{
@@ -304,6 +323,9 @@ public class PitmonitSouthsmosTask {
         params.put("beginTime", DateUtil.format(dt, "YYYY-MM-dd 00:00:00"));
         params.put("status","false");
         String data=getJSON(APIBASEURL+url,token,params);
+        if(StringUtils.isEmpty(data)){
+            return  new ArrayList<>();
+        }
         JSONObject jo=JSON.parseObject(data);
         List<DevPitmonitSouthsmosAlarm> list=jo.getList("data", DevPitmonitSouthsmosAlarm.class);
         list.forEach(d->{