From b1cb0d6fe00a736a68f265aa129bc605b11bc986 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期四, 25 四月 2024 15:03:42 +0800 Subject: [PATCH] 饼图添加整改与未整改数据的统计结果 --- src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java | 75 +++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java index 827faec..0160f18 100644 --- a/src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java +++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.doublePrevention.service.impl; import com.ruoyi.doublePrevention.entity.DoublePreventDept; +import com.ruoyi.doublePrevention.entity.SPI.*; import com.ruoyi.doublePrevention.entity.dto.DataCountDangerLevelRectifiedRespDO; import com.ruoyi.doublePrevention.entity.dto.DataCountDangerLevelRespDO; import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO; @@ -13,7 +14,6 @@ import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerInfoService; import com.ruoyi.doublePrevention.service.baseService.TrHiddenDangerCheckPointService; import com.ruoyi.doublePrevention.vo.ResultVO; -import io.swagger.models.auth.In; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.time.LocalDateTime; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -158,6 +159,78 @@ return parameterVerificationResult; } + @Override + public ResultVO<SPIDataRespDTO> getSPIData(SPIDataReqBO spiDataReqBO) { + + ResultVO resultVO = new ResultVO<>(); + resultVO.setCode("200"); + resultVO.setMsg("查询成功"); + + String key = "006a4740-8f2d-4fdc-a25b-a7413a37a2ba"; + + if (ObjectUtils.isEmpty(spiDataReqBO.getKey())){ + resultVO.setCode("400"); + resultVO.setMsg("key不能为空"); + return resultVO; + } + if (!spiDataReqBO.getKey().equals(key)){ + resultVO.setCode("400"); + resultVO.setMsg("key不正确"); + return resultVO; + } + if (ObjectUtils.isEmpty(spiDataReqBO.getStartTime())){ + spiDataReqBO.setStartTime(new Date(123, 3,1)); + } + if (ObjectUtils.isEmpty(spiDataReqBO.getEndTime())){ + spiDataReqBO.setEndTime(new Date()); + } + + List<TroubleData> spiData = checkPointService.getSPIData(spiDataReqBO); + + SPIDataRespDTO spiDataRespDTO = new SPIDataRespDTO(); + spiDataRespDTO.setTroubleDataList(spiData); + + resultVO.setData(spiDataRespDTO); + + return resultVO; + } + + @Override + public ResultVO<TroubleLevel> getSPIDataForPieChart(SPIDataReqBO spiDataReqBO) { + + ResultVO resultVO = new ResultVO<>(); + resultVO.setCode("200"); + resultVO.setMsg("查询成功"); + + String key = "006a4740-8f2d-4fdc-a25b-a7413a37a2ba"; + + if (ObjectUtils.isEmpty(spiDataReqBO.getKey())){ + resultVO.setCode("400"); + resultVO.setMsg("key不能为空"); + return resultVO; + } + if (!spiDataReqBO.getKey().equals(key)){ + resultVO.setCode("400"); + resultVO.setMsg("key不正确"); + return resultVO; + } + + SPIDataForPieChartRespDTO spiDataForPieChartRespDTO = new SPIDataForPieChartRespDTO(); + + if (ObjectUtils.isEmpty(spiDataReqBO.getYear())){ + + spiDataReqBO.setYear("2024"); + TroubleLevel troubleLevel = checkPointService.getTroubleLevel(spiDataReqBO); + resultVO.setData(troubleLevel); + return resultVO; + } + + TroubleLevel troubleLevel = checkPointService.getTroubleLevel(spiDataReqBO); + resultVO.setData(troubleLevel); + + return resultVO; + } + /** * @description 参数校验 -- Gitblit v1.9.2