From b8a4b5727fa3482f642c7d32494fb5059b8b3557 Mon Sep 17 00:00:00 2001
From: chenchuchuan <13554600537@163.com>
Date: Tue, 21 Jul 2026 11:08:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(permission):=20=E5=B0=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=95=B0=E6=8D=AE=E8=A7=84=E5=88=99=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB=E5=88=B0?=
 =?UTF-8?q?common-online=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将PermissionDataRuleSchema实体类从tenant-admin移动到common.online.model包
- 将IPermissionDataRuleSchemaService接口从tenant-admin移动到common.online.service包
- 将PermissionDataRuleSchemaMapper接口及其实现从tenant-admin移动到common.online.dao包
- 将PermissionDataRuleSchemaVo类从tenant-admin移动到common.online.vo包
- 更新OnlineFormController添加根据表单类型查询表单列表的功能
- 在ListDataOrmService中添加过滤器TODO注释
- 修改OnlineFormService和OnlineFormServiceImpl实现表单类型查询功能
---
 .../controller/PermissionDataRuleSchemaController.java |  4 ++--
 .../online/abstractplugin/ListDataOrmService.java      |  1 +
 .../common/online/controller/OnlineFormController.java | 16 ++++++++++++++++
 .../online}/dao/PermissionDataRuleSchemaMapper.java    |  4 ++--
 .../dao/mapper/PermissionDataRuleSchemaMapper.xml      |  4 ++--
 .../common/online}/model/PermissionDataRuleSchema.java |  4 ++--
 .../service/IPermissionDataRuleSchemaService.java      |  4 ++--
 .../common/online/service/OnlineFormService.java       |  8 ++++++++
 .../online/service/impl/OnlineFormServiceImpl.java     | 18 ++++++++++++++++++
 .../impl/PermissionDataRuleSchemaServiceImpl.java      |  8 ++++----
 .../common/online}/vo/PermissionDataRuleSchemaVo.java  |  4 ++--
 11 files changed, 59 insertions(+), 16 deletions(-)
 rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant => common/common-online/src/main/java/apelet/common/online}/dao/PermissionDataRuleSchemaMapper.java (87%)
 rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant => common/common-online/src/main/java/apelet/common/online}/dao/mapper/PermissionDataRuleSchemaMapper.xml (82%)
 rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant => common/common-online/src/main/java/apelet/common/online}/model/PermissionDataRuleSchema.java (96%)
 rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant => common/common-online/src/main/java/apelet/common/online}/service/IPermissionDataRuleSchemaService.java (92%)
 rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant => common/common-online/src/main/java/apelet/common/online}/service/impl/PermissionDataRuleSchemaServiceImpl.java (92%)
 rename {application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant => common/common-online/src/main/java/apelet/common/online}/vo/PermissionDataRuleSchemaVo.java (78%)

diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/PermissionDataRuleSchemaController.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/PermissionDataRuleSchemaController.java
index 0309a30..8ebce59 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/PermissionDataRuleSchemaController.java
+++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/PermissionDataRuleSchemaController.java
@@ -11,8 +11,8 @@ import apelet.common.core.util.MyPageUtil;
 import apelet.common.core.validator.UpdateGroup;
 import apelet.common.log.annotation.OperationLog;
 import apelet.common.log.model.constant.SysOperationLogType;
-import apelet.tenantadmin.tenant.model.PermissionDataRuleSchema;
-import apelet.tenantadmin.tenant.service.IPermissionDataRuleSchemaService;
+import apelet.common.online.model.PermissionDataRuleSchema;
+import apelet.common.online.service.IPermissionDataRuleSchemaService;
 import com.github.pagehelper.page.PageMethod;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/common/common-online/src/main/java/apelet/common/online/abstractplugin/ListDataOrmService.java b/common/common-online/src/main/java/apelet/common/online/abstractplugin/ListDataOrmService.java
index 67ab3d4..040b36b 100644
--- a/common/common-online/src/main/java/apelet/common/online/abstractplugin/ListDataOrmService.java
+++ b/common/common-online/src/main/java/apelet/common/online/abstractplugin/ListDataOrmService.java
@@ -65,6 +65,7 @@ public class ListDataOrmService extends ListDataService {
         JSONObject widgetList = widgetJson.getJSONObject("pc").getJSONObject("tableWidget");
         Set<String> selectorSet = new TreeSet<>();
         getOrmSelector(widgetList, selectorSet, masterTable, new HashMap<>());
+        // todo 过滤器
         Filter filter = getFilter();
 
         Sorter sorter = new Sorter();
diff --git a/common/common-online/src/main/java/apelet/common/online/controller/OnlineFormController.java b/common/common-online/src/main/java/apelet/common/online/controller/OnlineFormController.java
index 7d10bdb..1a1571c 100644
--- a/common/common-online/src/main/java/apelet/common/online/controller/OnlineFormController.java
+++ b/common/common-online/src/main/java/apelet/common/online/controller/OnlineFormController.java
@@ -32,6 +32,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.page.PageMethod;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.google.common.collect.Lists;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -697,4 +698,19 @@ public class OnlineFormController {
         }
         return ResponseResult.success(onlineFormList);
     }
