From 58b3eddd097d167c7f4723a88b84270d5290af38 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Wed, 13 Mar 2024 17:43:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9E=E6=9C=BA?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=9B=BE=E7=89=87=E8=AF=B7=E6=B1=82=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zc/business/controller/NonAutomaticWarningController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java index b622cabe..3baddb85 100644 --- a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java @@ -131,7 +131,7 @@ public class NonAutomaticWarningController extends BaseController { String illegalTrafficEvent = data.getString("illegalTrafficEvent"); String directionName = data.getString("directionName"); String crossingName = data.getString("crossingName"); - String targetPicUrl = "http://10.0.81.202/fjyj" + data.getString("targetPicUrl"); + String targetPicUrl = "https://10.0.81.28" + data.getString("targetPicUrl"); String laneNo = data.getString("laneNo"); ArrayList pictures = new ArrayList<>(); From 907bb7c3598b9dea1f0c17e679d8ac328790d407 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Wed, 13 Mar 2024 18:07:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9E=E6=9C=BA?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=9B=BE=E7=89=87=E8=AF=B7=E6=B1=82=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zc/business/controller/NonAutomaticWarningController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java index 3baddb85..82dc85aa 100644 --- a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java @@ -131,7 +131,7 @@ public class NonAutomaticWarningController extends BaseController { String illegalTrafficEvent = data.getString("illegalTrafficEvent"); String directionName = data.getString("directionName"); String crossingName = data.getString("crossingName"); - String targetPicUrl = "https://10.0.81.28" + data.getString("targetPicUrl"); + String targetPicUrl = "https://10.0.81.202/fjyj" + data.getString("targetPicUrl"); String laneNo = data.getString("laneNo"); ArrayList pictures = new ArrayList<>(); From f8b7073c50a139cb9a2a00cabcd8796de176c791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Fri, 15 Mar 2024 08:46:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=B2=E5=A4=84=E7=BD=AE=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BA=8B=E4=BB=B6=E7=8A=B6=E6=80=81=E5=A4=9A?= =?UTF-8?q?=E4=BA=86=E4=B8=AA=E2=80=9C-=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/business/DcEventMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml index ec472c71..bcb89011 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml @@ -451,8 +451,8 @@ CASE dc_event.event_state WHEN '0' THEN '待确认' WHEN '1' THEN '处理中' - WHEN '2' THEN '-已完成' - WHEN '3' THEN '-已撤销' + WHEN '2' THEN '已完成' + WHEN '3' THEN '已撤销' END AS stringEventState, CASE dc_event.event_source WHEN '1' THEN '96659'