From a0912fe376f382cf7056e9ff3bc87a607681c981 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期二, 21 三月 2023 11:35:41 +0800 Subject: [PATCH] 驾驶舱接口优化 --- ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 9 +++++---- ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 2 +- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java index c0e01fc..db89209 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java @@ -96,7 +96,7 @@ al.setCount(alCount); typeVO1s.add(al); VideoAndAreaVO hand = new VideoAndAreaVO(); - hand.setName("浜哄伐涓婃姤"); + hand.setName("缃戞牸宸℃煡"); hand.setRatio(new BigDecimal(handCount * 1.0 / allCount).setScale(2, BigDecimal.ROUND_HALF_UP)); hand.setCount(handCount); typeVO1s.add(hand); diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java index d216aa5..6c5b489 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java @@ -76,6 +76,7 @@ baseCase.setCommunityId(videoPoint.getCommunityId()); baseCase.setSite(videoPoint.getAddress()); baseCase.setGridId(videoPoint.getGridId()); + baseCase.setSite(videoPoint.getAddress()); baseCaseService.save(baseCase); violations.setId(baseCase.getId()); diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml index e719964..4a87cec 100644 --- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml +++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml @@ -319,9 +319,10 @@ t1.alarm_time, t1.longitude, t1.latitude, - ( CASE WHEN t1.category = 1 THEN "杩濊" WHEN t1.category = 2 THEN "杩濆缓" ELSE "鍏朵粬" END ) AS type, - ( CASE WHEN t1.event_source = 1 THEN "瑙嗛宸℃煡" WHEN t1.event_source = 2 THEN "浜哄伐涓婃姤" ELSE "鍏朵粬" END ) AS alarmAdvice, - ( CASE WHEN t1.event_source = 1 THEN "瑙嗛宸℃煡" WHEN t1.event_source = 2 THEN "浜哄伐涓婃姤" ELSE "鍏朵粬" END ) AS source, +-- ( CASE WHEN t1.category = 1 THEN "杩濊" WHEN t1.category = 2 THEN "杩濆缓" ELSE "鍏朵粬" END ) AS type, +-- ( CASE WHEN t1.event_source = 1 THEN "瑙嗛宸℃煡" WHEN t1.event_source = 2 THEN "缃戞牸宸℃煡" ELSE "鍏朵粬" END ) AS alarmAdvice, + dd.name AS type, + ( CASE WHEN t1.event_source = 1 THEN "瑙嗛宸℃煡" WHEN t1.event_source = 2 THEN "缃戞牸宸℃煡" ELSE "鍏朵粬" END ) AS source, t1.site AS address, t2.description, t3.`name` AS point, @@ -337,7 +338,7 @@ WHEN t1.state = 7 THEN '澶勭疆' WHEN t1.state = 8 THEN '鏍告煡' WHEN t1.state = 9 THEN '缁撴' - END) `status` , + END) `alarmAdvice` , pdd.`name` as grade FROM ums_base_case t1 -- Gitblit v1.8.0