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/controller/AlarmRuleController.java

@@ -173,4 +173,26 @@
      return R.data(alarmRuleService.getDetail(id));
   }

   /**
    * 通过告警规则类型查询生成告警规则类型
    * @param alarmRuleType
    * @return
    */
   @ApiOperation(value="通过告警规则类型查询生成告警规则类型", notes="通过告警规则类型查询生成告警规则类型")
   @GetMapping(value = "/getCreateRuleType")
   public R getCreateRuleType(String alarmRuleType) {
      return R.data(alarmRuleService.getCreateRuleType(alarmRuleType));
   }

   /**
    * 通过成告警规则类型查询告警规则名称
    * @param createAlarmType
    * @return
    */
   @ApiOperation(value="通过成告警规则类型查询告警规则名称", notes="通过成告警规则类型查询告警规则名称")
   @GetMapping(value = "/getAlarmRuleName")
   public R getAlarmRuleName(String createAlarmType) {
      return R.data(alarmRuleService.getAlarmRuleName(createAlarmType));
   }

}