From aea105c1f303c341e283e516b5d3b0c49c4fa688 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Mon, 27 Jul 2026 09:32:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qgc_base/service/IMsWarnRuleBService.java |  3 +-
 .../service/impl/MsWarnRuleBServiceImpl.java  | 31 ++++++++-----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsWarnRuleBService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsWarnRuleBService.java
index 21396e56..05607c7f 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsWarnRuleBService.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsWarnRuleBService.java
@@ -3,6 +3,7 @@ package com.yfd.platform.qgc_base.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yfd.platform.common.DataSourceRequest;
+import com.yfd.platform.common.DataSourceResult;
 import com.yfd.platform.qgc_base.domain.MsWarnRuleB;
 import com.yfd.platform.qgc_sys.warnRule.vo.MsWarnRuleBVo;
 import com.yfd.platform.qgc_sys.warnRule.vo.WarnRuleVo;
@@ -58,7 +59,7 @@ public interface IMsWarnRuleBService extends IService<MsWarnRuleB> {
     /**
      * 查询测站和预警规则绑定列表
      */
-    Page<MsWarnRuleBVo> getRuleBindList(DataSourceRequest request);
+    DataSourceResult<MsWarnRuleBVo> getRuleBindList(DataSourceRequest request);
 
     /**
      * 根据id查询规则配置详情
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 c921e1eb..ee9490de 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
@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yfd.platform.common.DataSourceLoadOptionsBase;
 import com.yfd.platform.common.DataSourceRequest;
+import com.yfd.platform.common.DataSourceResult;
 import com.yfd.platform.common.MicroservicDynamicSQLMapper;
 import com.yfd.platform.qgc_base.domain.MsWarnRuleB;
 import com.yfd.platform.qgc_base.domain.MsWarnRuleDetailB;
@@ -20,10 +22,7 @@ import com.yfd.platform.qgc_sys.warnRule.vo.MsWarnRuleBVo;
 import com.yfd.platform.qgc_sys.warnRule.vo.MsWarnRuleDetailVo;
 import com.yfd.platform.qgc_sys.warnRule.vo.WarnRuleVo;
 import com.yfd.platform.qgc_sys.warnRule.vo.WarnYsVo;
-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 com.yfd.platform.utils.*;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -174,7 +173,7 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
 
         if (StringUtils.isBlank(vo.getId())) {
             // ---- 新增 ----
-            entity.setRecordUser(SecurityUtils.getCurrentUsername());
+            entity.setRecordUser(SecurityUtils.getUserId());
             if ("common".equals(vo.getRuleCode())) {
                 boolean exist = checkRuleExist(vo.getRuleType(), lvl);
                 if (exist) {
@@ -323,7 +322,8 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
     }
 
     @Override
-    public Page<MsWarnRuleBVo> getRuleBindList(DataSourceRequest request) {
+    public DataSourceResult<MsWarnRuleBVo> getRuleBindList(DataSourceRequest request) {
+        DataSourceResult<MsWarnRuleBVo> dataSourceResult = new DataSourceResult<>();
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT id AS bindId, STCD, STNM, STTP_CODE AS sttpCode, RULE_NAME AS ruleName, ")
            .append("RULE_TYPE AS ruleType, recordUser, MODIFY_TIME AS modifyTime, isShow, RULE_CODE AS ruleCode ")
@@ -342,18 +342,13 @@ public class MsWarnRuleBServiceImpl extends ServiceImpl<MsWarnRuleBMapper, MsWar
 
         // 处理排序
         appendOrderBy(request, sql);
-
-        Page<MsWarnRuleBVo> page;
-        if (request.getPage() > 0 && request.getPageSize() > 0) {
-            page = new Page<>(request.getPage(), request.getPageSize());
-        } else if (request.getTake() > 0) {
-            long pageNum = (request.getSkip() / request.getTake()) + 1;
-            page = new Page<>(pageNum, request.getTake());
-        } else {
-            page = new Page<>(1, 20);
-        }
-        microservicDynamicSQLMapper.pageAllListWithResultType(page, sql.toString(), params, MsWarnRuleBVo.class);
-        return page;
+        DataSourceLoadOptionsBase loadOptions = request.toDevRequest();
+        Page<?> page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake());
+        List<MsWarnRuleBVo> list = microservicDynamicSQLMapper.pageAllListWithResultType(page, sql.toString(), params, MsWarnRuleBVo.class);
+        dictCodeToNameConverter.convertCodeToName(list, CODE_TO_NAME_META_LIST);
+        dataSourceResult.setData(list);
+        dataSourceResult.setTotal(page == null ? list.size() : page.getTotal());
+        return dataSourceResult;
     }
 
     @Override