From b26509b11967e9f2d84dbdd611432e04c2c33009 Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Wed, 29 Apr 2026 14:19:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-config.yml | 2 +- .../src/main/resources/tenant-admin-dev.yml | 32 +++++++++++++--------- pom.xml | 9 ++++-- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/application-tenant/tenant-admin/src/main/resources/application-config.yml b/application-tenant/tenant-admin/src/main/resources/application-config.yml index 158d786..23b47e3 100644 --- a/application-tenant/tenant-admin/src/main/resources/application-config.yml +++ b/application-tenant/tenant-admin/src/main/resources/application-config.yml @@ -145,7 +145,7 @@ common-redis: # master-slave: # 每个节点逗号分隔，第一个为主节点，其余为从节点。同时每个节点前必须以redis://开头。 # address: redis://localhost:6379,redis://localhost:6378,... - address: redis://192.168.100.25:6379 + address: redis://localhost:6379 # 链接超时，单位毫秒。 timeout: 6000 # 单位毫秒。分布式锁的超时检测时长。 diff --git a/application-tenant/tenant-admin/src/main/resources/tenant-admin-dev.yml b/application-tenant/tenant-admin/src/main/resources/tenant-admin-dev.yml index f1d3f95..11c43e5 100644 --- a/application-tenant/tenant-admin/src/main/resources/tenant-admin-dev.yml +++ b/application-tenant/tenant-admin/src/main/resources/tenant-admin-dev.yml @@ -5,7 +5,7 @@ logging: config: classpath:logback-spring.xml server: - port: 8075 + port: 8077 application: # Jwt令牌加密的签名值。该值的长度要超过10个字符(过短会报错)。 @@ -201,21 +201,21 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource druid: - # 租户管理数据源。 + # 租户管理数据源。 tenant-admin: - url: jdbc:mysql://192.168.100.18:3306/apelet_admin_xk?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: X7&9p8L2@6z4K7!8 - # 租户业务平台的通用业务数据，如字典、在线表单、流程、报表的定义等数据。 + url: jdbc:mysql://12.tcp.cpolar.top:11564/apelet_xhgl?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + username: root + password: X7&9p8L2@6z4K7!8 + # 租户业务平台的通用业务数据，如字典、在线表单、流程、报表的定义等数据。 tenant-common: - url: jdbc:mysql://192.168.100.18:3306/apelet_admin_xk?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai - username: root - password: X7&9p8L2@6z4K7!8 - # 默认生成的操作日志数据源配置。 + url: jdbc:mysql://12.tcp.cpolar.top:11564/apelet_xhgl?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai + username: root + password: X7&9p8L2@6z4K7!8 + # 默认生成的操作日志数据源配置。 operation-log: - url: jdbc:mysql://192.168.100.18:3306/apelet_admin_xk?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: X7&9p8L2@6z4K7!8 + url: jdbc:mysql://12.tcp.cpolar.top:11564/apelet_xhgl?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + username: root + password: X7&9p8L2@6z4K7!8 driverClassName: com.mysql.cj.jdbc.Driver name: tenant-admin initialSize: 10 @@ -305,3 +305,9 @@ cqurl: username: accountId: +flowable: + # 关闭自动创建/更新表，只检查 + database-schema-update: false + # 关闭事件注册引擎（你 99% 不需要） + event-registry: + enabled: false \ No newline at end of file diff --git a/pom.xml b/pom.xml index f3a2409..386b01c 100644 --- a/pom.xml +++ b/pom.xml @@ -70,9 +70,9 @@ dev - 192.168.100.25:8848 + localhost:8848 - 192.168.100.25:8848 + localhost:8848 DEFAULT_GROUP @@ -286,6 +286,11 @@ pom import + + apelet + common-orm + 1.0.0 + From 810152443bc76d1477765075665087201ea235eb Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Thu, 7 May 2026 10:48:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E5=8D=95=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenantadmin/tenant/plugin/QuotationPlugin.java | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java new file mode 100644 index 0000000..40e08bc --- /dev/null +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/QuotationPlugin.java @@ -0,0 +1,76 @@ +package apelet.tenantadmin.tenant.plugin; + +import apelet.common.core.object.ObjectCollection; +import apelet.common.core.object.ObjectValue; +import apelet.common.core.object.TokenData; +import apelet.common.core.util.ApplicationContextHolder; +import apelet.common.generator.utils.OrmGenDataSourceUtil; +import apelet.common.online.abstractplugin.ExecutePluginParent; +import apelet.common.online.model.constant.AttributeEnum; + +import java.math.BigDecimal; + +/* +报价单插件 + */ +public class QuotationPlugin extends ExecutePluginParent { + private static final OrmGenDataSourceUtil ORM_GEN_DATA_SOURCE_UTIL = ApplicationContextHolder.getBean(OrmGenDataSourceUtil.class); + @Override + public void formCreated(String widgetVariableName, ObjectValue objectValue){ + super.formCreated(widgetVariableName, objectValue); + //获取当前登录的用户ID + TokenData tokenData = TokenData.takeFromRequest(); + Long userId = tokenData.getUserId(); + //查询当前用户信息 + ObjectValue sysUserInfo = ORM_GEN_DATA_SOURCE_UTIL.queryOne("xy_sys_user", userId); + //赋值 + if (sysUserInfo != null){ + this.setWidgetAttribute("managerperson", AttributeEnum.VALUE_CHANGE, sysUserInfo); + } + + //隐藏拒绝理由 + this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,false); + //设置报价单状态 + this.setWidgetAttribute("status",AttributeEnum.VALUE_CHANGE,"1"); + //设置总价初始值为0 + this.setWidgetAttribute("qty",AttributeEnum.VALUE_CHANGE,0); + } + + @Override + public void change(String widgetVariableName, ObjectValue objectValue){ + super.change(widgetVariableName, objectValue); + //获取报价单状态 + String status = objectValue.getString("status"); + //若status为"4" + if(status.equals("4")){ + this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,true); + }else { + this.setWidgetAttribute("canaelreason",AttributeEnum.SHOW,false); + } + + //获取单据体 + ObjectCollection quotationE = objectValue.getObjectCollection("quotation_e"); + // 总金额 + BigDecimal allTotalAmount = BigDecimal.ZERO; + //判断是否有数据 + if (quotationE != null && !quotationE.isEmpty()){ + for (int i = 0; i < quotationE.size(); i++ ){ + // 获取行数据 + ObjectValue row = quotationE.getObject(i); + //获取指导折扣价 + BigDecimal discount = row.getBigDecimal("discount"); + // 判空处理 + if (discount == null) { + discount = BigDecimal.ZERO; + } + //获取数量 + int num = row.getInt("num"); + + // 计算总价 = 折扣价 * 数量 + BigDecimal totalAmount = discount.multiply(BigDecimal.valueOf(num)); + allTotalAmount = allTotalAmount.add(totalAmount); + } + this.setWidgetAttribute("qty",AttributeEnum.VALUE_CHANGE,allTotalAmount); + } + } +} From 7ee8fa959713e7bc3433d23ee7af579adebe31c0 Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Thu, 7 May 2026 10:48:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenant/plugin/StatusChangePlugin.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java new file mode 100644 index 0000000..fd226b0 --- /dev/null +++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/plugin/StatusChangePlugin.java @@ -0,0 +1,25 @@ +package apelet.tenantadmin.tenant.plugin; + +import apelet.common.core.object.ObjectCollection; +import apelet.common.core.object.ObjectValue; +import apelet.common.online.plugin.BeforeExecuteOperationArgs; +import apelet.common.online.plugin.OperationServicePlugIn; + +//提交后修改状态 +public class StatusChangePlugin extends OperationServicePlugIn { + @Override + public void beforeExecuteOperationTransaction(BeforeExecuteOperationArgs e){ + super.beforeExecuteOperationTransaction(e); + ObjectCollection modelCollcetion = e.getModelCollcetion(); + + if(modelCollcetion != null && !modelCollcetion.isEmpty()){ + for (int i = 0; i < modelCollcetion.size(); i++) { + // 获取单据对象 + ObjectValue bill = modelCollcetion.getObject(i); + bill.setString("status","2"); + //保存入库 + + } + } + } +} From 4636ddd78aca11d676bba9d737c56081b97dfae4 Mon Sep 17 00:00:00 2001 From: wuyilin <2658378522@qq.com> Date: Thu, 7 May 2026 10:49:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenant-admin/src/main/resources/tenant-admin-dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application-tenant/tenant-admin/src/main/resources/tenant-admin-dev.yml b/application-tenant/tenant-admin/src/main/resources/tenant-admin-dev.yml index 11c43e5..304caf6 100644 --- a/application-tenant/tenant-admin/src/main/resources/tenant-admin-dev.yml +++ b/application-tenant/tenant-admin/src/main/resources/tenant-admin-dev.yml @@ -203,17 +203,17 @@ spring: druid: # 租户管理数据源。 tenant-admin: - url: jdbc:mysql://12.tcp.cpolar.top:11564/apelet_xhgl?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://frp-use.com:51850/apelet_xhgl?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: X7&9p8L2@6z4K7!8 # 租户业务平台的通用业务数据，如字典、在线表单、流程、报表的定义等数据。 tenant-common: - url: jdbc:mysql://12.tcp.cpolar.top:11564/apelet_xhgl?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://frp-use.com:51850/apelet_xhgl?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai username: root password: X7&9p8L2@6z4K7!8 # 默认生成的操作日志数据源配置。 operation-log: - url: jdbc:mysql://12.tcp.cpolar.top:11564/apelet_xhgl?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://frp-use.com:51850/apelet_xhgl?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: X7&9p8L2@6z4K7!8 driverClassName: com.mysql.cj.jdbc.Driver