From 1cb75b4e73f4753d5df9ddc5709cb4b2b9cbba38 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Wed, 20 Mar 2024 19:10:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B0=94?= =?UTF-8?q?=E6=B0=94=E8=B1=A1=E9=A2=84=E8=AD=A6=E4=BF=A1=E6=81=AF=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0=20=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF=E7=8E=87?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E4=BD=BF=E7=94=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BroadcastController.java | 2 +- .../business/controller/StatusController.java | 5 ++++- .../controller/WeatherForecastController.java | 17 ++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/BroadcastController.java b/zc-business/src/main/java/com/zc/business/controller/BroadcastController.java index 379183cd..c76957cb 100644 --- a/zc-business/src/main/java/com/zc/business/controller/BroadcastController.java +++ b/zc-business/src/main/java/com/zc/business/controller/BroadcastController.java @@ -39,7 +39,7 @@ public class BroadcastController extends BaseController { private static final String SECRET = "21232f297a57a5a743894a0e4a801fc3"; - private static final String CALLBACKURL = "http://10.0.81.209/broadcast/logIn"; + private static final String CALLBACKURL = "http://10.0.81.202/broadcast/logIn"; private final static String URL = HTTP + "10.0.81.106/api/REST-API/"; diff --git a/zc-business/src/main/java/com/zc/business/controller/StatusController.java b/zc-business/src/main/java/com/zc/business/controller/StatusController.java index 691175fa..ba211c23 100644 --- a/zc-business/src/main/java/com/zc/business/controller/StatusController.java +++ b/zc-business/src/main/java/com/zc/business/controller/StatusController.java @@ -207,8 +207,11 @@ public class StatusController extends BaseController { maps.put("sucessRate",String.format("%.2f", sucessRate)+"%"); //离线率 maps.put("failRate",failRate); + List list = dcDeviceService.list(); + //已使用数量 + maps.put("sumUseState",String.valueOf(lastEntry.size())); //总数 - maps.put("sum",String.valueOf(lastEntry.size())); + maps.put("sum",String.valueOf(list.size())); subMap.put("全部设备",maps); return AjaxResult.success(subMap); diff --git a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java index 9ff01fbe..c6915458 100644 --- a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java +++ b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java @@ -116,15 +116,14 @@ public class WeatherForecastController extends BaseController { JSONArray meteorologicalEarlyWarning6 = jsonObject.getJSONArray("meteorologicalEarlyWarning6"); JSONArray meteorologicalEarlyWarning7 = jsonObject.getJSONArray("meteorologicalEarlyWarning7"); JSONArray meteorologicalEarlyWarning8 = jsonObject.getJSONArray("meteorologicalEarlyWarning8"); - return AjaxResult.success(meteorologicalEarlyWarning1.size() + - meteorologicalEarlyWarning2.size() + - meteorologicalEarlyWarning3.size() + - meteorologicalEarlyWarning4.size() + - meteorologicalEarlyWarning5.size() + - meteorologicalEarlyWarning6.size() + - meteorologicalEarlyWarning7.size() + - meteorologicalEarlyWarning8.size() - ); + return AjaxResult.success((meteorologicalEarlyWarning1 == null ? 0 : meteorologicalEarlyWarning1.size()) + + (meteorologicalEarlyWarning2 == null ? 0 : meteorologicalEarlyWarning2.size()) + + (meteorologicalEarlyWarning3 == null ? 0 : meteorologicalEarlyWarning3.size()) + + (meteorologicalEarlyWarning4 == null ? 0 : meteorologicalEarlyWarning4.size()) + + (meteorologicalEarlyWarning5 == null ? 0 : meteorologicalEarlyWarning5.size()) + + (meteorologicalEarlyWarning6 == null ? 0 : meteorologicalEarlyWarning6.size()) + + (meteorologicalEarlyWarning7 == null ? 0 : meteorologicalEarlyWarning7.size()) + + (meteorologicalEarlyWarning8 == null ? 0 : meteorologicalEarlyWarning8.size())); } From 7d8bdfbf5eacd0a75e506f4b688826cf1f72d4b1 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Wed, 20 Mar 2024 19:25:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=82=E5=95=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/business/DcDeviceMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index c7e78309..7c2e06e7 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -73,9 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark, t1.direction, t1.device_name, t1.device_code, t1.device_type, t1.installation_Date,t1.production_date,t1.durable_years,t1.installation_site,t1.use_state,t1.device_state,t1.other_config,t1.remark, t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.device_img,t1.child_type, - t1.facilities_type,t2.longitude,t2.latitude + t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer from dc_device t1 left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction + left join dc_product t3 on t3.id = t1.product_id and t1.id = #{id} and t1.iot_device_id = #{iotDeviceId} From 2fa877d04529b302cefe6c89b446eac655943a69 Mon Sep 17 00:00:00 2001 From: "Mr.Wang" Date: Thu, 21 Mar 2024 09:33:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BD=93=E5=A4=A9=E8=AE=BE=E5=A4=87=E6=8C=87=E5=AE=9A=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zc/business/controller/DcDeviceController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java index d0b0f0c3..113d1b76 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java @@ -229,6 +229,8 @@ public class DcDeviceController extends BaseController { // 将日期列表以逗号分隔并设置为查询条件的值 props.put("terms[0].value", String.join(",", dateList)); props.put("paging", false); + props.put("sorts[0].order","asc"); + props.put("sorts[0].name","timestamp"); AjaxResult ajaxResult = queryDeviceProperties(deviceId, propertyId, props); if (!ajaxResult.get("code").equals(200)) { return ajaxResult;