From 3faaf53fb3817d990dc3c06d5a0bf63a64712b44 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Thu, 19 Jun 2025 14:10:07 +0800 Subject: [PATCH] ht message --- .../MessageSubscriptionController.java | 74 ++----------------- .../cussso/service/CusSSOServiceImpl.java | 1 + 2 files changed, 9 insertions(+), 66 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java index 289163a..89cda8c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java @@ -1,27 +1,12 @@ package com.weaver.seconddev.interfaces.workflow.controller; -import com.alibaba.fastjson.JSONObject; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.common.distribution.lock.DistributionLockInterface; import com.weaver.common.i18n.tool.util.I18nContextUtil; -import com.weaver.custom.configcenter.htsysjcmtConfig; import com.weaver.ecode.api.rpc.EcodeService; -import com.weaver.emonitor.util.Util; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.framework.rpc.context.impl.TenantRpcContext; -import com.weaver.openapi.pojo.ApiResult; -import com.weaver.openapi.pojo.auth.params.AccessTokenParam; -import com.weaver.openapi.pojo.auth.params.CodeParam; -import com.weaver.openapi.pojo.auth.res.AccessToken; -import com.weaver.openapi.pojo.auth.res.Code; -import com.weaver.openapi.pojo.message.params.MessageVo; -import com.weaver.openapi.pojo.message.params.vo.MessageEntity; -import com.weaver.openapi.pojo.message.params.vo.MessageReciver; -import com.weaver.openapi.pojo.message.params.vo.MessageSender; -import com.weaver.openapi.service.AuthService; -import com.weaver.openapi.service.MessageService; import com.weaver.seconddev.interfaces.prop.ConfigProp; -import com.weaver.verupgrade.conn.RecordSet; import com.weaver.verupgrade.hrm.resource.ResourceComInfo; import com.weaver.workflow.list.api.rest.publicapi.WflRequestListRest; import lombok.extern.slf4j.Slf4j; @@ -30,7 +15,6 @@ import org.apache.axis.client.Service; import org.apache.commons.lang.StringUtils; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import javax.xml.namespace.QName; @@ -39,7 +23,6 @@ import javax.xml.rpc.ServiceException; import javax.xml.rpc.encoding.XMLType; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLEncoder; import java.rmi.RemoteException; import java.text.SimpleDateFormat; import java.util.*; @@ -47,14 +30,7 @@ import java.util.*; @Slf4j @RestController @RequestMapping({"/papi/secondev/message"}) -//@WeaPermission public class MessageSubscriptionController { - - // api 需要用户会话，e10入口地址访问 - // papi 任何人都可以直接访问 public api，e10入口地址访问 - // sapi 服务内部通信的接口路由前缀 /sapi/secondev，e10入口地址访问不了 - // 二开服务新接口：/api/secondev，/papi/secondev - @RpcReference(timeout = 10000) EcodeService ecodeService; @RpcReference(timeout = 2000, group = "workflow") @@ -68,24 +44,16 @@ public class MessageSubscriptionController { public WeaResult subscription(@RequestParam Map param, @RequestBody Map params ) throws ServiceException, RemoteException, MalformedURLException { logger.error("MessageSubscriptionController Start " ); String jtzhkey = "t6kj9c07jr"; -// String jtzhadmin = configProp.getJtzhadmin(); -// log.error("jtzhkey:"+jtzhkey+" jtzhadmin:"+itzhadmin); - TenantRpcContext.setTargetTenantKey(jtzhkey); -// TenantRpcContext.setTargetEmployeeId(jtzhadmin); Map map = new HashMap<>(); - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - - logger.error("params == " + params); sendMsg(params); - logger.error("subscription 推送成功"); map.put("msg","推送成功"); return WeaResult.success(map.toString()); } private void sendMsg(Map params) throws RemoteException, ServiceException, MalformedURLException { -// logger.error("sendMsg params " + params); + logger.error("sendMsg params " + params); String systemId = "SYS006"; String password = "123456"; String moudule = "流程待办"; @@ -93,36 +61,27 @@ public class MessageSubscriptionController { String content = String.valueOf(params.get("content")); String url = String.valueOf(params.get("pcUrl")); String mobileurl = String.valueOf(params.get("h5Url")); -// String pcurl = configProp.getPc_url()+ URLEncoder.encode(url); -// String msgurl = configProp.getPc_url()+ URLEncoder.encode(mobileurl); String pcurl = configProp.getHtportaloaUrl_pc_url()+new URL(url).getPath(); String msgurl = configProp.getHtportaloaUrl_pc_url()+new URL(mobileurl).getPath(); logger.error(" url: " + url); logger.error(" pcurl: " + pcurl); - String m_msgtitle = String.valueOf(params.get("title")); String sendid = String.valueOf(params.get("senderId")); - String receivers = String.valueOf(params.get("receivers")) ; - -// logger.error(" receivers: " + receivers); -// logger.error(" moudule: " + moudule); -// logger.error(" pcurl: " + pcurl); -// logger.error(" msgurl: " + msgurl); -// logger.error(" m_msgtitle: " + m_msgtitle); -// logger.error(" moudule: " + moudule); -// logger.error(" sendid: " + sendid); - - String sendname = "系统管理员"; String userid = "1"; ResourceComInfo rc = I18nContextUtil.getBean(ResourceComInfo.class); if (sendid != "1") { - sendname = rc.getLastname(sendid + ""); - userid = rc.getWorkcode(sendid + ""); + if(sendid.length()<18){ + sendname = "系统提示"; + userid = "-"; + }else{ + sendname = rc.getLastname(sendid + ""); + userid = rc.getWorkcode(sendid + ""); + } } String pre = ""; String msgtt = m_msgtitle; @@ -145,35 +104,22 @@ public class MessageSubscriptionController { msgtt = refurl + "：" + msgtt; } } -// logger.error(" content: " + content); -// logger.error(" msgtt: " + msgtt); - refurl = msgurl; SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String msgtime = df.format(new Date()); String target = "2"; String extdata = ""; -// Set useridset = msg.getRecivers(); - - - - // 去除字符串两端的方括号 String trimmed = receivers.substring(1, receivers.length() - 1); - // 使用逗号和空格作为分隔符将字符串拆分成多个子字符串 String[] strArray = trimmed.split(", "); -// List useridset = Collections.singletonList(String.valueOf(params.get("receivers"))); List list = new ArrayList<>(); - // 遍历数组，将每个元素添加到 ArrayList 中 for (String num : strArray) { if(StringUtils.isNotEmpty(num)){ list.add(num); } } - - Object[] arr = list.toArray(); for (int i = 0; i < arr.length; i += 100) { StringBuilder sb = new StringBuilder(); @@ -182,7 +128,6 @@ public class MessageSubscriptionController { } String user = sb.toString().substring(0, sb.length() - 1); -// logger.error(" user: " + user); String msgid = "MsgSYS006" + userid + (new Date()).getTime(); messages = messages + ""; messages = messages + "" + msgid + "" + pre + "" + user + "" + msgtt + "" + msgtt + "" + sendname + "" + refurl + "" + msgtime + "" + target + "" + extdata + ""; @@ -224,8 +169,6 @@ public class MessageSubscriptionController { headers.put("Authorization", configProp.getUrl_password()); logger.error(" Url_password(): " + configProp.getUrl_password()); - logger.error(" systemId: " + systemId); - logger.error(" password: " + password); logger.error(" moudule: " + moudule); logger.error(" messages: " + messages); @@ -233,7 +176,6 @@ public class MessageSubscriptionController { String obj = (String) call.invoke(val); logger.error(" obj: " + String.valueOf(obj)); - logger.error(String.valueOf("----onMessage--<\n")); } } diff --git a/secondev6-jshts/src/main/java/com/weaver/seconddev/cussso/service/CusSSOServiceImpl.java b/secondev6-jshts/src/main/java/com/weaver/seconddev/cussso/service/CusSSOServiceImpl.java index 229ffe3..331812b 100644 --- a/secondev6-jshts/src/main/java/com/weaver/seconddev/cussso/service/CusSSOServiceImpl.java +++ b/secondev6-jshts/src/main/java/com/weaver/seconddev/cussso/service/CusSSOServiceImpl.java @@ -10,6 +10,7 @@ import com.weaver.common.hrm.domain.organization.HrmConditionResultType; import com.weaver.common.hrm.domain.organization.HrmOrgEmpCondition; import com.weaver.common.hrm.entity.employee.HrmEmployee; import com.weaver.common.hrm.remote.HrmRemoteEmployeeService; +import com.weaver.common.hrm.util.HrmContextUtil; import com.weaver.ebuilder.datasource.api.enums.SourceType; import com.weaver.ebuilder.datasource.api.service.DataSetService; import com.weaver.framework.rpc.annotation.RpcReference;