可视化看板数据接口

+package com.ash.base;
+
+import lombok.Data;
+
+@Data
+public class BarChartVo {
+
+    private String name;
+
+    private String value;
+
+    public BarChartVo(){
+
+    }
+
+    public BarChartVo(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+}

+package com.ash.base;
+
+import lombok.Data;
+
+@Data
+public class PieChartVo {
+    private String name;
+    private Object value;
+
+    public PieChartVo(String name, Object value) {
+        this.name = name;
+        this.value = value;
+    }
+}

+package com.ash.base;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class StatisticsParams {
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endTime;
+}

+package com.ash.controller;
+
+import com.ash.base.*;
+import com.ash.entity.Case;
+import com.ash.entity.WarningInstance;
+import com.ash.service.CaseService;
+import com.ash.service.WarningInstanceAnalysisService;
+import com.ash.service.WarningInstanceService;
+import com.ash.util.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@RestController
+@RequestMapping("/statistics")
+@Slf4j
+public class StatisticsController extends BaseController {
+
+    @Resource
+    private WarningInstanceService warningInstanceService;
+
+    @Resource
+    private WarningInstanceAnalysisService warningInstanceAnalysisService;
+
+    @Resource
+    private CaseService caseService;
+
+    /**
+     * 各地市警情分布top7
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/wiStatisticsByArea", method = RequestMethod.POST)
+    public JsonResult wiStatisticsByArea(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            List<BarChartVo> dataList = warningInstanceService.statisticsByArea(statisticsParams);
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+
+    /**
+     * 各地市案件分布top7
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/caseStatisticsByArea", method = RequestMethod.POST)
+    public JsonResult caseStatisticsByArea(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            List<BarChartVo> dataList = caseService.statisticsByArea(statisticsParams);
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    /**
+     * 警情趋势
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/wiStatisticsByDate", method = RequestMethod.POST)
+    public JsonResult wiStatisticsByDate(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            List<BarChartVo> dataList = warningInstanceService.statisticsByDate(statisticsParams);
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    /**
+     * 诈骗类型分布
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/caseStatisticsByFraudType", method = RequestMethod.POST)
+    public JsonResult caseStatisticsByFraudType(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            List<PieChartVo> dataList = caseService.statisticsByFraudType(statisticsParams);
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    /**
+     * 各地市top高损案件数
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/caseStatisticsTotalAmountByArea", method = RequestMethod.POST)
+    public JsonResult caseStatisticsTotalAmountByArea(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            List<BarChartVo> dataList = caseService.statisticsTotalAmountByArea(statisticsParams);
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    /**
+     * 各地市警情数量环比变化
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/wiStatisticsSequentialByArea", method = RequestMethod.POST)
+    public JsonResult wiStatisticsSequentialByArea(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            statisticsParams.setStartTime(DateUtils.weeHours(statisticsParams.getStartTime(), 0));
+            statisticsParams.setEndTime(DateUtils.weeHours(statisticsParams.getEndTime(), 1));
+            List<BarChartVo> currentDataList = warningInstanceService.statisticsSequentialByArea(statisticsParams);
+            long daysBetween = DateUtils.getDaysBetween(statisticsParams.getEndTime(), statisticsParams.getStartTime());
+            StatisticsParams lp = new StatisticsParams();
+            lp.setStartTime(DateUtils.getFrontDay(statisticsParams.getStartTime(), (int) daysBetween));
+            lp.setEndTime(DateUtils.getFrontDay(statisticsParams.getEndTime(), (int) daysBetween));
+
+            List<BarChartVo> lastDataList = warningInstanceService.statisticsSequentialByArea(lp);
+            List<String> currentAreaList = currentDataList.stream().map(BarChartVo::getName).collect(Collectors.toList());
+            List<String> lastAreaList = lastDataList.stream().map(BarChartVo::getName).collect(Collectors.toList());
+            List<String> areaList = Stream.concat(currentAreaList.stream(), lastAreaList.stream())
+                    .distinct()
+                    .collect(Collectors.toList());
+            Map<String, String> currentMap = currentDataList.stream()
+                    .collect(Collectors.toMap(BarChartVo::getName, BarChartVo::getValue));
+            Map<String, String> lastMap = lastDataList.stream()
+                    .collect(Collectors.toMap(BarChartVo::getName, BarChartVo::getValue));
+
+            List<PieChartVo> dataList = new ArrayList<>();
+            for (String area : areaList) {
+                String currentValue = currentMap.get(area);
+                String lastValue = lastMap.get(area);
+                int cv = StringUtils.isNotBlank(currentValue) ? Integer.parseInt(currentValue) : 0;
+                int lv = StringUtils.isNotBlank(lastValue) ? Integer.parseInt(lastValue) : 0;
+
+                String sequential = "--";
+                if (lv != 0) {
+                    sequential = String.format("%.1f", (cv - lv) * 1.0 / lv * 100.0);
+                    PieChartVo cd = new PieChartVo(area, Double.parseDouble(sequential));
+                    dataList.add(cd);
+                } else {
+                    //为了图表展示先用0
+                    PieChartVo cd = new PieChartVo(area, 0);
+                    dataList.add(cd);
+                }
+
+            }
+
+
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    /**
+     * 各地市电诈案件环比变化
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/caseStatisticsSequentialByArea", method = RequestMethod.POST)
+    public JsonResult caseStatisticsSequentialByArea(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            statisticsParams.setStartTime(DateUtils.weeHours(statisticsParams.getStartTime(), 0));
+            statisticsParams.setEndTime(DateUtils.weeHours(statisticsParams.getEndTime(), 1));
+            List<BarChartVo> currentDataList = caseService.statisticsSequentialByArea(statisticsParams);
+            long daysBetween = DateUtils.getDaysBetween(statisticsParams.getEndTime(), statisticsParams.getStartTime());
+            StatisticsParams lp = new StatisticsParams();
+            lp.setStartTime(DateUtils.getFrontDay(statisticsParams.getStartTime(), (int) daysBetween));
+            lp.setEndTime(DateUtils.getFrontDay(statisticsParams.getEndTime(), (int) daysBetween));
+
+            List<BarChartVo> lastDataList = caseService.statisticsSequentialByArea(lp);
+            List<String> currentAreaList = currentDataList.stream().map(BarChartVo::getName).collect(Collectors.toList());
+            List<String> lastAreaList = lastDataList.stream().map(BarChartVo::getName).collect(Collectors.toList());
+            List<String> areaList = Stream.concat(currentAreaList.stream(), lastAreaList.stream())
+                    .distinct()
+                    .collect(Collectors.toList());
+            Map<String, String> currentMap = currentDataList.stream()
+                    .collect(Collectors.toMap(BarChartVo::getName, BarChartVo::getValue));
+            Map<String, String> lastMap = lastDataList.stream()
+                    .collect(Collectors.toMap(BarChartVo::getName, BarChartVo::getValue));
+
+            List<PieChartVo> dataList = new ArrayList<>();
+            for (String area : areaList) {
+                String currentValue = currentMap.get(area);
+                String lastValue = lastMap.get(area);
+                int cv = StringUtils.isNotBlank(currentValue) ? Integer.parseInt(currentValue) : 0;
+                int lv = StringUtils.isNotBlank(lastValue) ? Integer.parseInt(lastValue) : 0;
+
+                String sequential = "--";
+                if (lv != 0) {
+                    sequential = String.format("%.1f", (cv - lv) * 1.0 / lv * 100.0);
+                    PieChartVo cd = new PieChartVo(area, Double.parseDouble(sequential));
+                    dataList.add(cd);
+                } else {
+                    //为了图表展示先用0
+                    PieChartVo cd = new PieChartVo(area, 0);
+                    dataList.add(cd);
+                }
+
+            }
+
+
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), dataList);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    /**
+     * 全省接电诈警情
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/totalWiInfo", method = RequestMethod.POST)
+    public JsonResult totalWiInfo(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            statisticsParams.setStartTime(DateUtils.weeHours(statisticsParams.getStartTime(), 0));
+            statisticsParams.setEndTime(DateUtils.weeHours(statisticsParams.getEndTime(), 1));
+            int count = warningInstanceService.getCount(statisticsParams);
+            long daysBetween = DateUtils.getDaysBetween(statisticsParams.getEndTime(), statisticsParams.getStartTime());
+            StatisticsParams lp = new StatisticsParams();
+            lp.setStartTime(DateUtils.getFrontDay(statisticsParams.getStartTime(), (int) daysBetween));
+            lp.setEndTime(DateUtils.getFrontDay(statisticsParams.getEndTime(), (int) daysBetween));
+            int lastCount = warningInstanceService.getCount(lp);
+            String sequential = "--";
+            if (lastCount != 0) {
+                sequential = String.format("%.1f", (count - lastCount) * 1.0 / lastCount * 100.0) + "%";
+            }
+
+            Map<String, Object> result = new HashMap<>();
+            result.put("value", count);
+            result.put("sequential", sequential);
+
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), result);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    /**
+     * 全省立案电诈件
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/totalCaseInfo", method = RequestMethod.POST)
+    public JsonResult totalCaseInfo(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            statisticsParams.setStartTime(DateUtils.weeHours(statisticsParams.getStartTime(), 0));
+            statisticsParams.setEndTime(DateUtils.weeHours(statisticsParams.getEndTime(), 1));
+            int count = caseService.getCount(statisticsParams);
+            long daysBetween = DateUtils.getDaysBetween(statisticsParams.getEndTime(), statisticsParams.getStartTime());
+            StatisticsParams lp = new StatisticsParams();
+            lp.setStartTime(DateUtils.getFrontDay(statisticsParams.getStartTime(), (int) daysBetween));
+            lp.setEndTime(DateUtils.getFrontDay(statisticsParams.getEndTime(), (int) daysBetween));
+            int lastCount = caseService.getCount(lp);
+            String sequential = "--";
+            if (lastCount != 0) {
+                sequential = String.format("%.1f", (count - lastCount) * 1.0 / lastCount * 100.0) + "%";
+            }
+
+            Map<String, Object> result = new HashMap<>();
+            result.put("value", count);
+            result.put("sequential", sequential);
+
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), result);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+    /**
+     * 总损失
+     *
+     * @param statisticsParams 参数
+     * @return 数据
+     */
+    @RequestMapping(value = "/totalLoss", method = RequestMethod.POST)
+    public JsonResult totalLoss(@RequestBody StatisticsParams statisticsParams) {
+        try {
+            List<Case> dataList = caseService.getCaseLoss(statisticsParams);
+            int caseTopLoss = caseService.getCaseTopLoss(statisticsParams);
+            Double totalLoss = 0d;
+            Double avgLoss = 0d;
+            if (CollectionUtils.isNotEmpty(dataList)) {
+                for (Case caseInfo : dataList) {
+                    if (caseInfo.getTotalAmount() == null) {
+                        continue;
+                    }
+                    totalLoss += caseInfo.getTotalAmount();
+                }
+                avgLoss = totalLoss * 1.0 / dataList.size();
+            }
+
+
+            Map<String, Object> result = new HashMap<>();
+            result.put("totalLoss", String.format("%.1f", totalLoss));
+            result.put("avgLoss", String.format("%.1f", avgLoss));
+            result.put("caseValue", caseTopLoss);
+
+            return JsonResult.ok(OptionStatus.OPT_SUCCESS.getName(), result);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+
+
+}

@@ -85,4 +85,7 @@ public class Case extends BaseModel {
 
 
     @Transient
     @Transient
     private transient CaseAnalysis analysis;
     private transient CaseAnalysis analysis;
+
+    @Transient
+    private transient Double totalAmount;
 }
 }

@@ -3,20 +3,20 @@ package com.ash.service;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.ash.base.AshErrorCode;
-import com.ash.base.AshException;
-import com.ash.base.BaseModel;
+import com.ash.base.*;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.entity.Case;
 import com.ash.entity.Case;
-import com.ash.entity.CaseAnalysis;
 import com.ash.entity.dao.CaseMapper;
 import com.ash.entity.dao.CaseMapper;
 import com.ash.excelData.CaseExcelData;
 import com.ash.excelData.CaseExcelData;
 import com.ash.listener.CaseExcelListener;
 import com.ash.listener.CaseExcelListener;
+import com.ash.util.DateUtils;
 import com.ash.util.MultipartFileToFileUtils;
 import com.ash.util.MultipartFileToFileUtils;
+import com.ash.util.ObjectValueOption;
 import com.ash.util.UUIDGenerator;
 import com.ash.util.UUIDGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.query.MPJQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -26,10 +26,12 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
 @Service
 @Service
@@ -50,7 +52,6 @@ public class CaseService {
     }
     }
 
 
 
 
-
     public Boolean saveAll(List<Case> dataList) {
     public Boolean saveAll(List<Case> dataList) {
         if (CollectionUtils.isEmpty(dataList)) {
         if (CollectionUtils.isEmpty(dataList)) {
             throw new AshException(AshErrorCode.ILLEGAL_PARAM, "dataList is empty!");
             throw new AshException(AshErrorCode.ILLEGAL_PARAM, "dataList is empty!");
@@ -109,6 +110,204 @@ public class CaseService {
         return caseMapper.selectPage(page, queryWrapper);
         return caseMapper.selectPage(page, queryWrapper);
     }
     }
 
 
+    public int getCount(StatisticsParams params) {
+        QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Case> lambda = queryWrapper.lambda();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            Date start = DateUtils.weeHours(params.getStartTime(), 0);
+            lambda.ge(Case::getAlarmDate, sdf.format(start));
+        }
+
+        if (params.getEndTime() != null) {
+            Date end = DateUtils.weeHours(params.getEndTime(), 1);
+            lambda.le(Case::getAlarmDate, sdf.format(end));
+
+        }
+        return caseMapper.selectCount(queryWrapper);
+    }
+
+    public List<Case> getCaseLoss(StatisticsParams params) {
+        MPJQueryWrapper<Case> mpjQueryWrapper = new MPJQueryWrapper<Case>();
+        mpjQueryWrapper.select("t.id,ca.total_amount as totalAmount")
+                .leftJoin("t_ash_case_analysis ca on t.id=ca.case_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        return caseMapper.selectJoinList(Case.class, mpjQueryWrapper);
+    }
+
+    public int getCaseTopLoss(StatisticsParams params) {
+        MPJQueryWrapper<Case> mpjQueryWrapper = new MPJQueryWrapper<Case>();
+        mpjQueryWrapper.select("t.id,ca.total_amount as totalAmount")
+                .leftJoin("t_ash_case_analysis ca on t.id=ca.case_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.ge("ca.total_amount", 500000);
+        List<Case> caseList = caseMapper.selectJoinList(Case.class, mpjQueryWrapper);
+        if (CollectionUtils.isEmpty(caseList)) {
+            return 0;
+        } else {
+            return caseList.size();
+        }
+    }
+
+
+    public List<BarChartVo> statisticsByArea(StatisticsParams params) {
+        MPJQueryWrapper<Case> mpjQueryWrapper = new MPJQueryWrapper<Case>();
+        mpjQueryWrapper.select("ca.area,count(t.id) as field_count")
+                .leftJoin("t_ash_case_analysis ca on t.id=ca.case_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.groupBy("ca.area");
+        mpjQueryWrapper.orderByDesc("field_count");
+
+        List<Map<String, Object>> dataList = caseMapper.selectJoinMaps(mpjQueryWrapper);
+        List<BarChartVo> resultList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dataList)) {
+
+            AtomicReference<Integer> total = new AtomicReference<>(0);
+            resultList = dataList.stream().map(e -> {
+                        Integer fieldCount = ObjectValueOption.getObjInt(e.get("field_count"));
+                        total.updateAndGet(v -> v + fieldCount);
+                        return new BarChartVo(ObjectValueOption.getObjString(e.get("area")), fieldCount.toString());
+                    }
+            ).collect(Collectors.toList());
+            resultList = resultList.stream().filter(e -> StringUtils.isNotBlank(e.getName())).collect(Collectors.toList());
+            if (resultList.size() > 7) {
+                resultList = resultList.subList(0, 7);
+            }
+
+            resultList.forEach(e -> {
+                String value = e.getValue();
+                Integer iv = Integer.parseInt(value);
+                e.setValue(String.format("%.2f", iv * 1.0 / total.get() * 100.0));
+            });
+        }
+        return resultList;
+    }
+
+    public List<PieChartVo> statisticsByFraudType(StatisticsParams params) {
+        MPJQueryWrapper<Case> mpjQueryWrapper = new MPJQueryWrapper<Case>();
+        mpjQueryWrapper.select("ca.fraud_type as fraudType,count(t.id) as field_count")
+                .leftJoin("t_ash_case_analysis ca on t.id=ca.case_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.groupBy("ca.fraud_type");
+        mpjQueryWrapper.orderByDesc("field_count");
+
+        List<Map<String, Object>> dataList = caseMapper.selectJoinMaps(mpjQueryWrapper);
+        List<PieChartVo> resultList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dataList)) {
+            resultList = dataList.stream().map(e ->
+                            new PieChartVo(ObjectValueOption.getObjString(e.get("fraudType"))
+                                    , ObjectValueOption.getObjInt(e.get("field_count"))))
+                    .filter(e -> StringUtils.isNotBlank(e.getName())).collect(Collectors.toList());
+        }
+        return resultList;
+    }
+
+    public List<BarChartVo> statisticsTotalAmountByArea(StatisticsParams params) {
+        MPJQueryWrapper<Case> mpjQueryWrapper = new MPJQueryWrapper<Case>();
+        mpjQueryWrapper.select("ca.area,count(t.id) as field_count")
+                .leftJoin("t_ash_case_analysis ca on t.id=ca.case_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.ge("ca.total_amount", 500000);
+
+        mpjQueryWrapper.groupBy("ca.area");
+        mpjQueryWrapper.orderByDesc("field_count");
+
+        List<Map<String, Object>> dataList = caseMapper.selectJoinMaps(mpjQueryWrapper);
+        List<BarChartVo> resultList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dataList)) {
+            resultList = dataList.stream().map(e -> {
+                        return new BarChartVo(ObjectValueOption.getObjString(e.get("area"))
+                                , ObjectValueOption.getObjString(e.get("field_count")));
+                    }
+            ).filter(e -> StringUtils.isNotBlank(e.getName())).collect(Collectors.toList());
+            if (resultList.size() > 7) {
+                resultList = resultList.subList(0, 7);
+            }
+        }
+        return resultList;
+    }
+
+    public List<BarChartVo> statisticsSequentialByArea(StatisticsParams params) {
+        MPJQueryWrapper<Case> mpjQueryWrapper = new MPJQueryWrapper<Case>();
+        mpjQueryWrapper.select("ca.area,count(t.id) as field_count")
+                .leftJoin("t_ash_case_analysis ca on t.id=ca.case_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.groupBy("ca.area");
+        mpjQueryWrapper.orderByDesc("field_count");
+
+        List<Map<String, Object>> dataList = caseMapper.selectJoinMaps(mpjQueryWrapper);
+        List<BarChartVo> resultList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dataList)) {
+            resultList = dataList.stream().map(e -> {
+                        Integer fieldCount = ObjectValueOption.getObjInt(e.get("field_count"));
+                        return new BarChartVo(ObjectValueOption.getObjString(e.get("area")), fieldCount.toString());
+                    }
+            ).filter(e -> StringUtils.isNotBlank(e.getName())).collect(Collectors.toList());
+
+        }
+        return resultList;
+    }
+
     private QueryWrapper<Case> getCondition(Case params) {
     private QueryWrapper<Case> getCondition(Case params) {
         QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
         QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<Case> lambda = queryWrapper.lambda();
         LambdaQueryWrapper<Case> lambda = queryWrapper.lambda();

@@ -3,19 +3,20 @@ package com.ash.service;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.ash.base.AshErrorCode;
-import com.ash.base.AshException;
-import com.ash.base.BaseModel;
+import com.ash.base.*;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.entity.WarningInstance;
 import com.ash.entity.WarningInstance;
 import com.ash.entity.dao.WarningInstanceMapper;
 import com.ash.entity.dao.WarningInstanceMapper;
 import com.ash.excelData.WarningInstanceExcelData;
 import com.ash.excelData.WarningInstanceExcelData;
 import com.ash.listener.WarningInstanceExcelListener;
 import com.ash.listener.WarningInstanceExcelListener;
+import com.ash.util.DateUtils;
 import com.ash.util.MultipartFileToFileUtils;
 import com.ash.util.MultipartFileToFileUtils;
+import com.ash.util.ObjectValueOption;
 import com.ash.util.UUIDGenerator;
 import com.ash.util.UUIDGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.query.MPJQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -25,8 +26,12 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
 @Service
 @Service
@@ -103,6 +108,123 @@ public class WarningInstanceService {
         return warningInstanceMapper.selectPage(page, queryWrapper);
         return warningInstanceMapper.selectPage(page, queryWrapper);
     }
     }
 
 
+    public int getCount(StatisticsParams params) {
+        QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<WarningInstance> lambda = queryWrapper.lambda();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            Date start = DateUtils.weeHours(params.getStartTime(), 0);
+            lambda.ge(WarningInstance::getAlarmDate, sdf.format(start));
+        }
+
+        if (params.getEndTime() != null) {
+            Date end = DateUtils.weeHours(params.getEndTime(), 1);
+            lambda.le(WarningInstance::getAlarmDate, sdf.format(end));
+
+        }
+        return warningInstanceMapper.selectCount(queryWrapper);
+    }
+
+    public List<BarChartVo> statisticsByArea(StatisticsParams params) {
+        MPJQueryWrapper<WarningInstance> mpjQueryWrapper = new MPJQueryWrapper<WarningInstance>();
+        mpjQueryWrapper.select("wia.area,count(t.id) as field_count")
+                .leftJoin("t_ash_warning_instance_analysis wia on t.id=wia.wi_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.groupBy("wia.area");
+        mpjQueryWrapper.orderByDesc("field_count");
+
+        List<Map<String, Object>> dataList = warningInstanceMapper.selectJoinMaps(mpjQueryWrapper);
+        List<BarChartVo> resultList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dataList)) {
+            AtomicReference<Integer> total = new AtomicReference<>(0);
+            resultList = dataList.stream().map(e -> {
+                        Integer fieldCount = ObjectValueOption.getObjInt(e.get("field_count"));
+                        total.updateAndGet(v -> v + fieldCount);
+                        return new BarChartVo(ObjectValueOption.getObjString(e.get("area")), fieldCount.toString());
+                    }
+            ).collect(Collectors.toList());
+            resultList = resultList.stream().filter(e -> StringUtils.isNotBlank(e.getName())).collect(Collectors.toList());
+            if (resultList.size() > 7) {
+                resultList = resultList.subList(0, 7);
+            }
+
+            resultList.forEach(e -> {
+                String value = e.getValue();
+                Integer iv = Integer.parseInt(value);
+                e.setValue(String.format("%.2f", iv * 1.0 / total.get() * 100.0));
+            });
+        }
+        return resultList;
+    }
+
+    public List<BarChartVo> statisticsByDate(StatisticsParams params) {
+        MPJQueryWrapper<WarningInstance> mpjQueryWrapper = new MPJQueryWrapper<WarningInstance>();
+        mpjQueryWrapper.select("DATE_FORMAT(t.alarm_date, '%Y-%m-%d') as alarmDate,count(0) as field_count");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.groupBy("DATE_FORMAT(t.alarm_date, '%Y-%m-%d')");
+        mpjQueryWrapper.orderByAsc("DATE_FORMAT(t.alarm_date, '%Y-%m-%d')");
+        List<Map<String, Object>> dataList = warningInstanceMapper.selectJoinMaps(mpjQueryWrapper);
+        List<BarChartVo> resultList = new ArrayList<>();
+        resultList = dataList.stream().map(e -> {
+                    Integer fieldCount = ObjectValueOption.getObjInt(e.get("field_count"));
+                    return new BarChartVo(ObjectValueOption.getObjString(e.get("alarmDate")), fieldCount.toString());
+                }
+        ).filter(e -> StringUtils.isNotBlank(e.getName())).collect(Collectors.toList());
+        return resultList;
+    }
+
+
+    public List<BarChartVo> statisticsSequentialByArea(StatisticsParams params) {
+        MPJQueryWrapper<WarningInstance> mpjQueryWrapper = new MPJQueryWrapper<WarningInstance>();
+        mpjQueryWrapper.select("wia.area,count(t.id) as field_count")
+                .leftJoin("t_ash_warning_instance_analysis wia on t.id=wia.wi_id");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (params.getStartTime() != null) {
+            mpjQueryWrapper.ge("t.alarm_date", sdf.format(DateUtils.weeHours(params.getStartTime(), 0)));
+
+        }
+
+        if (params.getEndTime() != null) {
+            mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
+        }
+
+        mpjQueryWrapper.groupBy("wia.area");
+        mpjQueryWrapper.orderByDesc("field_count");
+
+        List<Map<String, Object>> dataList = warningInstanceMapper.selectJoinMaps(mpjQueryWrapper);
+        List<BarChartVo> resultList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dataList)) {
+            resultList = dataList.stream().map(e -> {
+                        Integer fieldCount = ObjectValueOption.getObjInt(e.get("field_count"));
+                        return new BarChartVo(ObjectValueOption.getObjString(e.get("area")), fieldCount.toString());
+                    }
+            ).filter(e -> StringUtils.isNotBlank(e.getName())).collect(Collectors.toList());
+
+        }
+        return resultList;
+    }
+
     private QueryWrapper<WarningInstance> getCondition(WarningInstance params) {
     private QueryWrapper<WarningInstance> getCondition(WarningInstance params) {
         QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
         QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<WarningInstance> lambda = queryWrapper.lambda();
         LambdaQueryWrapper<WarningInstance> lambda = queryWrapper.lambda();
@@ -138,7 +260,7 @@ public class WarningInstanceService {
             }
             }
         }
         }
 
 
