From b2f5407b1b6e5493acb1b34843d45b022f496ace Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 26 Mar 2024 14:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/SystemUserAuthController.java       | 31 +++++++++++++++++++
 .../impl/DustNoiseDataServiceImpl.java        |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
index 5751248..3a86ac8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
@@ -21,6 +21,8 @@ import com.zhgd.xmgl.modules.safety.entity.InspectRecord;
 import com.zhgd.xmgl.modules.safety.entity.ProjectSubItem;
 import com.zhgd.xmgl.modules.safety.service.IInspectRecordService;
 import com.zhgd.xmgl.modules.safety.service.IProjectSubItemService;
+import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm;
+import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService;
 import com.zhgd.xmgl.security.JwtTokenProvider;
 import com.zhgd.xmgl.security.SecurityUser;
 import com.zhgd.xmgl.security.SecurityUtil;
@@ -285,6 +287,9 @@ public class SystemUserAuthController {
 	@Autowired
 	private IProjectSubItemService projectSubItemService;
 
+	@Autowired
+	private IEnvironmentAlarmService environmentAlarmService;
+
 	@Autowired
 	private IInspectRecordService inspectRecordService;
 
@@ -414,6 +419,32 @@ public class SystemUserAuthController {
 				listMap.add(map);
 			}
 		}
+		// 报警台账
+		if (actionCodes.contains("sub_item_examine")) {
+			List<ProjectSubItem> list = projectSubItemService.list(Wrappers.<ProjectSubItem>lambdaQuery().eq(ProjectSubItem::getApprovalStatus, 0));
+			for (ProjectSubItem projectSubItem : list) {
+				Map<String, Object> map = new HashMap<>();
+				map.put("projectSn", projectSubItem.getEngineeringSn());
+				map.put("flag", 3);
+				map.put("type", "施工节点审批");
+				map.put("state", 1);
+				map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(projectSubItem.getEngineeringSn()))
+						.collect(Collectors.toList()).get(0).getEngineeringName());
+				listMap.add(map);
+			}
+		}
+		List<EnvironmentAlarm> list = environmentAlarmService.list(Wrappers.<EnvironmentAlarm>lambdaQuery().eq(EnvironmentAlarm::getState, 0));
+		for (EnvironmentAlarm environmentAlarm : list) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("projectSn", environmentAlarm.getEngineeringSn());
+			map.put("flag", 4);
+			map.put("type", "扬尘报警");
+			map.put("state", 1);
+			map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(environmentAlarm.getEngineeringSn()))
+					.collect(Collectors.toList()).get(0).getEngineeringName());
+			listMap.add(map);
+		}
+
 		Integer flag = MapUtils.getInteger(param, "flag");
 		Integer state = MapUtils.getInteger(param, "state");
 		String projectName = MapUtils.getString(param, "projectName");
diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java
index 199815a..9e94463 100644
--- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java
@@ -30,7 +30,9 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
 
     @Override
     public Page<DustNoiseData> pageList(Page page, Wrapper<DustNoiseData> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+        Page<DustNoiseData> dustNoiseDataPage = baseMapper.pageList(page, wrapper);
+        dustNoiseDataPage.getRecords().forEach(d -> setAlarm(d));
+        return dustNoiseDataPage;
     }
 
     @Override