From 4c6727ed854dfeb4fabf365750778d0374e39755 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Wed, 21 Aug 2024 10:54:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DcSdhsEventController.java | 7 +++++ .../business/service/IDcSdhsEventService.java | 2 ++ .../service/impl/DcSdhsEventServiceImpl.java | 26 +++++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java index e5c0062e..cf572240 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java @@ -160,6 +160,13 @@ public class DcSdhsEventController { } } + @ApiOperation("查询上次上传的文件信息") + @GetMapping("/getFileInfo") + public AjaxResult getFileInfo() + { + return dcSdhsEventService.getFileInfo(); + } + @ApiOperation("查询事故地市分布") @PostMapping("/selectRegionAnalysis") public AjaxResult selectRegionAnalysis(@RequestBody DcSdhsEventQuery dcSdhsEventQuery) diff --git a/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java b/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java index 32afb38d..a2aca0c6 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java @@ -19,6 +19,8 @@ public interface IDcSdhsEventService // AjaxResult importData(MultipartFile file) throws Exception; AjaxResult importData(String fileName,String fileUrl) throws Exception; + AjaxResult getFileInfo(); + AjaxResult selectRegionAnalysis(DcSdhsEventQuery dcSdhsEventQuery); void exportRegionAnalysis(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery); diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java index e78c70a7..358bd2bf 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java @@ -134,11 +134,13 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService { Map fileInfo = new HashMap<>(); fileInfo.put("fileName",fileName); fileInfo.put("fileUrl",fileUrl); + + Date now = new Date(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String updateTime = simpleDateFormat.format(new Date()); + String updateTime = simpleDateFormat.format(now); fileInfo.put("uploadTime",updateTime); - redisCache.setCacheMapValue(RedisKeyConstants.SDHS_EVENT_FILE,updateTime,fileInfo); + redisCache.setCacheMapValue(RedisKeyConstants.SDHS_EVENT_FILE,now.getTime(),fileInfo); return AjaxResult.success("导入成功"); } @@ -242,6 +244,26 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService { return numbers; } + @Override + public AjaxResult getFileInfo(){ + Map> allFileInfo = redisCache.getCacheMapValue(RedisKeyConstants.SDHS_EVENT_FILE); + Map lastFile = new HashMap<>(); + if (allFileInfo != null && allFileInfo.size() > 0){ + String maxKeyNumerically = Collections.max(allFileInfo.keySet(), new Comparator() { + @Override + public int compare(String o1, String o2) { + try { + return Long.compare(Long.parseLong(o1), Long.parseLong(o2)); + } catch (NumberFormatException e) { + throw new IllegalArgumentException("Keys cannot be parsed as numbers", e); + } + } + }); + lastFile = allFileInfo.get(maxKeyNumerically); + } + return AjaxResult.success(lastFile); + } + /** * @Description 事故地市分布 From 545c6cd3803de972e2fcb1442ed4bde1ee1484e0 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Wed, 21 Aug 2024 11:30:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=AB=98=E9=80=9F=E4=BA=91=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DcSdhsEventController.java | 21 +++- .../business/service/IDcSdhsEventService.java | 4 + .../service/impl/DcSdhsEventServiceImpl.java | 119 ++++++++++++++++++ .../wordTemplate/sdhsEventChart.docx | Bin 29060 -> 40116 bytes 4 files changed, 140 insertions(+), 4 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java index cf572240..0ed2dc8f 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java @@ -108,10 +108,12 @@ public class DcSdhsEventController { } } - } else if (exportKey.contains("7")){ + } + if (exportKey.contains("7")){ PoiUtil.createHeading1(newDoc,"天气情况统计"); wordController.weather(newDoc); - } else if (exportKey.contains("8") || exportKey.contains("9")){ + } + if (exportKey.contains("8") || exportKey.contains("9")){ PoiUtil.createHeading1(newDoc,"交通量统计"); for (String trafficIncidentType : exportKey) { if ("8".equals(trafficIncidentType)){ @@ -123,11 +125,14 @@ public class DcSdhsEventController { } } - } else if (exportKey.contains("10")){ + } + if (exportKey.contains("10")){ PoiUtil.createHeading1(newDoc,"交通事故情况"); //交通事故类型统计 + dcSdhsEventService.exportAccidentType(newDoc,dcSdhsEventQuery); - } else if (exportKey.contains("11") || exportKey.contains("12")){ + } + if (exportKey.contains("11") || exportKey.contains("12")){ PoiUtil.createHeading1(newDoc,"交通量统计"); for (String trafficIncidentType : exportKey) { if ("11".equals(trafficIncidentType)){ @@ -182,5 +187,13 @@ public class DcSdhsEventController { return dcSdhsEventService.selectStationAnalysis(dcSdhsEventQuery); } + @ApiOperation("查询交通事故类型统计") + @PostMapping("/selectAccidentType") + public AjaxResult selectAccidentType(@RequestBody DcSdhsEventQuery dcSdhsEventQuery) + { + return dcSdhsEventService.selectAccidentType(dcSdhsEventQuery); + } + + } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java b/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java index a2aca0c6..b83c2f80 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java @@ -28,4 +28,8 @@ public interface IDcSdhsEventService AjaxResult selectStationAnalysis(DcSdhsEventQuery dcSdhsEventQuery); void exportStationAnalysis(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery); + + AjaxResult selectAccidentType(DcSdhsEventQuery dcSdhsEventQuery); + + void exportAccidentType(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java index 358bd2bf..2600d740 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java @@ -616,4 +616,123 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService { } + /** + * @Description 查询交通事故类型统计 + * + * @author liuwenge + * @date 2024/8/21 10:56 + * @param dcSdhsEventQuery + * @return com.ruoyi.common.core.domain.AjaxResult + */ + @Override + public AjaxResult selectAccidentType(DcSdhsEventQuery dcSdhsEventQuery){ + List eventList = redisCache.getCacheList(RedisKeyConstants.SDHS_EVENT); + if (eventList == null || eventList.size() == 0){ + return AjaxResult.error("请先导入数据"); + } + + eventList = eventList.stream().filter(item -> item.getStartTime() != null + && item.getStartTime().getTime() >= dcSdhsEventQuery.getStartTime().getTime() + && item.getStartTime().getTime() <= dcSdhsEventQuery.getEndTime().getTime() + && "交通事故".equals(item.getEventType())) + .collect(Collectors.toList()); + List> list = new ArrayList<>(); + + if(eventList.size() > 0){ + //根据详细类型 分组计数 + Map subclass = eventList.stream().collect(Collectors.groupingBy(DcSdhsEvent::getEventSubclass,Collectors.counting())); + subclass.forEach((key,count)->{ + Map map = new HashMap<>(); + map.put("subclassName",key); + map.put("num",count); + list.add(map); + }); + } + + return AjaxResult.success(list); + } + + /** + * @Description 导出交通事故类型统计 + * + * @author liuwenge + * @date 2024/8/21 11:07 + * @param doc + * @param dcSdhsEventQuery + * @return void + */ + @Override + public void exportAccidentType(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery){ + AjaxResult ajaxResult = selectAccidentType(dcSdhsEventQuery); + if (ajaxResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber())) { + + PoiUtil.createHeading2(doc,"事故类型统计"); + List> data = (List>) ajaxResult.get("data"); + if (data != null && data.size() != UniversalEnum.ZERO.getNumber()){ + //插入图表 + try { + // 复制Word模板 + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("wordTemplate/sdhsEventChart.docx"); + + XWPFDocument copiedTemplate = new XWPFDocument(inputStream); + + //获取word中所有图表对象 + List charts = copiedTemplate.getCharts(); + XWPFChart chart = charts.get(1); + XSSFWorkbook workbook = chart.getWorkbook(); + XSSFSheet sheet = workbook.getSheetAt(UniversalEnum.ZERO.getNumber()); + + //系列信息 + String[] singleBarSeriesNames = {"数量"}; + //分类信息 + for (int i = UniversalEnum.ZERO.getNumber(); i < data.size(); i++){ + sheet.getRow(i+UniversalEnum.ONE.getNumber()).getCell(UniversalEnum.ZERO.getNumber()).setCellValue(data.get(i).get("subclassName").toString()); + sheet.getRow(i+UniversalEnum.ONE.getNumber()).getCell(UniversalEnum.ONE.getNumber()).setCellValue(Long.parseLong(data.get(i).get("num").toString())); + } + + for (int i = sheet.getLastRowNum(); i > data.size();i--){ + sheet.removeRow(sheet.getRow(i)); + } + PoiUtil.wordExportChar(chart, "事故类型统计", singleBarSeriesNames,sheet ); + + + // 追加到同一个Word文档中 + mergeChart(chart,doc); + + + // 关闭复制的模板文档 + copiedTemplate.close(); + + } catch (Exception e){ + e.printStackTrace(); + } + + + //换行 + createLineBreak(doc); + + + //插入表格 + XWPFTable table = doc.createTable(data.size()+1, 2); + //列宽自动分割 + CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW(); + infoTableWidth.setType(STTblWidth.DXA); + infoTableWidth.setW(BigInteger.valueOf(UniversalEnum.NINE_THOUSAND_AND_SEVENTY_TWO.getNumber())); + + setTableFonts(table.getRow(0).getCell(0), "事故类型"); + setTableFonts(table.getRow(0).getCell(1), "数量"); + + //excel + for (int i = 0; i < data.size(); i++){ + setTableFonts(table.getRow(i+1).getCell(0), data.get(i).get("subclassName").toString()); + setTableFonts(table.getRow(i+1).getCell(1), data.get(i).get("num").toString()); + } + } else { + addDescription(doc,UniversalEnum.NO_DATA_AVAILABLE.getValue()); + } + + } else { + addDescription(doc,UniversalEnum.NO_DATA_AVAILABLE.getValue()); + } + } } diff --git a/zc-business/src/main/resources/wordTemplate/sdhsEventChart.docx b/zc-business/src/main/resources/wordTemplate/sdhsEventChart.docx index a6afb431eb1ac1f42a61c90871f5350f468fc469..bd477e23530f0a57f53477a64d2dc11aaf8475ae 100644 GIT binary patch delta 12896 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 I`{(Wd2Sv5Mo&W#< delta 5738 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 E4=x~vmjD0& From cfedf1514719fb58952bc28122e0256a97750eb8 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Wed, 21 Aug 2024 15:12:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zc/business/service/impl/DcSdhsEventServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java index 2600d740..454a47cd 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java @@ -484,21 +484,28 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService { List> list = new ArrayList<>(); for (String stationName : stationSet) { Map map = new HashMap<>(); + Long allNum = 0L; map.put("stationName",stationName); if (closeStation.containsKey(stationName)){ map.put("close",closeStation.get(stationName)); + allNum += closeStation.get(stationName); } else { map.put("close",0); } if (restrictionStation.containsKey(stationName)){ map.put("restriction",restrictionStation.get(stationName)); + allNum += restrictionStation.get(stationName); } else { map.put("restriction",0); } + + map.put("allNum",allNum); list.add(map); } + //根据总数排序 + list = list.stream().sorted(Comparator.comparing(item -> Long.parseLong(((Map) item).get("allNum").toString())).reversed()).collect(Collectors.toList()); return AjaxResult.success(list); } From 6625d4b4b47e07cd56da114f09143df6cb79b96b Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Wed, 21 Aug 2024 15:24:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zc/business/controller/DcSdhsEventController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java index 0ed2dc8f..c1b25ae2 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java @@ -92,12 +92,16 @@ public class DcSdhsEventController { PoiUtil.createHeading1(newDoc,"交通事件"); for (String trafficIncidentType : exportKey) { if ("1".equals(trafficIncidentType)){ + //事故多发路段 } else if ("2".equals(trafficIncidentType)){ + //事件类型分析 } else if ("3".equals(trafficIncidentType)){ + //事故车型分析 } else if ("4".equals(trafficIncidentType)){ + //事故时间分析 } else if ("5".equals(trafficIncidentType)){ //事故地市分布 @@ -133,13 +137,13 @@ public class DcSdhsEventController { } if (exportKey.contains("11") || exportKey.contains("12")){ - PoiUtil.createHeading1(newDoc,"交通量统计"); + PoiUtil.createHeading1(newDoc,"拥堵情况"); for (String trafficIncidentType : exportKey) { if ("11".equals(trafficIncidentType)){ //拥堵地点统计 } else if ("12".equals(trafficIncidentType)){ - //路段拥堵时长 + //路段平均拥堵时长 }