From bb30a3454a97b3830b344f1bc7642c7eef065c7a Mon Sep 17 00:00:00 2001 From: chenchuchuan <13554600537@163.com> Date: Thu, 30 Jul 2026 13:59:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(online):=20=E6=B7=BB=E5=8A=A0=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E5=AD=97=E5=85=B8=E6=98=A0=E5=B0=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E9=87=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 getDictMap 方法用于获取字典ID到名称的映射关系 - 添加 RESET_ONLINE_PAGE 显示类型枚举值用于重置跳转页面 - 在 ExecutePluginParent 中添加 childPageCallback 空实现方法 - 实现字典数据JSON解析并转换为键值对映射的功能 - 优化导入包结构，规范化依赖引入方式 --- .../online/abstractplugin/ExecutePluginParent.java | 18 ++++++++++++------ .../common/online/model/constant/ShowTypeEnum.java | 1 + .../common/online/service/OnlineDictService.java | 3 +++ .../online/service/impl/OnlineDictServiceImpl.java | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/common/common-online/src/main/java/apelet/common/online/abstractplugin/ExecutePluginParent.java b/common/common-online/src/main/java/apelet/common/online/abstractplugin/ExecutePluginParent.java index a3b2bcb..0886c93 100644 --- a/common/common-online/src/main/java/apelet/common/online/abstractplugin/ExecutePluginParent.java +++ b/common/common-online/src/main/java/apelet/common/online/abstractplugin/ExecutePluginParent.java @@ -1,25 +1,25 @@ package apelet.common.online.abstractplugin; -import apelet.common.core.object.Model; import apelet.common.core.object.ObjectValue; import apelet.common.core.util.ApplicationContextHolder; -import apelet.common.generator.utils.OrmGenDataSourceUtil; import apelet.common.online.dto.OnlineEventPluginExecuteDto; -import apelet.common.online.model.*; +import apelet.common.online.model.FilterInfo; +import apelet.common.online.model.ShowParameter; import apelet.common.online.model.constant.AttributeEnum; import apelet.common.online.service.OnlineDatasourceService; import apelet.common.online.service.OnlineFormService; import apelet.common.online.vo.OnlineEventPluginExecuteEntryVo; import apelet.common.online.vo.OnlineEventPluginExecuteVo; import apelet.common.orm.impl.OrmDataSourceUtil; -import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.Setter; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 插件执行抽象类父类 @@ -569,4 +569,10 @@ public abstract class ExecutePluginParent { return getDto().getModel().getCellField(); } + + public void childPageCallback(String widgetVariableName, ObjectValue objectValue) { + + } + + } \ No newline at end of file diff --git a/common/common-online/src/main/java/apelet/common/online/model/constant/ShowTypeEnum.java b/common/common-online/src/main/java/apelet/common/online/model/constant/ShowTypeEnum.java index be95da8..14197c8 100644 --- a/common/common-online/src/main/java/apelet/common/online/model/constant/ShowTypeEnum.java +++ b/common/common-online/src/main/java/apelet/common/online/model/constant/ShowTypeEnum.java @@ -13,6 +13,7 @@ import java.util.stream.Collectors; public enum ShowTypeEnum { OPEN_ONLINE_MODAL("openOnlineModal", "弹窗"), + RESET_ONLINE_PAGE("resetOnlinePage", "重置跳转页面"), OPEN_ONLINE_PAGE("openOnlinePage", "跳转页面"); @Getter diff --git a/common/common-online/src/main/java/apelet/common/online/service/OnlineDictService.java b/common/common-online/src/main/java/apelet/common/online/service/OnlineDictService.java index 4243aeb..759f9ad 100644 --- a/common/common-online/src/main/java/apelet/common/online/service/OnlineDictService.java +++ b/common/common-online/src/main/java/apelet/common/online/service/OnlineDictService.java @@ -4,6 +4,7 @@ import apelet.common.core.base.service.IBaseService; import apelet.common.online.model.OnlineDict; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -75,4 +76,6 @@ public interface OnlineDictService extends IBaseService { * @return 在线字典对象集合。 */ List getOnlineDictListFromCache(Set dictIdSet); + + Map getDictMap(Long dictId); } diff --git a/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineDictServiceImpl.java b/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineDictServiceImpl.java index 95221bc..d1fd4f7 100644 --- a/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineDictServiceImpl.java +++ b/common/common-online/src/main/java/apelet/common/online/service/impl/OnlineDictServiceImpl.java @@ -15,6 +15,9 @@ import apelet.common.online.service.OnlineDictService; import apelet.common.online.util.OnlineRedisKeyUtil; import apelet.common.redis.util.CommonRedisUtil; import apelet.common.sequence.wrapper.IdGeneratorWrapper; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.Page; import lombok.extern.slf4j.Slf4j; @@ -184,4 +187,21 @@ public class OnlineDictServiceImpl extends BaseService impleme } return CallResult.ok(); } + + @Override + public Map getDictMap(Long dictId) { + Map map = new HashMap<>(); + OnlineDict onlineDict = this.getOnlineDictFromCache(dictId); + if (onlineDict == null) { + return map; + } + JSONObject dictJson = JSON.parseObject(onlineDict.getDictDataJson()); + JSONArray jsonArray = dictJson.getJSONArray("dictData"); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jsonObject = jsonArray.getJSONObject(i); + map.put(jsonObject.getString("id"), jsonObject.getString("name")); + } + return map; + } + } From cefb7ecf6701b01a979c04c7a5ab23c248e30d3a Mon Sep 17 00:00:00 2001 From: chenchuchuan <13554600537@163.com> Date: Thu, 30 Jul 2026 14:36:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(common):=20=E6=B7=BB=E5=8A=A0=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=8C=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD=E5=92=8C?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 RESETROWS 属性枚举用于重置行数据操作 - 在 ListColumn 模型中添加 customize 字段支持自定义页面跳转 - 扩展前端定时请求事件功能以支持新的界面交互场景 --- .../main/java/apelet/common/online/abstractplugin/model/ListColumn.java | 1 + .../src/main/java/apelet/common/online/model/constant/AttributeEnum.java | 1 + 2 files changed, 2 insertions(+) diff --git a/common/common-online/src/main/java/apelet/common/online/abstractplugin/model/ListColumn.java b/common/common-online/src/main/java/apelet/common/online/abstractplugin/model/ListColumn.java index 3ad1702..e4ceb88 100644 --- a/common/common-online/src/main/java/apelet/common/online/abstractplugin/model/ListColumn.java +++ b/common/common-online/src/main/java/apelet/common/online/abstractplugin/model/ListColumn.java @@ -27,5 +27,6 @@ public class ListColumn { private boolean uploadFile;//是否是附件 private boolean treeLine;//是否树形结构 private Map column = null; //Html字段设置 "column："{ "fieldKind" : 34} + private boolean customize;//是否跳转自定义页面 // } diff --git a/common/common-online/src/main/java/apelet/common/online/model/constant/AttributeEnum.java b/common/common-online/src/main/java/apelet/common/online/model/constant/AttributeEnum.java index 524cbf9..7101eb8 100644 --- a/common/common-online/src/main/java/apelet/common/online/model/constant/AttributeEnum.java +++ b/common/common-online/src/main/java/apelet/common/online/model/constant/AttributeEnum.java @@ -57,6 +57,7 @@ public enum AttributeEnum { BACK_PAGE("backPage", "返回上一页"), OPEN_URL_PAGE("openUrlPage", "打开前端页面"), LISTEN_TIMER_ELAPSED("listentimerElapsed", "前端定时发送请求，触发此界面事件。"), + RESETROWS("resetrows", "重置行数据"), ;