-        lambda.orderByDesc(BaseModel::getCreateTime);
+        lambda.orderByDesc(BaseModel::getCreateTime, WarningInstance::getCode);
         return queryWrapper;
         return queryWrapper;
     }
     }
 
 

+package com.ash.util;
+
+
+import org.apache.commons.lang3.math.NumberUtils;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class DateUtils {
+    public static final String FORMAT_YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+    public static final String FORMAT_YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";
+    public static final String FORMAT_YYYY_MM_DD = "yyyy-MM-dd";
+    public static final String FORMAT_YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+    public static final String FORMAT_YYYYMMDD = "yyyy/MM/dd";
+
+    public static String format(Date date, String formatStr) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(formatStr);
+        return dateFormat.format(date);
+    }
+
+    public static Date parse(long timescap) {
+        SimpleDateFormat format = new SimpleDateFormat(FORMAT_YYYY_MM_DD_HH_MM_SS);
+        Long time = timescap;
+        String dateString = format.format(time);
+        return parse(dateString, FORMAT_YYYY_MM_DD_HH_MM_SS);
+    }
+
+    public static Date parse(String dateString, String formatStr) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(formatStr);
+        try {
+            return dateFormat.parse(dateString);
+        } catch (ParseException e) {
+            return null;
+        }
+    }
+
+
+    public static Date parse(Date date, String formatStr) {
+        String dateString = format(date, formatStr);
+        return parse(dateString, formatStr);
+    }
+
+
+    public static long reduceDate(Date date, Date reduceDate) {
+        if (date == null || reduceDate == null) {
+            return NumberUtils.INTEGER_ZERO;
+        }
+
+        return (date.getTime() - reduceDate.getTime()) / 1000;
+    }
+
+    public static String secToTime(int time) {
+        String timeStr = "00:00";
+        if (time <= 0) {
+            return timeStr;
+        }
+
+        int minute = time / 60;
+        if (minute < 60) {
+            int second = time % 60;
+            timeStr = unitFormat(minute) + ":" + unitFormat(second);
+        } else {
+            int hour = minute / 60;
+            if (hour > 99) {
+                return "99:59:59";
+            }
+
+            minute = minute % 60;
+            int second = time - hour * 3600 - minute * 60;
+            timeStr = unitFormat(hour) + ":" + unitFormat(minute) + ":" + unitFormat(second);
+        }
+
+        return timeStr;
+    }
+
+    private static String unitFormat(int i) {
+        if (i >= 0 && i < 10) {
+            return "0" + i;
+        }
+
+        return "" + i;
+    }
+
+    /**
+     * 凌晨
+     *
+     * @param date
+     * @return
+     * @flag 0 返回yyyy-MM-dd 00:00:00日期<br>
+     * 1 返回yyyy-MM-dd 23:59:59日期
+     */
+    public static Date weeHours(Date date, int flag) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int hour = cal.get(Calendar.HOUR_OF_DAY);
+        int minute = cal.get(Calendar.MINUTE);
+        int second = cal.get(Calendar.SECOND);
+        //时分秒（毫秒数）
+        long millisecond = hour * 60 * 60 * 1000 + minute * 60 * 1000 + second * 1000;
+        //凌晨00:00:00
+        cal.setTimeInMillis(cal.getTimeInMillis() - millisecond);
+
+        if (flag == 0) {
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+            cal.set(Calendar.MILLISECOND, 0);
+            return cal.getTime();
+        } else if (flag == 1) {
+            //凌晨23:59:59
+            cal.setTimeInMillis(cal.getTimeInMillis() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+        }
+        return cal.getTime();
+    }
+
+    public static void main(String[] args) {
+
+        System.out.println(weeHours(new Date(),0));
+        System.out.println(weeHours(new Date(),1));
+
+
+    }
+
+    public static long getDiffTime(Date date) {
+        long nowTime = System.currentTimeMillis();
+        long endTime = date.getTime();
+        long time = endTime - nowTime;
+        long dateTemp1 = time / 1000; //秒
+        long dateTemp2 = dateTemp1 / 60; //分钟
+        long dateTemp3 = dateTemp2 / 60; //小时
+        long dateTemp4 = dateTemp3 / 24; //天数
+        long dateTemp5 = dateTemp4 / 30; //月数
+        return dateTemp5;
+    }
+
+    /**
+     * 获取指定时间的前一天
+     *
+     * @param date
+     * @return
+     */
+    public static Date getSpecifiedDayBefore(Date date, int index) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        int day = calendar.get(Calendar.DATE);
+        calendar.set(Calendar.DATE, day + index);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取每天的开始时间
+     *
+     * @param date date
+     * @return 当天的开始时间
+     */
+    public static Date getStartOfDate(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取每天的开始时间
+     *
+     * @param date date
+     * @return 当天的结束时间
+     */
+    public static Date getEndOfDate(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        calendar.set(Calendar.MILLISECOND, 59);
+
+        return calendar.getTime();
+    }
+
+
+    /**
+     * 获取当天的过去一周的时间
+     *
+     * @param toDay
+     * @return
+     */
+    public static List<Date> getLastWeek(Date toDay) {
+        List<Date> weeks = new LinkedList<Date>();
+        Calendar calendar = Calendar.getInstance();
+        for (int i = 1; i <= 7; i++) {
+            calendar.setTime(toDay);
+            int day = calendar.get(Calendar.DATE);
+            calendar.set(Calendar.DATE, day - i);
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            weeks.add(calendar.getTime());
+        }
+
+        return weeks;
+    }
+
+    /**
+     * 获取某一天的前一周时间
+     *
+     * @param toDay
+     * @return 返回封装好的时间集合
+     */
+    public static List<String> getLastWeekTime(Date toDay) {
+        List<String> weeks = new LinkedList<String>();
+        SimpleDateFormat sdf = new SimpleDateFormat(FORMAT_YYYY_MM_DD);
+        Calendar calendar = Calendar.getInstance();
+        for (int i = 1; i <= 7; i++) {
+            calendar.setTime(toDay);
+            int day = calendar.get(Calendar.DATE);
+            calendar.set(Calendar.DATE, day - i);
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            Date time = calendar.getTime();
+            String format = sdf.format(time);
+            weeks.add(format);
+        }
+
+        return weeks;
+    }
+
+
+    //获取当天的开始时间
+    public static Date getDayBegin() {
+        Calendar cal = new GregorianCalendar();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+
+    //获取当天的结束时间
+    public static Date getDayEnd() {
+        Calendar cal = new GregorianCalendar();
+        cal.set(Calendar.HOUR_OF_DAY, 23);
+        cal.set(Calendar.MINUTE, 59);
+        cal.set(Calendar.SECOND, 59);
+        return cal.getTime();
+    }
+
+    //获取昨天的开始时间
+    public static Date getBeginDayOfYesterday() {
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(getDayBegin());
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTime();
+    }
+
+    //获取昨天的结束时间
+    public static Date getEndDayOfYesterDay() {
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(getDayEnd());
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTime();
+    }
+
+    //获取明天的开始时间
+    public static Date getBeginDayOfTomorrow() {
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(getDayBegin());
+        cal.add(Calendar.DAY_OF_MONTH, 1);
+
+        return cal.getTime();
+    }
+
+    //获取明天的结束时间
+    public static Date getEndDayOfTomorrow() {
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(getDayEnd());
+        cal.add(Calendar.DAY_OF_MONTH, 1);
+        return cal.getTime();
+    }
+
+    //获取本周的开始时间
+    @SuppressWarnings("unused")
+    public static Date getBeginDayOfWeek() {
+        Date date = new Date();
+        if (date == null) {
+            return null;
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int dayofweek = cal.get(Calendar.DAY_OF_WEEK);
+        if (dayofweek == 1) {
+            dayofweek += 7;
+        }
+        cal.add(Calendar.DATE, 2 - dayofweek);
+        return getDayStartTime(cal.getTime());
+    }
+
+    //获取本周的结束时间
+    public static Date getEndDayOfWeek() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getBeginDayOfWeek());
+        cal.add(Calendar.DAY_OF_WEEK, 6);
+        Date weekEndSta = cal.getTime();
+        return getDayEndTime(weekEndSta);
+    }
+
+    //获取上周的开始时间
+    @SuppressWarnings("unused")
+    public static Date getBeginDayOfLastWeek(int n) {
+        Date date = new Date();
+        if (date == null) {
+            return null;
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int dayofweek = cal.get(Calendar.DAY_OF_WEEK);
+        if (dayofweek == 1) {
+            dayofweek += 7;
+        }
+        cal.add(Calendar.DATE, 2 - dayofweek - 7 * n);
+        return getDayStartTime(cal.getTime());
+    }
+
+    /**
+     * @return
+     */
+    public static String[] getLast12Months() {
+        Date date = new Date();
+
+        String[] last12Months = new String[13];
+        Calendar cal = Calendar.getInstance();
+        //设置输入条件时间
+        cal.setTime(date);
+
+        cal.set(Calendar.MONTH, cal.get(Calendar.MONTH) + 1); //要先+1,才能把本月的算进去
+        for (int i = 0; i < 13; i++) {
+            cal.set(Calendar.MONTH, cal.get(Calendar.MONTH) - 1); //逐次往前推1个月
+            last12Months[12 - i] = cal.get(Calendar.YEAR) + "-" + addZeroForNum(String.valueOf(cal.get(Calendar.MONTH) + 1), 2);
+        }
+
+        return last12Months;
+    }
+
+    public static String addZeroForNum(String str, int strLength) {
+        int strLen = str.length();
+        if (strLen < strLength) {
+            while (strLen < strLength) {
+                StringBuffer sb = new StringBuffer();
+                sb.append("0").append(str);// 左补0
+                // sb.append(str).append("0");//右补0
+                str = sb.toString();
+                strLen = str.length();
+            }
+        }
+        return str;
+    }
+
+    //获取上周的结束时间
+    public static Date getEndDayOfLastWeek(int n) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getBeginDayOfLastWeek(n));
+        cal.add(Calendar.DAY_OF_WEEK, 6);
+        Date weekEndSta = cal.getTime();
+        return getDayEndTime(weekEndSta);
+    }
+
+    //获取本月的开始时间
+    public static Date getBeginDayOfMonth() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(getNowYear(), getNowMonth() - 1, 1);
+        return getDayStartTime(calendar.getTime());
+    }
+
+    //获取本月的结束时间
+    public static Date getEndDayOfMonth() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(getNowYear(), getNowMonth() - 1, 1);
+        int day = calendar.getActualMaximum(5);
+        calendar.set(getNowYear(), getNowMonth() - 1, day);
+        return getDayEndTime(calendar.getTime());
+    }
+
+    //获取上月的开始时间
+    public static Date getBeginDayOfLastMonth() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(getNowYear(), getNowMonth() - 2, 1);
+        return getDayStartTime(calendar.getTime());
+    }
+
+    //获取上月的结束时间
+    public static Date getEndDayOfLastMonth() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(getNowYear(), getNowMonth() - 2, 1);
+        int day = calendar.getActualMaximum(5);
+        calendar.set(getNowYear(), getNowMonth() - 2, day);
+        return getDayEndTime(calendar.getTime());
+    }
+
+    //获取本年的开始时间
+    public static Date getBeginDayOfYear() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, getNowYear());
+        // cal.set
+        cal.set(Calendar.MONTH, Calendar.JANUARY);
+        cal.set(Calendar.DATE, 1);
+
+        return getDayStartTime(cal.getTime());
+    }
+
+
+    public static Date getBeginDayOfYear(Integer year) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, year);
+        // cal.set
+        cal.set(Calendar.MONTH, Calendar.JANUARY);
+        cal.set(Calendar.DATE, 1);
+
+        return getDayStartTime(cal.getTime());
+    }
+
+    //获取本年的结束时间
+    public static Date getEndDayOfYear() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, getNowYear());
+        cal.set(Calendar.MONTH, Calendar.DECEMBER);
+        cal.set(Calendar.DATE, 31);
+        return getDayEndTime(cal.getTime());
+    }
+
+    public static Date getEndDayOfYear(Integer year) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, year);
+        cal.set(Calendar.MONTH, Calendar.DECEMBER);
+        cal.set(Calendar.DATE, 31);
+        return getDayEndTime(cal.getTime());
+    }
+
+
+
+    //获取某个日期的开始时间
+    public static Timestamp getDayStartTime(Date d) {
+        Calendar calendar = Calendar.getInstance();
+        if (null != d) calendar.setTime(d);
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return new Timestamp(calendar.getTimeInMillis());
+    }
+
+    //获取某个日期的结束时间
+    public static Timestamp getDayEndTime(Date d) {
+        Calendar calendar = Calendar.getInstance();
+        if (null != d) calendar.setTime(d);
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
+        calendar.set(Calendar.MILLISECOND, 999);
+        return new Timestamp(calendar.getTimeInMillis());
+    }
+
+    //获取今年是哪一年
+    public static Integer getNowYear() {
+        Date date = new Date();
+        GregorianCalendar gc = (GregorianCalendar) Calendar.getInstance();
+        gc.setTime(date);
+        return Integer.valueOf(gc.get(1));
+    }
+
+    //获取本月是哪一月
+    public static int getNowMonth() {
+        Date date = new Date();
+        GregorianCalendar gc = (GregorianCalendar) Calendar.getInstance();
+        gc.setTime(date);
+        return gc.get(2) + 1;
+    }
+
+    //两个日期相减得到的天数
+    public static int getDiffDays(Date beginDate, Date endDate) {
+
+        if (beginDate == null || endDate == null) {
+            throw new IllegalArgumentException("getDiffDays param is null!");
+        }
+
+        long diff = (endDate.getTime() - beginDate.getTime())
+                / (1000 * 60 * 60 * 24);
+
+        int days = new Long(diff).intValue();
+
+        return days;
+    }
+
+    //两个日期相减得到的毫秒数
+    public static long dateDiff(Date beginDate, Date endDate) {
+        long date1ms = beginDate.getTime();
+        long date2ms = endDate.getTime();
+        return date2ms - date1ms;
+    }
+
+    //获取两个日期中的最大日期
+    public static Date max(Date beginDate, Date endDate) {
+        if (beginDate == null) {
+            return endDate;
+        }
+        if (endDate == null) {
+            return beginDate;
+        }
+        if (beginDate.after(endDate)) {
+            return beginDate;
+        }
+        return endDate;
+    }
+
+    //获取两个日期中的最小日期
+    public static Date min(Date beginDate, Date endDate) {
+        if (beginDate == null) {
+            return endDate;
+        }
+        if (endDate == null) {
+            return beginDate;
+        }
+        if (beginDate.after(endDate)) {
+            return endDate;
+        }
+        return beginDate;
+    }
+
+    //返回某月该季度的第一个月
+    public static Date getFirstSeasonDate(Date date) {
+        final int[] SEASON = {1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4};
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int sean = SEASON[cal.get(Calendar.MONTH)];
+        cal.set(Calendar.MONTH, sean * 3 - 3);
+        return cal.getTime();
+    }
+
+    //返回某个日期下几天的日期
+    public static Date getNextDay(Date date, int i) {
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(date);
+        cal.set(Calendar.DATE, cal.get(Calendar.DATE) + i);
+        return cal.getTime();
+    }
+
+    //返回某个日期前几天的日期
+    public static Date getFrontDay(Date date, int i) {
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(date);
+        cal.set(Calendar.DATE, cal.get(Calendar.DATE) - i);
+        return cal.getTime();
+    }
+
+    //获取某年某月到某年某月按天的切片日期集合（间隔天数的集合）
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public static List getTimeList(int beginYear, int beginMonth, int endYear,
+                                   int endMonth, int k) {
+        List list = new ArrayList();
+        if (beginYear == endYear) {
+            for (int j = beginMonth; j <= endMonth; j++) {
+                list.add(getTimeList(beginYear, j, k));
+
+            }
+        } else {
+            {
+                for (int j = beginMonth; j < 12; j++) {
+                    list.add(getTimeList(beginYear, j, k));
+                }
+
+                for (int i = beginYear + 1; i < endYear; i++) {
+                    for (int j = 0; j < 12; j++) {
+                        list.add(getTimeList(i, j, k));
+                    }
+                }
+                for (int j = 0; j <= endMonth; j++) {
+                    list.add(getTimeList(endYear, j, k));
+                }
+            }
+        }
+        return list;
+    }
+
+    //获取某年某月按天切片日期集合（某个月间隔多少天的日期集合）
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public static List getTimeList(int beginYear, int beginMonth, int k) {
+        List list = new ArrayList();
+        Calendar begincal = new GregorianCalendar(beginYear, beginMonth, 1);
+        int max = begincal.getActualMaximum(Calendar.DATE);
+        for (int i = 1; i < max; i = i + k) {
+            list.add(begincal.getTime());
+            begincal.add(Calendar.DATE, k);
+        }
+        begincal = new GregorianCalendar(beginYear, beginMonth, max);
+        list.add(begincal.getTime());
+        return list;
+    }
+
+    public static Date getBeginTime(int year, int month) {
+        YearMonth yearMonth = YearMonth.of(year, month);
+        LocalDate localDate = yearMonth.atDay(1);
+        LocalDateTime startOfDay = localDate.atStartOfDay();
+        ZonedDateTime zonedDateTime = startOfDay.atZone(ZoneId.of("Asia/Shanghai"));
+        return Date.from(zonedDateTime.toInstant());
+    }
+
+    public static Date getEndTime(int year, int month) {
+        YearMonth yearMonth = YearMonth.of(year, month);
+        LocalDate endOfMonth = yearMonth.atEndOfMonth();
+        LocalDateTime localDateTime = endOfMonth.atTime(23, 59, 59, 999);
+        ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.of("Asia/Shanghai"));
+        return Date.from(zonedDateTime.toInstant());
+    }
+
+    public static Date addTimeByUpdate(int type, long n, Date time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        calendar.add(type, Math.toIntExact(n));
+        return calendar.getTime();
+    }
+
+    public static Date getAddMinuDate(Date date,Integer min){
+        long time = min*60*1000;//30分钟
+
+        Date afterDate = new Date(date.getTime() + time);
+        return afterDate;
+    }
+
+    public static Date addMonth(Date date, Integer range){
+        Calendar calendar=Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.MONTH,range);
+        return calendar.getTime();
+    }
+
+    /**
+     * 计算两个日期之间相差的天数
+     * @param date1 第一个日期
+     * @param date2 第二个日期
+     * @return 两个日期相差的天数，date1在date2之后则返回正数，否则返回负数
+     */
+    public static long getDaysBetween(Date date1, Date date2) {
+        // 检查输入是否为空
+        if (date1 == null || date2 == null) {
+            throw new IllegalArgumentException("日期不能为null");
+        }
+
+        // 获取两个日期的时间戳（毫秒数）
+        long time1 = date1.getTime();
+        long time2 = date2.getTime();
+
+        // 计算时间差（毫秒）
+        long diffInMillies = time1 - time2+1000;
+
+        // 转换为天数
+        return TimeUnit.DAYS.convert(diffInMillies, TimeUnit.MILLISECONDS);
+    }
+
+
+
+
+}

+package com.ash.util;
+
+public class ObjectValueOption {
+
+    public static String getObjString(Object ojb) {
+        if (ojb == null) {
+            return null;
+        }
+        return ojb.toString();
+
+    }
+
+    public static Integer getObjInt(Object ojb) {
+        if (ojb == null) {
+            return 0;
+        }
+        return Integer.parseInt(ojb.toString());
+
+    }
+}

@@ -33,9 +33,18 @@ spring:
     multipart:
     multipart:
       max-file-size: 100MB
       max-file-size: 100MB
       max-request-size: 100MB
       max-request-size: 100MB
+#logging:
+#  level:
+#    root: INFO
+mybatis-plus:
+  mapper-locations: classpath:mapper/*.xml
+  type-aliases-package: com.ash.entity
+  configuration:
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+    map-underscore-to-camel-case: true
 logging:
 logging:
   level:
   level:
-    root: INFO
+    com.ash.entity.dao: debug
   file:
   file:
     name: logs/ash.log
     name: logs/ash.log
 ash:
 ash: