From 8c635598000e40edfb3edf5934124ad48d60f62d Mon Sep 17 00:00:00 2001 From: whyclxw <810412026@qq.com> Date: 星期六, 21 六月 2025 19:14:50 +0800 Subject: [PATCH] 实时页面修改 --- src/main/java/com/whyc/service/DevalarmDataService.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/whyc/service/DevalarmDataService.java b/src/main/java/com/whyc/service/DevalarmDataService.java index 31bef6d..02b22ae 100644 --- a/src/main/java/com/whyc/service/DevalarmDataService.java +++ b/src/main/java/com/whyc/service/DevalarmDataService.java @@ -9,10 +9,13 @@ import com.whyc.constant.BattSingalIdEnum; import com.whyc.constant.DevAlarmEnum; import com.whyc.dto.AlarmDto; +import com.whyc.dto.Param.AlmAnalyseDto; import com.whyc.dto.Real.AlmDto; import com.whyc.dto.Response; import com.whyc.mapper.DevalarmDataMapper; +import com.whyc.pojo.db_alarm.BattalarmData; import com.whyc.pojo.db_alarm.DevalarmData; +import com.whyc.pojo.db_station.BattInf; import com.whyc.pojo.web_site.AlarmInspection; import com.whyc.util.ActionUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +31,9 @@ public class DevalarmDataService { @Autowired(required = false) private DevalarmDataMapper mapper; + + @Autowired + private BattInfService battInfService; //鑾峰彇璁惧瀹炴椂鍛婅淇℃伅 public Response getDevAlmReal(AlmDto almDto) { PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize()); @@ -84,4 +90,18 @@ public List<AlarmDto> getListByUserId(Integer userId,Integer almLevel) { return mapper.getListByUserId(userId,almLevel); } + //棰勮鍒嗘瀽绠$悊-璁惧鍛婅 + public Response getDevAlmAnalyse(AlmAnalyseDto almDto) { + PageHelper.startPage(almDto.getPageNum(),almDto.getPageSize()); + List<DevalarmData> list=mapper.getDevAlmAnalyse(almDto); + list.forEach(data->{ + data.setAlmName(DevAlarmEnum.getValue(data.getAlmId())); + //鏌ヨ璁惧涓嬫墍鏈夌殑鐢垫睜缁刬d + List<BattInf> binfList = battInfService.getBattgroupIdListByDevId(data.getDevId()); + data.setBinfList(binfList); + }); + PageInfo pageInfo=new PageInfo(list); + return new Response().setII(1,list!=null,pageInfo,"鑾峰彇璁惧瀹炴椂鍛婅淇℃伅"); + } + } \ No newline at end of file -- Gitblit v1.9.1