统计报表需求修改

胡翰林
1 parent 374fdee6
Showing 5 changed files with 77 additions and 41 deletions
src/main/java/com/ash/controller/StatisticsController.java
src/main/java/com/ash/entity/Case.java
src/main/java/com/ash/service/CaseService.java
src/main/java/com/ash/util/JFChartUtils.java
src/main/resources/template/statisticsReport.docx
--- a/src/main/java/com/ash/controller/StatisticsController.java
View file @da8096f
+++ b/src/main/java/com/ash/controller/StatisticsController.java
View file @da8096f
@@ -195,7 +195,6 @@ public class StatisticsController extends BaseController {
             });
-
             return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -340,8 +339,8 @@ public class StatisticsController extends BaseController {
     public JsonResult totalLoss(@RequestBody StatisticsParams statisticsParams) {
         try {
             List<Case> dataList = caseService.getCaseLoss(statisticsParams);
-            int caseTopLoss = caseService.getCaseTopLoss(statisticsParams,500000);
-            int case100TopLoss = caseService.getCaseTopLoss(statisticsParams,1000000);
+            int caseTopLoss = caseService.getCaseTopLoss(statisticsParams, 500000);
+            int case100TopLoss = caseService.getCaseTopLoss(statisticsParams, 1000000);
             Double totalLoss = 0d;
             double avgLoss = 0d;
             if (CollectionUtils.isNotEmpty(dataList)) {
@@ -401,6 +400,27 @@ public class StatisticsController extends BaseController {
         JsonResult totalCaseInfo = totalCaseInfo(statisticsParams);
         dataMap.put("totalCaseInfo", totalCaseInfo.getData());
+
+        List<Case> caseList = caseService.getCaseLoss(statisticsParams);
+        List<Case> expressCassList = Optional.ofNullable(caseList).map(all -> all.stream()
+                .filter(e -> "快递".equals(e.getRainageMethod()))
+                .collect(Collectors.toList())).orElse(new ArrayList<>());
+
+        Map<String, Object> expressData = new HashMap<>();
+        Double expressAmount = 0d;
+        int expressCount = expressCassList.size();
+        for (Case aCase : expressCassList) {
+            expressAmount += aCase.getTotalAmount();
+        }
+        String expressAvg = "0";
+        if (expressCount > 0) {
+            expressAvg = String.format("%.1f", expressAmount * 1.0 / expressCount / 10000.0);
+        }
+        expressData.put("expressAmount", String.format("%.1f", expressAmount / 10000.0));
+        expressData.put("expressAvg", expressAvg);
+        expressData.put("expressCount", expressCount);
+        dataMap.put("expressData", expressData);
+
         //警情各地市分布饼图
         List<PieChartVo> wiAreaData = warningInstanceService.statisticsCountByArea(statisticsParams);
         dataMap.put("wiAreaData", wiAreaData);
@@ -550,70 +570,75 @@ public class StatisticsController extends BaseController {
             dataMap.put("caseSequentialType", caseSequential.contains("-") ? "下降" : "上升");
         }
+        Map<String, Object> expressData = (Map<String, Object>) data.get("expressData");
+        dataMap.put("expressAmount", expressData.get("expressAmount"));
+        dataMap.put("expressAvg", expressData.get("expressAvg"));
+        dataMap.put("expressCount", expressData.get("expressCount"));
+
         //警情各地市分布饼图
         List<PieChartVo> wiAreaDataList = (List<PieChartVo>) data.get("wiAreaData");
         String dailyPicFile = JFChartUtils.createChart(wiAreaDataList, JFChartTypeEnum.PIE, dataRange + "警情分布图", "市", "数量");
-        dataMap.put("sWIAreaPic", Pictures.ofStream(new FileInputStream(dailyPicFile), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("sWIAreaPic", Pictures.ofStream(new FileInputStream(dailyPicFile), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(dailyPicFile);
         //警情各地市环比变化柱状图
         List<PieChartVo> wissAreaData = (List<PieChartVo>) data.get("wissAreaData");
         String sWISeqAreaPic = JFChartUtils.createChart(wissAreaData, JFChartTypeEnum.BAR, dataRange + "警情环比情况", "市", "环比");
-        dataMap.put("sWISeqAreaPic", Pictures.ofStream(new FileInputStream(sWISeqAreaPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("sWISeqAreaPic", Pictures.ofStream(new FileInputStream(sWISeqAreaPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(sWISeqAreaPic);
         //警情子类分布
         List<PieChartVo> wiSubTypeData = (List<PieChartVo>) data.get("wiSubTypeData");
         String wiSubTypeDataPic = JFChartUtils.createChart(wiSubTypeData, JFChartTypeEnum.PIE, dataRange + "警情类别分布", "警情类别", "数量");
-        dataMap.put("wiSubTypeDataPic", Pictures.ofStream(new FileInputStream(wiSubTypeDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("wiSubTypeDataPic", Pictures.ofStream(new FileInputStream(wiSubTypeDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(wiSubTypeDataPic);
         //警情分析
         List<PieChartVo> wisDateData = (List<PieChartVo>) data.get("wisDateData");
         String wisDateDataPic = JFChartUtils.createChart(wisDateData, JFChartTypeEnum.LINE, dataRange + "警情趋势", "市", "数量");
-        dataMap.put("wisDateDataPic", Pictures.ofStream(new FileInputStream(wisDateDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("wisDateDataPic", Pictures.ofStream(new FileInputStream(wisDateDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(wisDateDataPic);
         //案件各地市分布
         List<PieChartVo> caseAreaData = (List<PieChartVo>) data.get("caseAreaData");
         String caseAreaDataPic = JFChartUtils.createChart(caseAreaData, JFChartTypeEnum.PIE, dataRange + "案件分布图", "市", "数量");
-        dataMap.put("caseAreaDataPic", Pictures.ofStream(new FileInputStream(caseAreaDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("caseAreaDataPic", Pictures.ofStream(new FileInputStream(caseAreaDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(caseAreaDataPic);
         //电诈案件环比情况
         List<PieChartVo> caseSsAreaData = (List<PieChartVo>) data.get("caseSsAreaData");
         String caseSsAreaDataPic = JFChartUtils.createChart(caseSsAreaData, JFChartTypeEnum.BAR, dataRange + "电诈案件环比情况", "市", "环比");
-        dataMap.put("caseSsAreaDataPic", Pictures.ofStream(new FileInputStream(caseSsAreaDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("caseSsAreaDataPic", Pictures.ofStream(new FileInputStream(caseSsAreaDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(caseSsAreaDataPic);
         //案件诈骗类型分布
         List<PieChartVo> csfData = (List<PieChartVo>) data.get("csfData");
         String sCsfDataPic = JFChartUtils.createChart(csfData, JFChartTypeEnum.PIE, dataRange + "诈骗类型分布", "诈骗类型", "数量");
-        dataMap.put("sCsfDataaPic", Pictures.ofStream(new FileInputStream(sCsfDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("sCsfDataaPic", Pictures.ofStream(new FileInputStream(sCsfDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(sCsfDataPic);
         //案件引流方式分布图
         List<PieChartVo> ccrmData = (List<PieChartVo>) data.get("ccrmData");
         String ccrmDataPic = JFChartUtils.createChart(ccrmData, JFChartTypeEnum.PIE, dataRange + "引流方式分布图", "引流方式", "数量");
-        dataMap.put("ccrmDataPic", Pictures.ofStream(new FileInputStream(ccrmDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("ccrmDataPic", Pictures.ofStream(new FileInputStream(ccrmDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(ccrmDataPic);
         //案件支付方式分布图
         List<PieChartVo> ccpmData = (List<PieChartVo>) data.get("ccpmData");
         String ccpmDataPic = JFChartUtils.createChart(ccpmData, JFChartTypeEnum.PIE, dataRange + "支付方式分布图", "支付方式", "数量");
-        dataMap.put("ccpmDataPic", Pictures.ofStream(new FileInputStream(ccpmDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("ccpmDataPic", Pictures.ofStream(new FileInputStream(ccpmDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(ccpmDataPic);
         //案件受害人职业分布图
         List<PieChartVo> ccCareerData = (List<PieChartVo>) data.get("ccCareerData");
         String ccCareerDataPic = JFChartUtils.createChart(ccCareerData, JFChartTypeEnum.BAR, dataRange + "受害人职业分布图", "受害人职业", "数量");
-        dataMap.put("ccCareerDataPic", Pictures.ofStream(new FileInputStream(ccCareerDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("ccCareerDataPic", Pictures.ofStream(new FileInputStream(ccCareerDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(ccCareerDataPic);
         //案损分布
         List<PieChartVo> ccLossData = (List<PieChartVo>) data.get("ccLossData");
         String ccLossDataPic = JFChartUtils.createChart(ccLossData, JFChartTypeEnum.BAR, dataRange + "案损分布", "案损", "数量");
-        dataMap.put("ccLossDataPic", Pictures.ofStream(new FileInputStream(ccLossDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("ccLossDataPic", Pictures.ofStream(new FileInputStream(ccLossDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(ccLossDataPic);
         int clIndex = 1;
@@ -625,7 +650,7 @@ public class StatisticsController extends BaseController {
         //发案趋势
         List<PieChartVo> ccDateData = (List<PieChartVo>) data.get("ccDateData");
         String ccDateDataPic = JFChartUtils.createChart(ccDateData, JFChartTypeEnum.LINE, dataRange + "发案趋势", "日期", "数量");
-        dataMap.put("ccDateDataPic", Pictures.ofStream(new FileInputStream(ccDateDataPic), PictureType.JPEG).size(600, 200).create());
+        dataMap.put("ccDateDataPic", Pictures.ofStream(new FileInputStream(ccDateDataPic), PictureType.JPEG).size(660, 220).create());
         tempFilePath.add(ccDateDataPic);
         //案件受害人性别占比
@@ -675,16 +700,19 @@ public class StatisticsController extends BaseController {
         Map<String, String> caseLossAreaMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(majorCaseData)) {
             for (Case cd : majorCaseData) {
+                CaseAnalysis analysis = cd.getAnalysis();
                 CaseLossVo clv = new CaseLossVo();
                 clv.setCode(cd.getCode());
                 clv.setArea(cd.getArea());
-                clv.setCounty(cd.getAnalysis().getCounty());
                 clv.setTotalAmount(String.valueOf(cd.getTotalAmount()));
-                clv.setFraudType(cd.getAnalysis().getFraudType());
-                clv.setRainageMethod(cd.getAnalysis().getRainageMethod());
-                clv.setPayMethod(cd.getAnalysis().getPayMethod());
-                clv.setSex(cd.getAnalysis().getSex());
-                clv.setCareer(cd.getAnalysis().getCareer());
+                if (analysis != null) {
+                    clv.setFraudType(analysis.getFraudType());
+                    clv.setCounty(analysis.getCounty());
+                    clv.setRainageMethod(analysis.getRainageMethod());
+                    clv.setPayMethod(analysis.getPayMethod());
+                    clv.setSex(analysis.getSex());
+                    clv.setCareer(analysis.getCareer());
+                }
                 nllDataList.add(clv);
                 caseLossAreaMap.put(cd.getArea(), "");
             }
@@ -717,23 +745,27 @@ public class StatisticsController extends BaseController {
         Integer wi100wValue = 0;
         if (CollectionUtils.isNotEmpty(majorWiData)) {
             for (WarningInstance cd : majorWiData) {
+                WarningInstanceAnalysis analysis = cd.getAnalysis();
                 WiLossVo clv = new WiLossVo();
                 clv.setCode(cd.getCode());
                 clv.setArea(cd.getArea());
                 clv.setCounty(cd.getCounty());
                 clv.setAlarmSubType(cd.getAlarmSubType());
-                clv.setAmount(String.valueOf(cd.getAnalysis().getAmount()));
-                clv.setRainageMethod(cd.getAnalysis().getRainageMethod());
-                clv.setPayMethod(cd.getAnalysis().getPayMethod());
-                clv.setSex(cd.getAnalysis().getSex());
-                clv.setCareer(cd.getAnalysis().getCareer());
+                if (analysis != null) {
+                    clv.setAmount(String.valueOf(cd.getAnalysis().getAmount()));
+                    clv.setRainageMethod(cd.getAnalysis().getRainageMethod());
+                    clv.setPayMethod(cd.getAnalysis().getPayMethod());
+                    clv.setSex(cd.getAnalysis().getSex());
+                    clv.setCareer(cd.getAnalysis().getCareer());
+                    if (cd.getAnalysis().getAmount() < 1000000) {
+                        wi50wValue++;
+                    } else {
+                        wi100wValue++;
+                    }
+                }
                 mwiDataList.add(clv);
                 caseLossAreaMap.put(cd.getArea(), "");
-                if (cd.getAnalysis().getAmount() < 1000000) {
-                    wi50wValue++;
-                } else {
-                    wi100wValue++;
-                }
+
             }
         }
--- a/src/main/java/com/ash/entity/Case.java
View file @da8096f
+++ b/src/main/java/com/ash/entity/Case.java
View file @da8096f
@@ -105,4 +105,8 @@ public class Case extends BaseModel {
     @Transient
     private transient List<String> exceptIds;
+
+    @Transient
+    private transient String rainageMethod;
+
 }
--- a/src/main/java/com/ash/service/CaseService.java
View file @da8096f
+++ b/src/main/java/com/ash/service/CaseService.java
View file @da8096f
@@ -190,7 +190,7 @@ public class CaseService {
     public List<Case> getCaseLoss(StatisticsParams params) {
         MPJQueryWrapper<Case> mpjQueryWrapper = new MPJQueryWrapper<Case>();
-        mpjQueryWrapper.select("t.id,t.total_amount as totalAmount,ca.age")
+        mpjQueryWrapper.select("t.id,t.total_amount as totalAmount,ca.age,ca.rainage_method as rainageMethod")
                 .leftJoin("t_ash_case_analysis ca on t.id=ca.case_id");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
--- a/src/main/java/com/ash/util/JFChartUtils.java
View file @da8096f
+++ b/src/main/java/com/ash/util/JFChartUtils.java
View file @da8096f
@@ -62,8 +62,8 @@ public class JFChartUtils {
         NumberAxis numberaxis = (NumberAxis) plot.getRangeAxis();
         numberaxis.setUpperMargin(0.1);
         numberaxis.setLowerMargin(0.1);
-        numberaxis.setTickLabelFont(new Font("宋体", Font.BOLD, 12));
-        numberaxis.setLabelFont(new Font("宋体", Font.BOLD, 12));
+        numberaxis.setTickLabelFont(new Font("宋体", Font.BOLD, 16));
+        numberaxis.setLabelFont(new Font("宋体", Font.BOLD, 16));
         // 设置数据点可见性
         LineAndShapeRenderer renderer = (LineAndShapeRenderer) plot.getRenderer();
@@ -109,12 +109,12 @@ public class JFChartUtils {
         NumberAxis numberaxis = (NumberAxis) categoryplot.getRangeAxis();
         numberaxis.setUpperMargin(0.1);//设置最高的一个柱与图片顶端的距离(最高柱的10%)
         numberaxis.setLowerMargin(0.1);
-        numberaxis.setTickLabelFont(new Font("宋体", Font.BOLD, 12));
-        numberaxis.setLabelFont(new Font("宋体", Font.BOLD, 12));
+        numberaxis.setTickLabelFont(new Font("宋体", Font.BOLD, 16));
+        numberaxis.setLabelFont(new Font("宋体", Font.BOLD, 16));
         //项目轴设置
         CategoryAxis domainAxis = categoryplot.getDomainAxis();
-        domainAxis.setTickLabelFont(new Font("宋体", Font.BOLD, 15));
+        domainAxis.setTickLabelFont(new Font("宋体", Font.BOLD, 16));
     }
@@ -125,7 +125,7 @@ public class JFChartUtils {
         chart.setBackgroundPaint(Color.WHITE);
         plot.setBackgroundPaint(Color.WHITE);
         // 设置标签字体
-        plot.setLabelFont(new Font("宋体", Font.PLAIN, 14));
+        plot.setLabelFont(new Font("宋体", Font.PLAIN, 16));
         // 设置无数据信息字体（如果需要）
         plot.setNoDataMessageFont(new Font("宋体", Font.PLAIN, 18));
         plot.setNoDataMessage("暂无数据");
@@ -160,9 +160,9 @@ public class JFChartUtils {
     public static String createChart(List<PieChartVo> dataList, JFChartTypeEnum type, String title, String xAxisLabel, String yAxisLabel) throws IOException {
         // 设置全局字体（支持中文）
         StandardChartTheme chartTheme = new StandardChartTheme("CN");
-        chartTheme.setExtraLargeFont(new Font("宋体", Font.PLAIN, 14)); // 标题字体
-        chartTheme.setLargeFont(new Font("宋体", Font.PLAIN, 14));     // 图例字体
-        chartTheme.setRegularFont(new Font("宋体", Font.PLAIN, 12));   // 轴标签字体
+        chartTheme.setExtraLargeFont(new Font("宋体", Font.PLAIN, 16)); // 标题字体
+        chartTheme.setLargeFont(new Font("宋体", Font.PLAIN, 16));     // 图例字体
+        chartTheme.setRegularFont(new Font("宋体", Font.PLAIN, 16));   // 轴标签字体
         ChartFactory.setChartTheme(chartTheme);
         JFreeChart chart = null;
         switch (type) {
--- a/src/main/resources/template/statisticsReport.docx
View file @da8096f
+++ b/src/main/resources/template/statisticsReport.docx
View file @da8096f