+
+    /**
+     * 根据表单类型查询表单列表
+     *
+     * @param formType 表单类型
+     * @return 表单列表
+     * @see apelet.common.online.model.constant.FormType
+     */
+    @PostMapping(value = "/queryFormByType")
+    public ResponseResult<List<OnlineForm>> queryFormByType(@MyRequestBody Integer formType) {
+        if (formType == null) {
+            return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
+        }
+        return ResponseResult.success(onlineFormService.queryListByFormType(Lists.newArrayList(formType)));
+    }
 }
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/dao/PermissionDataRuleSchemaMapper.java b/common/common-online/src/main/java/apelet/common/online/dao/PermissionDataRuleSchemaMapper.java
similarity index 87%
rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/dao/PermissionDataRuleSchemaMapper.java
rename to common/common-online/src/main/java/apelet/common/online/dao/PermissionDataRuleSchemaMapper.java
index 528138a..ada4fa3 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/dao/PermissionDataRuleSchemaMapper.java
+++ b/common/common-online/src/main/java/apelet/common/online/dao/PermissionDataRuleSchemaMapper.java
@@ -1,7 +1,7 @@
-package apelet.tenantadmin.tenant.dao;
+package apelet.common.online.dao;
 
 import apelet.common.core.base.dao.BaseDaoMapper;
-import apelet.tenantadmin.tenant.model.PermissionDataRuleSchema;
+import apelet.common.online.model.PermissionDataRuleSchema;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/dao/mapper/PermissionDataRuleSchemaMapper.xml b/common/common-online/src/main/java/apelet/common/online/dao/mapper/PermissionDataRuleSchemaMapper.xml
similarity index 82%
rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/dao/mapper/PermissionDataRuleSchemaMapper.xml
rename to common/common-online/src/main/java/apelet/common/online/dao/mapper/PermissionDataRuleSchemaMapper.xml
index 55a38bb..d9705fa 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/dao/mapper/PermissionDataRuleSchemaMapper.xml
+++ b/common/common-online/src/main/java/apelet/common/online/dao/mapper/PermissionDataRuleSchemaMapper.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="apelet.tenantadmin.tenant.dao.PermissionDataRuleSchemaMapper">
+<mapper namespace="apelet.common.online.dao.PermissionDataRuleSchemaMapper">
 
     <select id="getListByFilter"
-            resultType="apelet.tenantadmin.tenant.model.PermissionDataRuleSchema">
+            resultType="apelet.common.online.model.PermissionDataRuleSchema">
         SELECT * FROM zz_permission_data_rule_schema
         WHERE 1=1
         <if test="filter.ruleCode != null and filter.ruleCode != ''">
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/model/PermissionDataRuleSchema.java b/common/common-online/src/main/java/apelet/common/online/model/PermissionDataRuleSchema.java
similarity index 96%
rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/model/PermissionDataRuleSchema.java
rename to common/common-online/src/main/java/apelet/common/online/model/PermissionDataRuleSchema.java
index 7a6f07d..7f4c3b6 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/model/PermissionDataRuleSchema.java
+++ b/common/common-online/src/main/java/apelet/common/online/model/PermissionDataRuleSchema.java
@@ -1,9 +1,9 @@
-package apelet.tenantadmin.tenant.model;
+package apelet.common.online.model;
 
 import apelet.common.core.base.mapper.BaseModelMapper;
 import apelet.common.core.base.model.BaseModel;
 import apelet.common.core.validator.UpdateGroup;
-import apelet.tenantadmin.tenant.vo.PermissionDataRuleSchemaVo;
+import apelet.common.online.vo.PermissionDataRuleSchemaVo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/service/IPermissionDataRuleSchemaService.java b/common/common-online/src/main/java/apelet/common/online/service/IPermissionDataRuleSchemaService.java
similarity index 92%
rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/service/IPermissionDataRuleSchemaService.java
rename to common/common-online/src/main/java/apelet/common/online/service/IPermissionDataRuleSchemaService.java
index 978aed0..8620df7 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/service/IPermissionDataRuleSchemaService.java
+++ b/common/common-online/src/main/java/apelet/common/online/service/IPermissionDataRuleSchemaService.java
@@ -1,8 +1,8 @@
-package apelet.tenantadmin.tenant.service;
+package apelet.common.online.service;
 
 import apelet.common.core.base.service.IBaseService;
 import apelet.common.core.object.CallResult;
-import apelet.tenantadmin.tenant.model.PermissionDataRuleSchema;
+import apelet.common.online.model.PermissionDataRuleSchema;
 
 import java.util.List;
 
