From dbcbd92be9eaaf0d32f8eb8bb17778dc778dab6e Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Thu, 5 Mar 2026 16:19:34 +0800 Subject: [PATCH] commit --- .../com/budwk/app/base/sms/SmsService.java | 4 ++-- .../sms/impl/jshvc/SmsJshvcServiceImpl.java | 18 ++++++++++-------- .../ProcessTaskStartEventListener.java | 7 ++++++- .../todo/service/impl/TodoServiceImpl.java | 19 +++++++++++++++++++ .../WechatEnterpriseMessageSendStrategy.java | 4 ++-- .../staffbenefit/condolence/mine/index.html | 2 +- 6 files changed, 40 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/budwk/app/base/sms/SmsService.java b/src/main/java/com/budwk/app/base/sms/SmsService.java index df7cd4d..506ba4e 100644 --- a/src/main/java/com/budwk/app/base/sms/SmsService.java +++ b/src/main/java/com/budwk/app/base/sms/SmsService.java @@ -26,7 +26,7 @@ public interface SmsService { * @param content 内容 * @param link 链接 */ - void send(String loginName, String title, String content, String link); + void send(String loginName, String title, String content, String url, String mobileUrl); /** * 群发 多人接收内容相同时使用该方法 @@ -35,5 +35,5 @@ public interface SmsService { * @param content 内容 * @param link 链接 */ - void massSend(List loginNames, String title, String content, String link); + void massSend(List loginNames, String title, String content, String url, String mobileUrl); } diff --git a/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java b/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java index 2776fd7..dab8230 100644 --- a/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java +++ b/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java @@ -44,21 +44,21 @@ public class SmsJshvcServiceImpl implements SmsService { @Override public void send(String loginName, String title, String content) { - send(loginName, "智慧工会", content, null); + send(loginName, "智慧工会", content, null, null); } @Override - public void send(String loginName, String title, String content, String link) { + public void send(String loginName, String title, String content, String url, String mobileUrl) { Map paramMap = Map.of("userId", loginName); - doSend(title, content, List.of(paramMap), link); + doSend(title, content, List.of(paramMap), url, mobileUrl); } @Override - public void massSend(List loginNames, String title, String content, String link) { + public void massSend(List loginNames, String title, String content, String url, String mobileUrl) { List> receivers = loginNames.stream() .map(name -> Map.of("userId", name)) .toList(); - doSend(title, content, receivers, link); + doSend(title, content, receivers, url, mobileUrl); } /** @@ -73,7 +73,7 @@ public class SmsJshvcServiceImpl implements SmsService { * @param content * @param receivers */ - private void doSend(String title, String content, List> receivers, String link) { + private void doSend(String title, String content, List> receivers, String pcUrl, String mobileUrl) { if (Lang.isEmpty(receivers)) { log.error("send fail by receivers is null"); @@ -94,13 +94,15 @@ public class SmsJshvcServiceImpl implements SmsService { paramsMap.put("content", content); paramsMap.put("sendType", "5"); paramsMap.put("receivers", receivers); - if (StrUtil.isBlank(link)) { + if (StrUtil.isBlank(pcUrl) && StrUtil.isBlank(mobileUrl)) { paramsMap.put("wxSendType", "text"); } else { paramsMap.put("wxSendType", "textcard"); - paramsMap.put("mobileUrl", link); + paramsMap.put("pcUrl", pcUrl); + paramsMap.put("mobileUrl", mobileUrl); // 这是图文卡片，后面用到再对接吧 // paramsMap.put("qyWeChatImgUrl", ""); + paramsMap.put("urlDesc", "查看详情"); } log.debug("send params: {}", Json.toJson(paramsMap)); diff --git a/src/main/java/com/budwk/app/flow/listenter/ProcessTaskStartEventListener.java b/src/main/java/com/budwk/app/flow/listenter/ProcessTaskStartEventListener.java index 0b0507d..68ac77e 100644 --- a/src/main/java/com/budwk/app/flow/listenter/ProcessTaskStartEventListener.java +++ b/src/main/java/com/budwk/app/flow/listenter/ProcessTaskStartEventListener.java @@ -1,6 +1,7 @@ package com.budwk.app.flow.listenter; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.engine.event.ProcessEvent; import com.budwk.app.flow.engine.event.ProcessEventListener; @@ -10,6 +11,7 @@ import com.budwk.app.flow.entity.ProcessTaskActor; import com.budwk.app.flow.enums.ProcessEventTypeEnum; import com.budwk.app.todo.service.TodoService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.web.commons.base.Globals; import com.budwk.app.zhgh.dayofficework.message.service.GlobalMessageSendService; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; @@ -67,7 +69,10 @@ public class ProcessTaskStartEventListener implements ProcessEventListener { if (!List.of("superadmin" ,"CS2025015", "20182040").contains(SecurityUtil.getUserLoginname())) { break; } - globalMessageSendService.sendMessage(taskDisplayName, message, 2, List.of(taskActor.getActorId()), null); + JSONObject config = new JSONObject(); + config.set("pcUrl", Globals.AppDomain + task.getFormKey()); + config.set("mobileUrl", Globals.AppDomain + task.getH5FormKey()); + globalMessageSendService.sendMessage(taskDisplayName, message, 2, List.of(taskActor.getActorId()), config); } todoService.saveTask(task); diff --git a/src/main/java/com/budwk/app/todo/service/impl/TodoServiceImpl.java b/src/main/java/com/budwk/app/todo/service/impl/TodoServiceImpl.java index 33eda2b..10249a6 100644 --- a/src/main/java/com/budwk/app/todo/service/impl/TodoServiceImpl.java +++ b/src/main/java/com/budwk/app/todo/service/impl/TodoServiceImpl.java @@ -14,6 +14,10 @@ import com.budwk.app.todo.service.TodoService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.commons.base.Globals; import com.wisedu.casp.sdk.api.BaseResponse; +import com.wisedu.casp.sdk.api.mc.ChannelInfo; +import com.wisedu.casp.sdk.api.mc.GetEnableChannelByTypeRequest; +import com.wisedu.casp.sdk.api.mc.GetEnableChannelByTypeResponse; +import com.wisedu.casp.sdk.api.mc.constants.ChannelType_Constants; import com.wisedu.casp.sdk.api.tdc.constants.*; import com.wisedu.casp.sdk.api.tdc.model.*; import com.wisedu.casp.sdk.api.tdc.pushtask.ProcessInstanceRealDeleteRequest; @@ -29,6 +33,7 @@ import org.nutz.integration.jedis.RedisService; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import java.util.Arrays; @@ -105,6 +110,20 @@ public class TodoServiceImpl implements TodoService { insertModel.setApplicationModel(applicationModel); request.setInsertModel(Collections.singletonList(insertModel)); + /*Client channelClient = new DefaultClient(TodoPlatformConfig.TODO_PLATFORM_BASE_URL, TodoPlatformConfig.TODO_APP_ID, TodoPlatformConfig.TODO_APP_SECRET); + GetEnableChannelByTypeRequest channelByTypeRequest = new GetEnableChannelByTypeRequest(); + channelByTypeRequest.setChannelType(ChannelType_Constants.QYWECHAT); + GetEnableChannelByTypeResponse channelByTypeResponse = channelClient.execute(channelByTypeRequest); + log.info("获取待办消息渠道，接口响应数据：{}", Json.toJson(channelByTypeResponse)); + if (channelByTypeResponse.isSuccess()) { + List list = channelByTypeResponse.getData(); + if(Lang.isNotEmpty(list)) { + request.setIsSendMsg(1); + request.setSendChannels("1184803022838996992"); + request.setWxSendType("textcard"); + } + }*/ + log.info("新增待办任务，请求参数：{}", Json.toJson(request)); BaseResponse response = client.execute(request); log.info("新增待办任务，接口响应数据：{}", Json.toJson(response)); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatEnterpriseMessageSendStrategy.java b/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatEnterpriseMessageSendStrategy.java index e591409..3fe8977 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatEnterpriseMessageSendStrategy.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/WechatEnterpriseMessageSendStrategy.java @@ -42,7 +42,7 @@ public class WechatEnterpriseMessageSendStrategy implements GlobalMessageSendStr @Override public boolean isEnabled() { - return GlobalMessageSendStrategy.super.isEnabled(); + return true; } @Override @@ -82,6 +82,6 @@ public class WechatEnterpriseMessageSendStrategy implements GlobalMessageSendStr return; } List list = users.stream().map(Sys_user::getLoginname).toList(); - smsService.massSend(list, title, content, ""); + smsService.massSend(list, title, content, config.getStr("pcUrl"), config.getStr("mobileUrl")); } } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html index 662aea6..b57e1cf 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html @@ -62,7 +62,7 @@ layout("/layouts/platform.html"){ 查看 编辑 撤回 - + 删除