From d907d3eb924ce9afea2496823a0908ccb3df8e13 Mon Sep 17 00:00:00 2001 From: Paidax Date: Sat, 30 Aug 2025 09:52:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E6=92=AD=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{user => common}/SysCommonDataChange.java | 4 +-- .../SysCommonDataChangeCenter.java | 4 +-- .../SysCommonDataChangeType.java | 2 +- .../base/event/user/UserChangePublisher.java | 9 ++++--- .../java/io/v/nutz/base/utils/AppIocUtil.java | 27 +++++++++++++++++++ .../platform/sys/SysUnionMangeCon.java | 4 +-- .../platform/sys/SysUnitMangeController.java | 4 +-- .../listener/ActivityUserChangeListener.java | 22 --------------- .../listener/SysActivityUnionListener.java | 5 ++-- .../listener/SysActivityUnitListener.java | 4 +-- .../listener/ProposalUnderTakeListener.java | 4 +-- .../WelfareEvaluateActivityController.java | 2 +- .../WelfareEvaluateStatisticsController.java | 18 ++++++++++--- .../platform/sourcechange/manage/index.html | 8 +++--- .../sourcechange/manage/userChangeInfo.js | 4 +++ 15 files changed, 70 insertions(+), 51 deletions(-) rename src/main/java/io/v/nutz/base/event/{user => common}/SysCommonDataChange.java (77%) rename src/main/java/io/v/nutz/base/event/{user => common}/SysCommonDataChangeCenter.java (83%) rename src/main/java/io/v/nutz/base/event/{user => common}/SysCommonDataChangeType.java (75%) create mode 100644 src/main/java/io/v/nutz/base/utils/AppIocUtil.java delete mode 100644 src/main/java/io/v/nutz/zhgh/activity/listener/ActivityUserChangeListener.java diff --git a/src/main/java/io/v/nutz/base/event/user/SysCommonDataChange.java b/src/main/java/io/v/nutz/base/event/common/SysCommonDataChange.java similarity index 77% rename from src/main/java/io/v/nutz/base/event/user/SysCommonDataChange.java rename to src/main/java/io/v/nutz/base/event/common/SysCommonDataChange.java index efcd8e8..1ca5875 100644 --- a/src/main/java/io/v/nutz/base/event/user/SysCommonDataChange.java +++ b/src/main/java/io/v/nutz/base/event/common/SysCommonDataChange.java @@ -1,6 +1,4 @@ -package io.v.nutz.base.event.user; - -import io.v.nutz.base.event.user.SysCommonDataChangeType; +package io.v.nutz.base.event.common; public interface SysCommonDataChange { diff --git a/src/main/java/io/v/nutz/base/event/user/SysCommonDataChangeCenter.java b/src/main/java/io/v/nutz/base/event/common/SysCommonDataChangeCenter.java similarity index 83% rename from src/main/java/io/v/nutz/base/event/user/SysCommonDataChangeCenter.java rename to src/main/java/io/v/nutz/base/event/common/SysCommonDataChangeCenter.java index 3e9ad2c..7ed2598 100644 --- a/src/main/java/io/v/nutz/base/event/user/SysCommonDataChangeCenter.java +++ b/src/main/java/io/v/nutz/base/event/common/SysCommonDataChangeCenter.java @@ -1,7 +1,5 @@ -package io.v.nutz.base.event.user; +package io.v.nutz.base.event.common; -import io.v.nutz.base.event.user.SysCommonDataChange; -import io.v.nutz.base.event.user.SysCommonDataChangeType; import org.nutz.mvc.Mvcs; /** diff --git a/src/main/java/io/v/nutz/base/event/user/SysCommonDataChangeType.java b/src/main/java/io/v/nutz/base/event/common/SysCommonDataChangeType.java similarity index 75% rename from src/main/java/io/v/nutz/base/event/user/SysCommonDataChangeType.java rename to src/main/java/io/v/nutz/base/event/common/SysCommonDataChangeType.java index 48f9881..103d00a 100644 --- a/src/main/java/io/v/nutz/base/event/user/SysCommonDataChangeType.java +++ b/src/main/java/io/v/nutz/base/event/common/SysCommonDataChangeType.java @@ -1,4 +1,4 @@ -package io.v.nutz.base.event.user; +package io.v.nutz.base.event.common; /** * 数据变更类型 diff --git a/src/main/java/io/v/nutz/base/event/user/UserChangePublisher.java b/src/main/java/io/v/nutz/base/event/user/UserChangePublisher.java index 2479b49..08b38e2 100644 --- a/src/main/java/io/v/nutz/base/event/user/UserChangePublisher.java +++ b/src/main/java/io/v/nutz/base/event/user/UserChangePublisher.java @@ -1,6 +1,7 @@ package io.v.nutz.base.event.user; -import org.nutz.mvc.Mvcs; +import io.v.nutz.base.utils.AppIocUtil; +import org.nutz.ioc.Ioc; /** * @version 1.0 @@ -13,9 +14,11 @@ public class UserChangePublisher { // 发送消息给所有订阅者 public static void broadcast(UserChangeMsg msg) { - String[] names = Mvcs.getIoc().getNamesByType(UserChangeEventListener.class); + Ioc ioc = AppIocUtil.get(); + + String[] names = ioc.getNamesByType(UserChangeEventListener.class); for (String listener : names) { - UserChangeEventListener listenerBean = Mvcs.getIoc().get(UserChangeEventListener.class, listener); + UserChangeEventListener listenerBean = ioc.get(UserChangeEventListener.class, listener); listenerBean.receive(msg); } } diff --git a/src/main/java/io/v/nutz/base/utils/AppIocUtil.java b/src/main/java/io/v/nutz/base/utils/AppIocUtil.java new file mode 100644 index 0000000..539c61c --- /dev/null +++ b/src/main/java/io/v/nutz/base/utils/AppIocUtil.java @@ -0,0 +1,27 @@ +package io.v.nutz.base.utils; + +import org.nutz.ioc.Ioc; + +/** + * @version 1.0 + * @Author zzr + * @name：AppIocUtil + * @Date 2025/8/26 17:40 + * @注释 + */ +public class AppIocUtil { + + private static Ioc ioc; + + public static void setIoc(Ioc ioc) { + AppIocUtil.ioc = ioc; + } + + public static Ioc get() { + if (ioc == null) { + throw new IllegalStateException("Ioc not initialized yet!"); + } + return ioc; + } + +} diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnionMangeCon.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnionMangeCon.java index a367594..728808c 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnionMangeCon.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnionMangeCon.java @@ -6,8 +6,8 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.event.user.SysCommonDataChangeCenter; -import io.v.nutz.base.event.user.SysCommonDataChangeType; +import io.v.nutz.base.event.common.SysCommonDataChangeCenter; +import io.v.nutz.base.event.common.SysCommonDataChangeType; import io.v.nutz.base.event.user.UserChangeMsg; import io.v.nutz.base.event.user.UserChangePublisher; import io.v.nutz.base.page.Pagination; diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnitMangeController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnitMangeController.java index c29d5d5..9114470 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnitMangeController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnitMangeController.java @@ -2,8 +2,8 @@ package io.v.nutz.sys.controllers.platform.sys; import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; -import io.v.nutz.base.event.user.SysCommonDataChangeCenter; -import io.v.nutz.base.event.user.SysCommonDataChangeType; +import io.v.nutz.base.event.common.SysCommonDataChangeCenter; +import io.v.nutz.base.event.common.SysCommonDataChangeType; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; diff --git a/src/main/java/io/v/nutz/zhgh/activity/listener/ActivityUserChangeListener.java b/src/main/java/io/v/nutz/zhgh/activity/listener/ActivityUserChangeListener.java deleted file mode 100644 index 3a194e6..0000000 --- a/src/main/java/io/v/nutz/zhgh/activity/listener/ActivityUserChangeListener.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.v.nutz.zhgh.activity.listener; - -import io.v.nutz.base.event.user.UserChangeEventListener; -import io.v.nutz.base.event.user.UserChangeMsg; -import org.nutz.ioc.loader.annotation.IocBean; - -/** - * @version 1.0 - * @Author zzr - * @name：ActivityCommonListener - * @Date 2025/8/13 14:41 - * @注释 活动的广播监听 - */ -@IocBean -public class ActivityUserChangeListener implements UserChangeEventListener { - - @Override - public void receive(UserChangeMsg message) { - System.out.println("=======================================================接收到消息======================================================="); - System.out.println(message); - } -} diff --git a/src/main/java/io/v/nutz/zhgh/activity/listener/SysActivityUnionListener.java b/src/main/java/io/v/nutz/zhgh/activity/listener/SysActivityUnionListener.java index 3417f02..7724a1a 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/listener/SysActivityUnionListener.java +++ b/src/main/java/io/v/nutz/zhgh/activity/listener/SysActivityUnionListener.java @@ -1,9 +1,8 @@ package io.v.nutz.zhgh.activity.listener; import cn.hutool.core.bean.BeanUtil; -import io.v.nutz.base.event.user.SysCommonDataChange; -import io.v.nutz.base.event.user.SysCommonDataChangeType; -import io.v.nutz.base.event.user.SysCommonDataChange; +import io.v.nutz.base.event.common.SysCommonDataChange; +import io.v.nutz.base.event.common.SysCommonDataChangeType; import io.v.nutz.sys.models.Sys_union; import io.v.nutz.zhgh.activity.models.ActivityBasicUnion; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/activity/listener/SysActivityUnitListener.java b/src/main/java/io/v/nutz/zhgh/activity/listener/SysActivityUnitListener.java index 23b65c7..ebd43f9 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/listener/SysActivityUnitListener.java +++ b/src/main/java/io/v/nutz/zhgh/activity/listener/SysActivityUnitListener.java @@ -1,8 +1,8 @@ package io.v.nutz.zhgh.activity.listener; import cn.hutool.core.bean.BeanUtil; -import io.v.nutz.base.event.user.SysCommonDataChange; -import io.v.nutz.base.event.user.SysCommonDataChangeType; +import io.v.nutz.base.event.common.SysCommonDataChange; +import io.v.nutz.base.event.common.SysCommonDataChangeType; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.zhgh.activity.models.ActivityBasicUnit; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/proposal/listener/ProposalUnderTakeListener.java b/src/main/java/io/v/nutz/zhgh/proposal/listener/ProposalUnderTakeListener.java index d27c67e..9ed384e 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/listener/ProposalUnderTakeListener.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/listener/ProposalUnderTakeListener.java @@ -1,8 +1,8 @@ package io.v.nutz.zhgh.proposal.listener; import cn.hutool.core.bean.BeanUtil; -import io.v.nutz.base.event.user.SysCommonDataChange; -import io.v.nutz.base.event.user.SysCommonDataChangeType; +import io.v.nutz.base.event.common.SysCommonDataChange; +import io.v.nutz.base.event.common.SysCommonDataChangeType; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.zhgh.proposal.models.ProposalUndertake; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/evaluate/WelfareEvaluateActivityController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/evaluate/WelfareEvaluateActivityController.java index b41ed8b..f81009a 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/evaluate/WelfareEvaluateActivityController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/evaluate/WelfareEvaluateActivityController.java @@ -244,7 +244,7 @@ public class WelfareEvaluateActivityController { System.out.println(loginNames); - String link = Globals.AppDomain + "/platform/h5/welfare/evaluate?activityId=%s&type=welfare".formatted(activityId); + String link = Globals.AppDomain + "/platform/h5/welfare/evaluate?id=%s&type=welfare".formatted(activityId); msgApi.sendMsg(List.of("DingTalk"), loginNames, 2, title, sendMsgValue, "", link); return Result.success(); } catch (Exception e) { diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/evaluate/WelfareEvaluateStatisticsController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/evaluate/WelfareEvaluateStatisticsController.java index b436645..44e483a 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/evaluate/WelfareEvaluateStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/evaluate/WelfareEvaluateStatisticsController.java @@ -33,6 +33,7 @@ import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -68,7 +69,13 @@ public class WelfareEvaluateStatisticsController { @At @ViReturn @RequiresPermissions("welfare.evaluate.statistics") - public Object pageData(PageForm pageForm, String projectId, String unionId, String unitId, String personType, String userState, String optionId) { + public Object pageData(PageForm pageForm, + @Param(value = "projectId", required = false) String projectId, + @Param(value = "unionId", required = false) String unionId, + @Param(value = "unitId", required = false) String unitId, + @Param(value = "personType", required = false) String personType, + @Param(value = "userState", required = false) String userState, + @Param(value = "optionId", required = false) String optionId) { WelfareEvaluateActivity evaluate = dao.fetch(WelfareEvaluateActivity.class, Cnd.where("welfareId", "=", projectId)); if (Lang.isEmpty(evaluate)) { return Result.error("未找到相应福利"); @@ -201,8 +208,13 @@ public class WelfareEvaluateStatisticsController { @At @Ok("void") @RequiresPermissions("welfare.evaluate.statistics") - public void exportXlsx(PageForm pageForm, String projectId, String unionId, String unitId, - String personType, String userState, String optionId, + public void exportXlsx(PageForm pageForm, + @Param(value = "projectId", required = false) String projectId, + @Param(value = "unionId", required = false) String unionId, + @Param(value = "unitId", required = false) String unitId, + @Param(value = "personType", required = false) String personType, + @Param(value = "userState", required = false) String userState, + @Param(value = "optionId", required = false) String optionId, HttpServletResponse response) { try { WelfareEvaluateActivity evaluate = dao.fetch(WelfareEvaluateActivity.class, Cnd.where("welfareId", "=", projectId)); diff --git a/src/main/resources/views/platform/sourcechange/manage/index.html b/src/main/resources/views/platform/sourcechange/manage/index.html index 44a76d1..55add46 100644 --- a/src/main/resources/views/platform/sourcechange/manage/index.html +++ b/src/main/resources/views/platform/sourcechange/manage/index.html @@ -83,7 +83,7 @@ layout("/layouts/platform.html"){ - +