From 9c8fbde8690053657efac172ba8c35ea2dd3c4cf Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 28 Jul 2023 15:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=B3=E5=B1=B1=E4=BB=A3=E7=A0=81=E5=A4=8D?=
 =?UTF-8?q?=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../government/GovEnvironmentDevController.java |  6 +++---
 .../wisdom/service/IEnvironmentDevService.java  |  2 +-
 .../service/impl/EnvironmentDevServiceImpl.java | 17 +++++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java
index 310a815..d43404a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java
@@ -135,9 +135,9 @@ public class GovEnvironmentDevController {
      */
     @OperLog(operModul = "扬尘管理", operType = "统计", operDesc = "统计扬尘设备数据")
     @ApiOperation(value = " 统计扬尘设备数据", notes = "统计扬尘设备数据", httpMethod = "GET")
-    @GetMapping(value = "/statistics/{type}")
-    public Result<EnvironmentDevStatDto> statistics(@PathVariable("type") Integer type) {
-        return Result.success(environmentDevService.statistics(type));
+    @GetMapping(value = "/statistics")
+    public Result<EnvironmentDevStatDto> statistics() {
+        return Result.success(environmentDevService.statistics());
     }
 
     /**
diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentDevService.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentDevService.java
index 1ba4e95..b376dd8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentDevService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IEnvironmentDevService.java
@@ -38,5 +38,5 @@ public interface IEnvironmentDevService extends IService<EnvironmentDev> {
 
     boolean updateInfo(EnvironmentDev environmentDev);
 
-    EnvironmentDevStatDto statistics(Integer type);
+    EnvironmentDevStatDto statistics();
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java
index ca61f86..35aef04 100644
--- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java
@@ -13,16 +13,17 @@ import com.zhgd.jeecg.common.util.PageUtil;
 import com.zhgd.redis.lock.RedisRepository;
 import com.zhgd.xmgl.handler.exception.CustomException;
 import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants;
-import com.zhgd.xmgl.modules.basicdata.dto.*;
+import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto;
+import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto;
 import com.zhgd.xmgl.modules.basicdata.entity.Engineering;
-import com.zhgd.xmgl.modules.basicdata.entity.Project;
+import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService;
+import com.zhgd.xmgl.modules.basicdata.service.IProjectService;
+import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto;
 import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto;
 import com.zhgd.xmgl.modules.wisdom.entity.DustNoiseData;
-import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto;
 import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm;
 import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev;
 import com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentDevMapper;
-import com.zhgd.xmgl.modules.basicdata.service.*;
 import com.zhgd.xmgl.modules.wisdom.service.IDustNoiseDataService;
 import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService;
 import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService;
@@ -150,21 +151,21 @@ public class EnvironmentDevServiceImpl extends ServiceImpl<EnvironmentDevMapper,
     }
 
     @Override
-    public EnvironmentDevStatDto statistics(Integer type) {
+    public EnvironmentDevStatDto statistics() {
         EnvironmentDevStatDto environmentDev = new EnvironmentDevStatDto();
-        if (type == 1) {
+    /*    if (type == 1) {
             int installNum = this.count(Wrappers.<EnvironmentDev>lambdaQuery().isNotNull(EnvironmentDev::getProjectSn));
             Integer projectNum = projectService.list(Wrappers.<Project>lambdaQuery().eq(Project::getState, 1)).size();
             environmentDev.setInstallNum(installNum);
             environmentDev.setUseRate(projectNum == 0 ? 0 : NumberUtil.round(installNum * 100F / projectNum, 2).floatValue());
             environmentDev.setTotalAlarm(environmentAlarmService.count(Wrappers.<EnvironmentAlarm>lambdaQuery().isNotNull(EnvironmentAlarm::getProjectSn)));
-        } else {
+        } else {*/
             int installNum = this.statByEngineering();
             Integer engineeringNum = engineeringService.list(Wrappers.<Engineering>lambdaQuery().eq(Engineering::getExamineState, 3)).size();
             environmentDev.setInstallNum(installNum);
             environmentDev.setUseRate(engineeringNum == 0 ? 0 : NumberUtil.round(installNum * 100F / engineeringNum, 2).floatValue());
             environmentDev.setTotalAlarm(environmentAlarmService.count(Wrappers.<EnvironmentAlarm>lambdaQuery().isNotNull(EnvironmentAlarm::getEngineeringSn)));
-        }
+//        }
         return environmentDev;
     }