From 21e7d491658dbd969adbcf0bc2f13a5d563ab863 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Thu, 25 Apr 2024 13:25:35 +0800
Subject: [PATCH] SPI数据，隐患等级饼图信息独立出来，调整查询方式
---
src/main/java/com/ruoyi/doublePrevention/service/impl/SPIDataCountServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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 ec2ae73..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,10 +1,7 @@
package com.ruoyi.doublePrevention.service.impl;
import com.ruoyi.doublePrevention.entity.DoublePreventDept;
-import com.ruoyi.doublePrevention.entity.SPI.SPIDataReqBO;
-import com.ruoyi.doublePrevention.entity.SPI.SPIDataRespDTO;
-import com.ruoyi.doublePrevention.entity.SPI.TroubleData;
-import com.ruoyi.doublePrevention.entity.SPI.TroubleLevel;
+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;
@@ -190,18 +187,50 @@
List<TroubleData> spiData = checkPointService.getSPIData(spiDataReqBO);
- TroubleLevel troubleLevel = checkPointService.getTroubleLevel(spiDataReqBO);
-
SPIDataRespDTO spiDataRespDTO = new SPIDataRespDTO();
-
spiDataRespDTO.setTroubleDataList(spiData);
- spiDataRespDTO.setTroubleLevel(troubleLevel);
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