From 0fdd17ec335538b0b3fcfe08a46b1f09f59c65e9 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Fri, 2 Feb 2024 09:37:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zc/business/controller/DcEventTypeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEventTypeController.java b/zc-business/src/main/java/com/zc/business/controller/DcEventTypeController.java index 368dc349..f3152302 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcEventTypeController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcEventTypeController.java @@ -79,7 +79,7 @@ public class DcEventTypeController extends BaseController /** * 新增事件类型 */ -// @ApiOperation("新增事件类型") + @ApiOperation("新增事件类型") // @PreAuthorize("@ss.hasPermi('business:dcEventType:add')") @Log(title = "事件类型", businessType = BusinessType.INSERT) @PostMapping("/add") From 141d810e10ba0c85d0e0153e18141933db883d4d Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Fri, 2 Feb 2024 09:58:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zc/business/controller/DcEventTypeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEventTypeController.java b/zc-business/src/main/java/com/zc/business/controller/DcEventTypeController.java index f3152302..368dc349 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcEventTypeController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcEventTypeController.java @@ -79,7 +79,7 @@ public class DcEventTypeController extends BaseController /** * 新增事件类型 */ - @ApiOperation("新增事件类型") +// @ApiOperation("新增事件类型") // @PreAuthorize("@ss.hasPermi('business:dcEventType:add')") @Log(title = "事件类型", businessType = BusinessType.INSERT) @PostMapping("/add") From 3d0e88faae7d4df455570e684fa73810d96b5548 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Fri, 2 Feb 2024 10:13:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zc/business/service/impl/DcEventTypeServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventTypeServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventTypeServiceImpl.java index ab80aad2..f2ba04e2 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventTypeServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventTypeServiceImpl.java @@ -35,7 +35,10 @@ public class DcEventTypeServiceImpl implements IDcEventTypeService @Override public DcEventType selectDcEventTypeByEventType(Integer eventType) { - return dcEventTypeMapper.selectDcEventTypeByEventType(eventType); + DcEventType dcEventType = dcEventTypeMapper.selectDcEventTypeByEventType(eventType); + List configList = dcProcessConfigMapper.selectDcProcessConfigByEventType(eventType); + dcEventType.setProcessConfigList(configList); + return dcEventType; } /** From c5a9744c37bd737c0f8871b27b62759f80a80a55 Mon Sep 17 00:00:00 2001 From: wangsixiang <2970484253@qq.com> Date: Fri, 2 Feb 2024 19:36:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zc/business/domain/DcWarning.java | 8 ++++++++ .../mapper/business/DcPerceivedEventsWarningMapper.xml | 1 + .../main/resources/mapper/business/DcWarningMapper.xml | 8 ++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java index 1dfe4227..d7f02601 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java @@ -113,7 +113,15 @@ public class DcWarning extends BaseEntity private String latitude; + private String vehicleType; + public String getVehicleType() { + return vehicleType; + } + + public void setVehicleType(String vehicleType) { + this.vehicleType = vehicleType; + } public String getLane() { return lane; diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml index 7be20301..8e2305d5 100644 --- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml @@ -252,6 +252,7 @@ warning_title = #{warningTitle}, other_config = #{otherConfig}, lane = #{lane}, + vehicle_type = #{vehicleType}, where id = #{id} diff --git a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml index 4bc4185b..29e59c9c 100644 --- a/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcWarningMapper.xml @@ -22,11 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select id, stake_mark stakeMark, direction, dept_id deptId, - warning_state warningState, + warning_state warningState,vehicle_type, DATE_FORMAT(warning_time,'%Y-%m-%d %H:%m:%s')warningTime, user_id userId, warning_source warningSource, warning_level warningLevel, remark, DATE_FORMAT(create_time,'%Y-%m-%d %H:%m:%s')createTime, @@ -60,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"