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 1f2199cb..ad006952 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 @@ -26,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 信息发布管理记录Controller - * + * * @author ruoyi * @date 2024-04-19 */ @@ -60,18 +60,7 @@ public class DcPublishManageController extends BaseController } return AjaxResult.success(dcPublishManageService.selectEventDcPublishManageList(dcPublishManage)); } - /** - * 导出信息发布管理记录列表 - */ - @PreAuthorize("@ss.hasPermi('business:manage:export')") - @Log(title = "信息发布管理记录", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, DcPublishManage dcPublishManage) - { - List list = dcPublishManageService.selectDcPublishManageList(dcPublishManage); - ExcelUtil util = new ExcelUtil<>(DcPublishManage.class); - util.exportExcel(response, list, "信息发布管理记录数据"); - } + /** * 获取信息发布管理记录详细信息 @@ -157,4 +146,27 @@ public class DcPublishManageController extends BaseController } return AjaxResult.success(dcPublishManageService.eventTypePublishManageMonth(dcPublishManage)); } + /** + * 公众服务统计查询 + */ + @PostMapping("/statisticsList") + public TableDataInfo statisticsList(@RequestBody DcPublishManage dcPublishManage) + { + startPage(); + List list = dcPublishManageService.selectDcPublishManageStatistics(dcPublishManage); + return getDataTable(list); + } + /** + * 公众服务统计导出 + */ + @PreAuthorize("@ss.hasPermi('business:manage:export')") + @Log(title = "信息发布管理记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DcPublishManage dcPublishManage) + { + List list = dcPublishManageService.selectDcPublishManageStatistics(dcPublishManage); + ExcelUtil util = new ExcelUtil<>(DcPublishManage.class); + util.exportExcel(response, list, "信息发布管理记录数据"); + } + } diff --git a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java index 1cb74c8c..74cc2479 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcWarningController.java @@ -174,4 +174,13 @@ public class DcWarningController extends BaseController } return toAjax(dcWarningService.insertDispatchSource(map)); } + //感知事件误报 + @PostMapping("/falseAlarm") + public AjaxResult falseAlarmResolution(@RequestBody DcWarning dcWarning){ + if (dcWarning==null||dcWarning.getRelieveType()==null||StringUtils.isBlank(dcWarning.getId())){ + return AjaxResult.error("参数错误"); + } + return toAjax(dcWarningService.falseAlarmResolution(dcWarning)); + } + } diff --git a/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java b/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java index abed367f..ea80eeac 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java @@ -10,7 +10,7 @@ import org.omg.CORBA.INTERNAL; /** * 信息发布管理记录对象 dc_publish_manage - * + * * @author ruoyi * @date 2024-04-19 */ @@ -22,27 +22,27 @@ public class DcPublishManage extends BaseEntity private Long id; /** 事件编号 */ - @Excel(name = "事件编号") + //@Excel(name = "事件编号") private String eventId; /** 所属机构 */ - @Excel(name = "所属机构") + //@Excel(name = "所属机构") private Long deptId; /** 发布渠道ID */ - @Excel(name = "发布渠道ID") + //@Excel(name = "发布渠道ID") private Long publishChannelsId; /** 标题 */ - @Excel(name = "标题") + //@Excel(name = "标题") private String title; /** 发布渠道：多选用逗号隔开1-手机短信2-微信公众号3-微博4-情报板5-服务网站6-微信小程序 */ - @Excel(name = "发布渠道",readConverterExp="1=手机短信,2=微信公众号,3=微博,4=情报板,5=服务网站,6=微信小程序") + @Excel(name = "发布渠道",readConverterExp="1=手机短信,2=微信公众号,3=微博,4=情报板,5=服务网站,6=微信小程序,7=语音广播") private Integer publishChannels; /** 审核状态：0-待审核1-已审核2-未通过 */ - @Excel(name = "审核状态： 0-待审核 1-已审核 2-未通过") + //@Excel(name = "审核状态： 0-待审核 1-已审核 2-未通过") private Integer isverify; /** 发布者 */ @@ -50,51 +50,51 @@ public class DcPublishManage extends BaseEntity private String publisher; /** 审核者1 */ - @Excel(name = "审核者1") + //@Excel(name = "审核者1") private String auditor1; /** 审核者1 */ - @Excel(name = "审核者1") + //@Excel(name = "审核者1") private String auditor2; /** 审核时间1 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @Excel(name = "审核时间1", width = 30, dateFormat = "yyyy-MM-dd") + //@Excel(name = "审核时间1", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime1; /** 审核时间1 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @Excel(name = "审核时间1", width = 30, dateFormat = "yyyy-MM-dd") + //@Excel(name = "审核时间1", width = 30, dateFormat = "yyyy-MM-dd") private Date auditTime2; /** 审核者1意见 */ - @Excel(name = "审核者1意见") + //@Excel(name = "审核者1意见") private String auditComment1; /** 审核者2意见 */ - @Excel(name = "审核者2意见") + //@Excel(name = "审核者2意见") private String auditComment2; /** 发布时间 */ - @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date publishTime; /** 发布状态：1-成功2-失败3-草稿 */ - @Excel(name = "发布状态： 1-成功 2-失败 3-草稿") + @Excel(name = "发布状态",readConverterExp="1=成功,2=失败,3=草稿") private Integer publishStatus; /** 事件详情 */ - @Excel(name = "事件详情") + @Excel(name = "内容") private String contentDetails; - @Excel(name = "方向", readConverterExp = "1=菏泽方向,3=济南方向") + //@Excel(name = "方向", readConverterExp = "1=菏泽方向,3=济南方向") private String direction; - @Excel(name = "桩号") + //@Excel(name = "桩号") private String stakeMark; - @Excel(name = "事件主类",readConverterExp = "1=交通事故,2=车辆故障,3=交通管制,4=交通拥堵,5=非法上路,6=路障清除,7=施工建设,8=服务区异常,9=设施设备隐患,10=异常天气,11=其他事件") + //@Excel(name = "事件主类",readConverterExp = "1=交通事故,2=车辆故障,3=交通管制,4=交通拥堵,5=非法上路,6=路障清除,7=施工建设,8=服务区异常,9=设施设备隐患,10=异常天气,11=其他事件") private String eventType; - @Excel(name = "事件子类", readConverterExp = "1-1=追尾,1-2=侧翻,1-3=撞护栏,1-4=自然,1-5=其他事故,2-1=车辆故障,3-1=主线封闭和限行,3-2=收费站封闭和限行,3-3=立交封闭和限行,3-4=服务区封闭和限行,4-1=道路拥堵,4-2=立交拥堵,4-3=收费站拥堵,4-4=服务区拥堵,5-1=行人,5-2=非机动车,5-3=摩托车,5-4=其他,6-1=烟雾,6-2=倒伏树木,6-3=撒落物,6-4=动物,6-5=其他,7-1=道路养护施工,7-2=收费站养护施工,7-3=服务区养护施工,7-4=枢纽立交匝道养护施工,7-5=地方道路养护施工,7-6=道路工程建设施工,7-7=收费站工程建设施工,7-8=服务区工程建设施工,7-9=枢纽立交匝道工程建设施工,7-10=地方道路工程建设施工,8-1=封闭、暂停营业,8-2=重要设施停用,8-3=服务区其他异常,9-1=摄像机,9-2=护栏,9-3=隔离栅") + //@Excel(name = "事件子类", readConverterExp = "1-1=追尾,1-2=侧翻,1-3=撞护栏,1-4=自然,1-5=其他事故,2-1=车辆故障,3-1=主线封闭和限行,3-2=收费站封闭和限行,3-3=立交封闭和限行,3-4=服务区封闭和限行,4-1=道路拥堵,4-2=立交拥堵,4-3=收费站拥堵,4-4=服务区拥堵,5-1=行人,5-2=非机动车,5-3=摩托车,5-4=其他,6-1=烟雾,6-2=倒伏树木,6-3=撒落物,6-4=动物,6-5=其他,7-1=道路养护施工,7-2=收费站养护施工,7-3=服务区养护施工,7-4=枢纽立交匝道养护施工,7-5=地方道路养护施工,7-6=道路工程建设施工,7-7=收费站工程建设施工,7-8=服务区工程建设施工,7-9=枢纽立交匝道工程建设施工,7-10=地方道路工程建设施工,8-1=封闭、暂停营业,8-2=重要设施停用,8-3=服务区其他异常,9-1=摄像机,9-2=护栏,9-3=隔离栅") private String eventSubclass; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @@ -120,7 +120,9 @@ public class DcPublishManage extends BaseEntity private Integer eventState; //关联情报板id private Long logId; - + //位置 + @Excel(name = "位置/设备") + private String position; public Long getLogId() { return logId; @@ -241,151 +243,151 @@ public class DcPublishManage extends BaseEntity this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setEventId(String eventId) + public void setEventId(String eventId) { this.eventId = eventId; } - public String getEventId() + public String getEventId() { return eventId; } - public void setDeptId(Long deptId) + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setPublishChannelsId(Long publishChannelsId) + public void setPublishChannelsId(Long publishChannelsId) { this.publishChannelsId = publishChannelsId; } - public Long getPublishChannelsId() + public Long getPublishChannelsId() { return publishChannelsId; } - public void setTitle(String title) + public void setTitle(String title) { this.title = title; } - public String getTitle() + public String getTitle() { return title; } - public void setPublishChannels(Integer publishChannels) + public void setPublishChannels(Integer publishChannels) { this.publishChannels = publishChannels; } - public Integer getPublishChannels() + public Integer getPublishChannels() { return publishChannels; } - public void setIsverify(Integer isverify) + public void setIsverify(Integer isverify) { this.isverify = isverify; } - public Integer getIsverify() + public Integer getIsverify() { return isverify; } - public void setPublisher(String publisher) + public void setPublisher(String publisher) { this.publisher = publisher; } - public String getPublisher() + public String getPublisher() { return publisher; } - public void setAuditor1(String auditor1) + public void setAuditor1(String auditor1) { this.auditor1 = auditor1; } - public String getAuditor1() + public String getAuditor1() { return auditor1; } - public void setAuditor2(String auditor2) + public void setAuditor2(String auditor2) { this.auditor2 = auditor2; } - public String getAuditor2() + public String getAuditor2() { return auditor2; } - public void setAuditTime1(Date auditTime1) + public void setAuditTime1(Date auditTime1) { this.auditTime1 = auditTime1; } - public Date getAuditTime1() + public Date getAuditTime1() { return auditTime1; } - public void setAuditTime2(Date auditTime2) + public void setAuditTime2(Date auditTime2) { this.auditTime2 = auditTime2; } - public Date getAuditTime2() + public Date getAuditTime2() { return auditTime2; } - public void setAuditComment1(String auditComment1) + public void setAuditComment1(String auditComment1) { this.auditComment1 = auditComment1; } - public String getAuditComment1() + public String getAuditComment1() { return auditComment1; } - public void setAuditComment2(String auditComment2) + public void setAuditComment2(String auditComment2) { this.auditComment2 = auditComment2; } - public String getAuditComment2() + public String getAuditComment2() { return auditComment2; } - public void setPublishTime(Date publishTime) + public void setPublishTime(Date publishTime) { this.publishTime = publishTime; } - public Date getPublishTime() + public Date getPublishTime() { return publishTime; } - public void setPublishStatus(Integer publishStatus) + public void setPublishStatus(Integer publishStatus) { this.publishStatus = publishStatus; } - public Integer getPublishStatus() + public Integer getPublishStatus() { return publishStatus; } - public void setContentDetails(String contentDetails) + public void setContentDetails(String contentDetails) { this.contentDetails = contentDetails; } - public String getContentDetails() + public String getContentDetails() { return contentDetails; } 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 311ca679..ad73d6c4 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 @@ -59,6 +59,14 @@ public class DcWarning extends BaseEntity @Excel(name = "事件子类", readConverterExp ="1-1-拥堵,1-2=缓行,2-1=普通行人,2-2=工作人员,3-1=摩托车,3-2=自行车,3-3=三轮车,4-1=非工程车,4-2=工程车,4-3=主路有车,4-4=匝道有车,4-5=车辆故障（弃用),4-6=交通事故（弃用),4-7=应急车道被占用,4-8=车离开应急车道,4-9=其他,4-10=未知车辆,5-1=倒车/逆行,5-2=压线,5-3=掉头,5-4=超速,5-5=低速,5-6=违规变道,5-7=未保持安全距离,6-1=烟火,6-2=火灾,6-3=障碍物,6-4=抛洒物,7-1=道路施工,8-1=雨,8-2=冰雹,8-3=风,8-4=雾,8-5=高温,8-6=积水,8-7=路面湿滑,8-8=路面结冰,8-9=道路能见度低,8-10=道路团雾,9-1=只碰撞不倾斜,9-2=只倾斜无碰撞,9-3=碰撞后倾斜,10-1=未知,10-2单车事故,10-3=多车事故,11-1=车辆抛锚,11-2=车辆炸胎（有备胎),11-2=车辆炸胎（无备胎),99-1=其它") private String warningSubclass; + /** 事件解除原因 */ + @Excel(name = "事件解除原因") + private String relieveReason; + /** 事件解除类型： 1-误报解除2-事件已结束3-无需处理事件4-其它 */ + @Excel(name = "信息来源", readConverterExp = "1=误报解除2,2=事件已结束3,3=无需处理事件,4=其它") + private Integer relieveType; + + /** 事件标题 */ @Excel(name = "事件标题") private String warningTitle; @@ -113,6 +121,23 @@ public class DcWarning extends BaseEntity private String endDate; //收费站 private String facilityName; + + public String getRelieveReason() { + return relieveReason; + } + + public void setRelieveReason(String relieveReason) { + this.relieveReason = relieveReason; + } + + public Integer getRelieveType() { + return relieveType; + } + + public void setRelieveType(Integer relieveType) { + this.relieveType = relieveType; + } + public String getStartStakeMark() { return startStakeMark; } 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 a0f25737..8a2f318f 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 @@ -84,4 +84,6 @@ public interface DcPublishManageMapper public List> eventTypePublishManageSum(); //统计不同事件的发布渠道数量(月统计) public List> eventTypePublishManageMonth(DcPublishManage dcPublishManage); + //公众服务统计查询 + public List selectDcPublishManageStatistics(DcPublishManage dcPublishManage); } diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java index 2e6e4af2..7f07269b 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java @@ -130,5 +130,6 @@ public interface DcWarningMapper public Integer deleteDispatchResource(@Param("dispatchId")Long dispatchId); DcDispatch selectDcDispatchById(@Param("id") Long id); - + //误报解除 + public Integer falseAlarmResolution(DcWarning dcWarning); } 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 107c4452..71f5f2eb 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 @@ -72,4 +72,6 @@ public interface IDcPublishManageService public List> eventTypePublishManageSum(); //统计不同事件的发布渠道数量(月统计) public List> eventTypePublishManageMonth(DcPublishManage dcPublishManage); + //公众服务统计查询 + public List selectDcPublishManageStatistics(DcPublishManage dcPublishManage); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcWarningService.java b/zc-business/src/main/java/com/zc/business/service/IDcWarningService.java index 93af5845..2200db6f 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcWarningService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcWarningService.java @@ -92,4 +92,6 @@ public interface IDcWarningService public Integer insertDispatch(DcDispatch dcDispatch); //新增指挥调度资源记录 public Integer insertDispatchSource(HashMap map); + //误报解除 + public Integer falseAlarmResolution(DcWarning dcWarning); } 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 3a8bc631..dd9e9c1c 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 @@ -140,4 +140,9 @@ public class DcPublishManageServiceImpl implements IDcPublishManageService public List> eventTypePublishManageMonth(DcPublishManage dcPublishManage) { return dcPublishManageMapper.eventTypePublishManageMonth(dcPublishManage); } + //公众服务统计查询 + @Override + public List selectDcPublishManageStatistics(DcPublishManage dcPublishManage) { + return dcPublishManageMapper.selectDcPublishManageStatistics(dcPublishManage); + } } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java index 2b9438b9..0004b57a 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java @@ -764,5 +764,11 @@ public class DcWarningServiceImpl implements IDcWarningService dcEventProcessService.insertDcEventProcess(dcEventProcess); return 1; } + //误报解除 + @Override + public Integer falseAlarmResolution(DcWarning dcWarning) { + dcWarning.setUpdateTime(DateUtils.getNowDate()); + return dcWarningMapper.falseAlarmResolution(dcWarning); + } } diff --git a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml index 025c8a24..9ec470fe 100644 --- a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -45,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from dc_publish_manage as manage LEFT JOIN dc_event as event on event.id=manage.event_id LEFT JOIN dc_event_traffic_control as traffic on event.id=traffic.id - LEFT JOIN dc_facility as facility ON traffic.facility_id=facility.id - + @@ -340,4 +352,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) AS m ON h.eventType = m.eventType AND pc.publish_channels = m.publish_channels ORDER BY h.eventType, pc.publish_channels; - \ No newline at end of file + + diff --git a/zc-business/src/main/resources/mapper/business/DcPublishingChannelsMapper.xml b/zc-business/src/main/resources/mapper/business/DcPublishingChannelsMapper.xml index bf18ac45..25b43302 100644 --- a/zc-business/src/main/resources/mapper/business/DcPublishingChannelsMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPublishingChannelsMapper.xml @@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id from dc_publishing_channels where data_category=#{dataCategory}