From dff2874902a8928a2cc96d07f8f9a2cc1d943261 Mon Sep 17 00:00:00 2001
From: qijirenjian <qijirenjian@163.com>
Date: Mon, 3 Mar 2025 18:34:33 +0800
Subject: [PATCH] PMPro

---
 .../seconddev/interfaces/pmoa/PMService.java  |  8 ++++++++
 .../MessageSubscriptionController.java        | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java
index 2e9e860..9780778 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java
@@ -26,6 +26,7 @@ public class PMService extends BaseBean {
     private static final org.slf4j.Logger logger_8a709bef = LoggerFactory.getLogger(PMService.class);
 
     public String call(String json) {
+        logger_8a709bef.error("PMService  call start " );
         HttpPost post = null;
         String result = "E";
         try {
@@ -36,12 +37,19 @@ public class PMService extends BaseBean {
             String url = configProp.getProjectConclusion();
             String account = configProp.getAccount();
             String password = configProp.getPassword();
+            logger_8a709bef.error("url = "+ url );
+            logger_8a709bef.error("account = "+ account );
+            logger_8a709bef.error("password = "+ password );
+
+            logger_8a709bef.error("json = "+ json );
             post = new HttpPost(url);
             post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8");
             post.setHeader("Accept", "application/json; charset=UTF-8");
             post.setHeader("Authorization", "basic " + Base64.getEncoder().encodeToString((account + ":" + password).getBytes()));
             StringEntity entity = new StringEntity(json, "UTF-8");
             post.setEntity(entity);
+
+
             HttpResponse response = httpClient.execute(post);
             int rspCode = response.getStatusLine().getStatusCode();
             logger_8a709bef.error(String.valueOf("调用PM系统接口返回状态码：" + rspCode));
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 63b8b63..f0436b3 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
@@ -6,6 +6,7 @@ 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;
@@ -142,10 +143,22 @@ public class MessageSubscriptionController {
         String target = "2";
         String extdata = "";
 //            Set<String> useridset = msg.getRecivers();
-        List<String> useridset = Collections.singletonList(String.valueOf(params.get("receivers")));
+        String receivers = (String) params.get("receivers") ;
+        logger.error("             receivers:  " + receivers);
+        // 去除字符串两端的方括号
+        String trimmed = receivers.substring(1, receivers.length() - 1);
+        // 使用逗号和空格作为分隔符将字符串拆分成多个子字符串
+        String[] strArray = trimmed.split(", ");
+//        List<String> useridset = Collections.singletonList(String.valueOf(params.get("receivers")));
+        List<String> list = new ArrayList<>();
+        // 遍历数组，将每个元素添加到 ArrayList 中
+        for (String num : strArray) {
+            list.add(num);
+        }
+        logger.error("  useridset:  " + list);
+
 
-        logger.error("             useridset:  " + useridset);
-        Object[] arr = useridset.toArray();
+        Object[] arr = list.toArray();
         for (int i = 0; i < arr.length; i += 100) {
             StringBuilder sb = new StringBuilder();
             for (int j = i; j < i + 100 && j < arr.length; ++j) {