fg_v2.0.git - Gitblit

			@@ -3,6 +3,7 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.whyc.dto.AlarmDaoFactory;
			import com.whyc.dto.GroupWithStationAndAlarmDTO;
			import com.whyc.dto.Response;
			import com.whyc.mapper.BaoJiGroupMapper;
			@@ -10,6 +11,7 @@
			import com.whyc.mapper.BaoJiGroupBattGroupMapper;
			import com.whyc.mapper.CommonMapper;
			import com.whyc.pojo.*;
			import com.whyc.util.MessageUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			@@ -154,10 +156,19 @@
			List<String> stationIdList = stationInfList.stream().map(StationInf::getStationId).collect(Collectors.toList());
			//电池
			List<BattalarmData> battAlarmList = battAlarmDataService.getListByStationIds(stationIdList);
			for (BattalarmData data : battAlarmList) {
			data.setAlmSignalIdName(AlarmDaoFactory.getAllAlarmName(data.getAlmSignalId()));
			}
			//设备
			List<DevalarmData> deviceAlarmList = deviceAlarmDataService.getListByStationIds(stationIdList);
			for (DevalarmData data : deviceAlarmList) {
			data.setAlarmName(AlarmDaoFactory.getAllAlarmName(data.getAlmType()));
			}
			//电源
			List<PwrdevAlarm> powerAlarmList = powerAlarmService.getListByStationIds(stationIdList);
			for (PwrdevAlarm data : powerAlarmList) {
			data.setAlarmName(AlarmDaoFactory.getAllAlarmName(data.getAlmType()));
			}
			//遍历每个告警列表,如果与站点相符,则加入到站点里面
			for (BattalarmData alarm : battAlarmList) {
			for (StationInf stationInf : stationInfList) {

	src/main/java/com/whyc/pojo/DevalarmData.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/whyc/service/BaoJiGroupService.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -94,4 +94,6 @@
			@ApiModelProperty(value = "告警重要等级[0:重要；1:紧急]")
			private Integer almSeverity;

			private String alarmName;

			}