From 252d2a8ab277762a03daf6652c59f19a65239443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AF=85?= <97163845@qq.com> Date: Mon, 21 Apr 2025 14:24:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B0=E5=B0=BC-=E5=B7=A1=E8=A7=86=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=B7=A1=E6=A3=80=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E2=BC=9Dbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/inspect/ivs/service/IvsCommonService.java | 4 ++-- .../src/main/resources/mapper/task/PatrolResultMapper.xml | 4 ++-- .../eqpbook/controller/BasedataEqpBookChannelController.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java index edf2031..ae777cc 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java @@ -233,7 +233,7 @@ public class IvsCommonService { conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); conn.setRequestProperty("Accept-Charset", "utf-8"); conn.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); - conn.setRequestProperty("Cookie", Cookie); + conn.setRequestProperty("Cookie", "JSESSIONID=" + Cookie); conn.setDoOutput(true); conn.setDoInput(true); conn.connect(); @@ -298,7 +298,7 @@ public class IvsCommonService { connection.setRequestProperty("accept", "*/*"); connection.setRequestProperty("connection", "Keep-Alive"); connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - connection.setRequestProperty("Cookie", Cookie); + connection.setRequestProperty("Cookie", "JSESSIONID=" + Cookie); //添加自定义请求头 // 设置请求头 connection.connect(); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index a7a101c..e399633 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -1012,8 +1012,8 @@ LEFT JOIN basedata_patrolpoint bp ON pr.device_id = bp.patrol_point_id LEFT JOIN basedata_device bd ON bp.device_id = bd.device_id - and pr.time >= #{startTime} - and pr.time <= #{endTime} + and pr.time >= CONCAT(#{startTime}, ' 00:00:00') + and pr.time <= CONCAT(#{endTime}, ' 23:59:59') and pr.device_id = #{deviceId} and pr.task_patrolled_id = #{taskPatrolledId} and bd.device_id = #{componentId} diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java index fa05c8b..3bb9854 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookChannelController.java @@ -139,9 +139,9 @@ public class BasedataEqpBookChannelController extends BaseController { } if(channel.getChannelType().equals("ir")){ if(channel.getOnlineState().equals("1")){ - ir.setNormalCount(vl.getNormalCount() + 1); + ir.setNormalCount(ir.getNormalCount() + 1); } else { - ir.setAnomalyCount(vl.getAnomalyCount() + 1); + ir.setAnomalyCount(ir.getAnomalyCount() + 1); } } }