Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java

@@ -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,11 @@
   @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);
         return alarmRuleVOS;
      }
      return page.setRecords(baseMapper.selectAlarmRulePage(page,alarmRule));
      List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(page, alarmRule);
      return page.setRecords(alarmRuleVOS);
   }

   /**
@@ -43,4 +52,34 @@
      // 返回
      return alarmRule;
   }

   /**
    * 查询对应的短信模板ID 集合
    * @param alarmRuleId
    * @return
    */
   @Override
   public List<String> getAlarmRuleDetailList(String alarmRuleId) {
      return baseMapper.getAlarmRuleDetailListByAlarmRuleId(alarmRuleId);
   }

   /**
    * 通过告警规则类型查询生成告警规则类型
    * @param alarmRuleType
    * @return
    */
   @Override
   public Object getCreateRuleType(String alarmRuleType) {
      return baseMapper.getCreateRuleType(alarmRuleType);
   }

   /**
    * 通过成告警规则类型查询告警规则名称
    * @param createAlarmType
    * @return
    */
   @Override
   public Object getAlarmRuleName(String createAlarmType) {
      return baseMapper.getAlarmRuleName(createAlarmType);
   }
}