diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsWarnRuleB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsWarnRuleB.java index f3e806e8..1812285c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsWarnRuleB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsWarnRuleB.java @@ -24,6 +24,10 @@ public class MsWarnRuleB implements Serializable { @TableField("RULE_TYPE") private String ruleType; + /** 预警规则类型名称(字典转换) */ + @TableField(exist = false) + private String ruleTypeName; + /** 预警规则名称 */ @TableField("RULE_NAME") private String ruleName; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java index 7e50fa11..e5e4501a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java @@ -9,11 +9,14 @@ import com.yfd.platform.qgc_base.mapper.MsWarnRuleBMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.IMsWarnRuleBService; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,12 +28,28 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder() + .codeProperty("ruleType") + .modifyProperty("ruleTypeName") + .dictType("STATIC") + .dictSource("WARN_RULE_TYPE") + .build()); + } + @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, MsWarnRuleB.class, this); + Page page = DataSourceRequestUtil.executeQuery(request, MsWarnRuleB.class, this); + dictCodeToNameConverter.convertCodeToName(page, CODE_TO_NAME_META_LIST); + return page; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/controller/MsWarnRuleBController.java b/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/controller/MsWarnRuleBController.java new file mode 100644 index 00000000..3a82f1db --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/warnRule/controller/MsWarnRuleBController.java @@ -0,0 +1,33 @@ +package com.yfd.platform.qgc_sys.warnRule.controller; + +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.MsWarnRuleB; +import com.yfd.platform.qgc_base.service.IMsWarnRuleBService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 告警规则控制器 + */ +@Slf4j +@RestController +@RequestMapping("/sys/warnRule") +@Tag(name = "告警规则配置管理") +public class MsWarnRuleBController { + + @Resource + private IMsWarnRuleBService msWarnRuleBService; + + @PostMapping("/GetKendoListCust") + @Operation(summary = "条件过滤数据列表") + public ResponseResult getKendoList(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(msWarnRuleBService.queryPageList(dataSourceRequest)); + } +}