hbwri/skjcmanager.git

			@@ -4,9 +4,13 @@
			import cn.gistack.alerts.alarmRule.mapper.AlarmRuleMapper;
			import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
			import cn.gistack.alerts.alarmRule.vo.AlarmRuleVO;
			import cn.gistack.system.feign.ISysClient;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import org.springblade.core.mp.base.BaseServiceImpl;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.List;

			/**
			* 告警规则服务实现层
			@@ -15,6 +19,9 @@
			*/
			@Service
			public class AlarmRuleServiceImpl extends BaseServiceImpl<AlarmRuleMapper, AlarmRule> implements AlarmRuleService {

			@Autowired
			private ISysClient sysClient;

			/**
			* 自定义分页列表查询
			@@ -25,9 +32,17 @@
			@Override
			public Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
			if (null != alarmRule.getIsExport()){
			return baseMapper.selectAlarmRulePage(null,alarmRule);
			List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(null, alarmRule);
			for (AlarmRuleVO alarmRuleVO : alarmRuleVOS) {
			alarmRuleVO.setAlarmPerson(String.join(",",sysClient.getRoleNames(alarmRuleVO.getAlarmPerson()).getData()));
			}
			return page.setRecords(baseMapper.selectAlarmRulePage(page,alarmRule));
			return alarmRuleVOS;
			}
			List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(page, alarmRule);
			for (AlarmRuleVO alarmRuleVO : alarmRuleVOS) {
			alarmRuleVO.setAlarmPerson(String.join(",",sysClient.getRoleNames(alarmRuleVO.getAlarmPerson()).getData()));
			}
			return page.setRecords(alarmRuleVOS);
			}

			/**