diff --git a/common/common-online/src/main/java/apelet/common/online/service/OnlineFormService.java b/common/common-online/src/main/java/apelet/common/online/service/OnlineFormService.java
index 4bd603d..7159ae0 100644
--- a/common/common-online/src/main/java/apelet/common/online/service/OnlineFormService.java
+++ b/common/common-online/src/main/java/apelet/common/online/service/OnlineFormService.java
@@ -139,4 +139,12 @@ public interface OnlineFormService extends IBaseService<OnlineForm, Long> {
      * @return
      */
     ObjectValue getObjectValue(Map<String, Object> masterData, Map<String, Object> savedata, String tableName);
+
+    /**
+     * 根据表单类型查询表单列表
+     *
+     * @param formType 表单类型
+     * @return 表单列表
+     */
+    List<OnlineForm> queryListByFormType(List<Integer> formType);
 }
diff --git a/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineFormServiceImpl.java b/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineFormServiceImpl.java
index b60b661..22d0d72 100644
--- a/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineFormServiceImpl.java
+++ b/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineFormServiceImpl.java
@@ -26,6 +26,7 @@ import apelet.common.orm.impl.LinkEntityColumn;
 import apelet.common.redis.util.CommonRedisUtil;
 import apelet.common.sequence.wrapper.IdGeneratorWrapper;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -460,6 +461,23 @@ public class OnlineFormServiceImpl extends BaseService<OnlineForm, Long> impleme
         return objectValue;
     }
 
+    @Override
+    public List<OnlineForm> queryListByFormType(List<Integer> formType) {
+        // 查询已发布的 page
+        List<OnlinePage> pageList = onlinePageService.queryByEnableList();
+        if (CollectionUtil.isEmpty(pageList)) {
+            return Collections.emptyList();
+        }
+        Set<Long> pageIdSet = pageList.stream().map(OnlinePage::getPageId).collect(Collectors.toSet());
+        List<OnlineForm> formList = onlineFormMapper.selectList(new LambdaQueryWrapper<OnlineForm>().in(OnlineForm::getFormType, formType).in(OnlineForm::getPageId, pageIdSet));
+        if (CollectionUtil.isNotEmpty(formList)) {
+            formList.forEach(item -> {
+                item.setWidgetJson(null);
+            });
+        }
+        return formList;
+    }
+
     /**
      * 设置关联表字段转换为对象
      *
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/service/impl/PermissionDataRuleSchemaServiceImpl.java b/common/common-online/src/main/java/apelet/common/online/service/impl/PermissionDataRuleSchemaServiceImpl.java
similarity index 92%
rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/service/impl/PermissionDataRuleSchemaServiceImpl.java
rename to common/common-online/src/main/java/apelet/common/online/service/impl/PermissionDataRuleSchemaServiceImpl.java
index 5fd1c92..435c697 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/service/impl/PermissionDataRuleSchemaServiceImpl.java
+++ b/common/common-online/src/main/java/apelet/common/online/service/impl/PermissionDataRuleSchemaServiceImpl.java
@@ -1,14 +1,14 @@
-package apelet.tenantadmin.tenant.service.impl;
+package apelet.common.online.service.impl;
 
 import apelet.common.core.base.dao.BaseDaoMapper;
 import apelet.common.core.base.service.BaseService;
 import apelet.common.core.object.CallResult;
 import apelet.common.generator.model.OnlFormHead;
 import apelet.common.generator.service.IOnlFormHeadService;
+import apelet.common.online.dao.PermissionDataRuleSchemaMapper;
+import apelet.common.online.model.PermissionDataRuleSchema;
+import apelet.common.online.service.IPermissionDataRuleSchemaService;
 import apelet.common.sequence.wrapper.IdGeneratorWrapper;
-import apelet.tenantadmin.tenant.dao.PermissionDataRuleSchemaMapper;
-import apelet.tenantadmin.tenant.model.PermissionDataRuleSchema;
-import apelet.tenantadmin.tenant.service.IPermissionDataRuleSchemaService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/vo/PermissionDataRuleSchemaVo.java b/common/common-online/src/main/java/apelet/common/online/vo/PermissionDataRuleSchemaVo.java
similarity index 78%
rename from application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/vo/PermissionDataRuleSchemaVo.java
rename to common/common-online/src/main/java/apelet/common/online/vo/PermissionDataRuleSchemaVo.java
index 242f778..a1b38ab 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/vo/PermissionDataRuleSchemaVo.java
+++ b/common/common-online/src/main/java/apelet/common/online/vo/PermissionDataRuleSchemaVo.java
@@ -1,6 +1,6 @@
-package apelet.tenantadmin.tenant.vo;
+package apelet.common.online.vo;
 
-import apelet.tenantadmin.tenant.model.PermissionDataRuleSchema;
+import apelet.common.online.model.PermissionDataRuleSchema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;