From 1f169c88a7c8fb7d0d980ac31f3cdf7b35bd68b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Thu, 9 May 2024 18:38:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=9F=A5=E8=AF=A2=E4=B8=BA=E7=A9=BA=E8=B7=B3?= =?UTF-8?q?=E5=87=BA=E5=BE=AA=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zc/business/service/impl/DcEventServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index 9ed91296..4f67491b 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -745,6 +745,9 @@ public class DcEventServiceImpl extends ServiceImpl impl int i7 = -1; for (String id : ids) { DcEvent dcEvent = dcEventMapper.selectDcEventMainById(id); + if (dcEvent==null){ + continue; + } int eventType = Math.toIntExact(dcEvent.getEventType()); i7 = dcEventMapper.deleteDcEventById(id); From f71b94889a0ccd3d9f46de48990e6af7f8ed76eb Mon Sep 17 00:00:00 2001 From: wangsixiang <2970484253@qq.com> Date: Thu, 9 May 2024 19:46:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DcPublishManageController.java | 11 ++++++++++- .../com/zc/business/mapper/DcPublishManageMapper.java | 5 ++++- .../zc/business/service/IDcPublishManageService.java | 2 ++ .../service/impl/DcPublishManageServiceImpl.java | 5 +++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcPublishManageController.java b/zc-business/src/main/java/com/zc/business/controller/DcPublishManageController.java index 86b185ba..33ac456d 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcPublishManageController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcPublishManageController.java @@ -1,5 +1,6 @@ package com.zc.business.controller; +import java.util.HashMap; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -132,5 +133,13 @@ public class DcPublishManageController extends BaseController { return AjaxResult.success(dcPublishManageService.releaseTrendsPublishManage()); } - + //统计服务,月发布渠道趋势分析 + @PostMapping("/monthTrendsPublishManage") + public AjaxResult monthTrendsPublishManage(@RequestBody DcPublishManage dcPublishManage) + { + if (dcPublishManage==null||dcPublishManage.getPublishTime()==null){ + return AjaxResult.error("参数错误"); + } + return AjaxResult.success(dcPublishManageService.monthTrendsPublishManage(dcPublishManage)); + } } diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcPublishManageMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcPublishManageMapper.java index 7076aaf3..28263919 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcPublishManageMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcPublishManageMapper.java @@ -53,7 +53,8 @@ public interface DcPublishManageMapper * @return 结果 */ int deleteDcPublishManageById(Long id); - + //删除事件发布记录 params 事件id + int deleteDcPublishManageEventId(String eventId); /** * 批量删除信息发布管理记录 * @@ -73,4 +74,6 @@ public interface DcPublishManageMapper public List> eventTypePublishManage(); //统计今日发布趋势分析 public List> releaseTrendsPublishManage(); + //统计月发布趋势分析 + public List> monthTrendsPublishManage(DcPublishManage dcPublishManage); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcPublishManageService.java b/zc-business/src/main/java/com/zc/business/service/IDcPublishManageService.java index a0333386..18c2165b 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcPublishManageService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcPublishManageService.java @@ -66,4 +66,6 @@ public interface IDcPublishManageService public List> eventTypePublishManage(); //统计今日发布趋势分析 public List> releaseTrendsPublishManage(); + //统计月发布趋势分析 + public List> monthTrendsPublishManage(DcPublishManage dcPublishManage); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcPublishManageServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcPublishManageServiceImpl.java index a6602b50..808c7e30 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcPublishManageServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcPublishManageServiceImpl.java @@ -125,4 +125,9 @@ public class DcPublishManageServiceImpl implements IDcPublishManageService public List> releaseTrendsPublishManage() { return dcPublishManageMapper.releaseTrendsPublishManage(); } + //统计月发布趋势分析 + @Override + public List> monthTrendsPublishManage(DcPublishManage dcPublishManage) { + return dcPublishManageMapper.monthTrendsPublishManage(dcPublishManage); + } } From 88bd49c1ff0a54d4a802c678de5648e65426d5fd Mon Sep 17 00:00:00 2001 From: wangsixiang <2970484253@qq.com> Date: Thu, 9 May 2024 19:47:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/business/DcPublishManageMapper.xml | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml index 8db6431a..d6df52a6 100644 --- a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml @@ -185,13 +185,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from dc_publish_manage where id = #{id} - + + delete from dc_publish_manage where event_id = #{eventId} + delete from dc_publish_manage where id in #{id} + + \ No newline at end of file From 2c155937c76f67adc0ec0decd43352bcd0c85c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Thu, 9 May 2024 19:48:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BF=A1=E6=81=AF=E5=8F=91=E5=B8=83=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zc/business/service/impl/DcEventServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index 4f67491b..6ef7a01f 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -77,6 +77,9 @@ public class DcEventServiceImpl extends ServiceImpl impl @Autowired private IDcEventProcessService dcEventProcessService; + @Autowired + private DcPublishManageMapper dcPublishManageMapper; + private final String HAPPEN = "发生"; private final String EVENT = "事件"; private final String SUBEVENT = "0"; @@ -216,7 +219,7 @@ public class DcEventServiceImpl extends ServiceImpl impl //交通管制 case 3: if (dcEvent.getDcEventTrafficControl() != null) { - //TODO 插入多个收费站 + // 插入多个收费站 if (dcEvent.getDcEventTrafficControl().getFacilityIds().length == 1) {//facilityIds==1 说明只选择了一个收费站 if (dcEventId != null && !dcEventId.equals("")) {//不等于空 事件处置页面 修改 @@ -748,6 +751,8 @@ public class DcEventServiceImpl extends ServiceImpl impl if (dcEvent==null){ continue; } + // 删除信息发布记录 + dcPublishManageMapper.deleteDcPublishManageEventId(id); int eventType = Math.toIntExact(dcEvent.getEventType()); i7 = dcEventMapper.deleteDcEventById(id); @@ -830,7 +835,7 @@ public class DcEventServiceImpl extends ServiceImpl impl */ @Override public DcEvent selectEventSubclassById(int eventType, String id) { - //todo + // DcEvent dcEvent = dcEventMapper.selectDcEventById(id); List processConfigList = dcProcessConfigMapper.selectDcProcessConfigByEventType(Math.toIntExact(dcEvent.getEventType())); dcEvent.setProcessConfigList(processConfigList);