泛微接口调整

pro-base/src/main/java/com/idea/util/OAUtil.java

@@ -17,7 +17,9 @@ import java.util.Map;
 
 public class OAUtil {
 
-    public static final String prefix = "http://112.25.69.137:8088";
+    public static final String prefix = "http://112.25.69.225:8088";
+
+    public static final String syscode = "BZF";
 
 //    public static final Map<String, String> headers = new HashMap<String, String>() {{
 //        put("accept","*/*");
@@ -57,15 +59,15 @@ public class OAUtil {
         String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
         Map json = new HashMap<String, Object>();
         json.put("syscode", "AJ");
-        json.put("flowid", "vNLLiH6iPLi1iVlWKUp");
-        json.put("requestname", "豆浆的付款申请单");
+        json.put("flowid", "8bd0e7e5-d313-11ef-88a0-00ffc9efaf05");
+        json.put("requestname", "测试手机号发起3");
         json.put("workflowname", "付款申请");
-        json.put("nodeName", "财务负责人");
-        json.put("pcurl", "");
-        json.put("appurl", "");
-        json.put("creator", "ceshi");
+        json.put("nodename", "节点名称1");
+        json.put("pcurl", "http://www.baidu.com");
+        json.put("appurl", "http://mobile.baidu.com");
+        json.put("creator", "17315039095");
         json.put("createdatetime", date);
-        json.put("receiver", "ceshi");
+        json.put("receiver", "17315039095");
         json.put("receivedatetime", date);
         json.put("isremark", "0");
         json.put("viewtype", "0");

pro-base/src/main/java/com/idea/workPanel/service/ParkWaitHandleService.java

@@ -334,26 +334,24 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
             String receiveUserId = flowMainPush.getPushUser();
             FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
             String username = encryptUsername(receiveUser.getUsername());
-            String syscode = "AJ";
             String requestname = flowMain.getApplyTheme();
             String workflowname = ConstantFlowType.PAYMENT_NAME;
             String nodeName = flowMainPush.getNodeName();
             String pcurl = serverUrl + "&loginid=" + username;
-            String appurl = "";
+            String appurl = pcurl;
             String isremark = "2";
             String viewtype = "0";
-            // TODO: 2024/11/15 创建者和接收者需求oa协商
-            String creator = "ceshi";
-            String receiver = "ceshi";
+            String creator = ShiroUtils.getUser().getPhone();
+            String receiver = receiveUser.getPhone();
             String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
             String receivets = System.currentTimeMillis() + "";
 
             Map map = new HashMap<String, Object>();
-            map.put("syscode", syscode);
+            map.put("syscode", OAUtil.syscode);
             map.put("flowid", flowId);
             map.put("requestname", requestname);
             map.put("workflowname", workflowname);
-            map.put("nodeName", nodeName);
+            map.put("nodename", nodeName);
             map.put("pcurl", pcurl);
             map.put("appurl", appurl);
             map.put("creator", creator);
@@ -375,7 +373,7 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
 
 
     /**
-     * 泛微刷新 待办
+     * 泛微推送已办
      * @param flowMainPushId
      * @param flowMain
      */
@@ -388,26 +386,24 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
             String receiveUserId = flowMainPush.getPushUser();
             FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
             String username = encryptUsername(receiveUser.getUsername());
-            String syscode = "AJ";
             String requestname = flowMain.getApplyTheme();
             String workflowname = ConstantFlowType.PAYMENT_NAME;
             String nodeName = flowMainPush.getNodeName();
             String pcurl = serverUrl + "&loginid=" + username;
-            String appurl = "";
+            String appurl = pcurl;
             String isremark = "2";
             String viewtype = "0";
-            // TODO: 2024/11/15 创建者和接收者需求oa协商
-            String creator = "ceshi";
-            String receiver = "ceshi";
+            String creator = ShiroUtils.getUser().getPhone();
+            String receiver = receiveUser.getPhone();
             String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
             String receivets = System.currentTimeMillis() + "";
 
             Map map = new HashMap<String, Object>();
-            map.put("syscode", syscode);
+            map.put("syscode", OAUtil.syscode);
             map.put("flowid", flowId);
             map.put("requestname", requestname);
             map.put("workflowname", workflowname);
-            map.put("nodeName", nodeName);
+            map.put("nodename", nodeName);
             map.put("pcurl", pcurl);
             map.put("appurl", appurl);
             map.put("creator", creator);
@@ -418,9 +414,9 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
             map.put("viewtype", viewtype);
             map.put("receivets", receivets);
 
-            log.info("泛微刷新待办详情:{}", JSON.toJSONString(map));
+            log.info("泛微推送已办详情:{}", JSON.toJSONString(map));
             String result = OAUtil.receiveRequestInfoByJson(map);
-            log.info("泛微刷新待办结果:{}", result);
+            log.info("泛微推送已办结果:{}", result);
         } catch (Exception e) {
             log.error("推送异常", e);
         }
@@ -466,24 +462,22 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
                     // TODO: 2024/11/21   和泛OA对接 推送待办
                     FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
                     String username = encryptUsername(receiveUser.getUsername());
-                    String syscode = "AJ";
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.PAYMENT_NAME;
                     String pcurl = serverUrl + "&loginid=" + username;
-                    String appurl = "";
+                    String appurl = pcurl;
                     String isremark = "0";
                     String viewtype = "0";
-                    // TODO: 2024/11/15 创建者和接收者需求oa协商
-                    String creator = "ceshi";
-                    String receiver = "ceshi";
+                    String creator = ShiroUtils.getUser().getPhone();
+                    String receiver = receiveUser.getPhone();
                     String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());
                     String receivets = System.currentTimeMillis() + "";
                     Map map = new HashMap<String, Object>();
-                    map.put("syscode", syscode);
+                    map.put("syscode", OAUtil.syscode);
                     map.put("flowid", flowId);
                     map.put("requestname", requestname);
                     map.put("workflowname", workflowname);
-                    map.put("nodeName", nodeName);
+                    map.put("nodename", nodeName);
                     map.put("pcurl", pcurl);
                     map.put("appurl", appurl);
                     map.put("creator", creator);
@@ -538,12 +532,11 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
                 // TODO: 2024/11/21 和泛微对接 推送信息
                 FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
                 String username = encryptUsername(receiveUser.getUsername());
-                String syscode = "AJ";
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.PAYMENT_NAME;
                 String nodeName = flowMainPush.getNodeName();
                 String pcurl = serverUrl + "&loginid=" + username;
-                String appurl = "";
+                String appurl = pcurl;
                 String isremark = "0";
                 String viewtype = "0";
                 // TODO: 2024/11/15 创建者和接收者需求oa协商
@@ -553,11 +546,11 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
                 String receivets = System.currentTimeMillis() + "";
 
                 Map map = new HashMap<String, Object>();
-                map.put("syscode", syscode);
+                map.put("syscode", OAUtil.syscode);
                 map.put("flowid", flowId);
                 map.put("requestname", requestname);
                 map.put("workflowname", workflowname);
-                map.put("nodeName", nodeName);
+                map.put("nodename", nodeName);
                 map.put("pcurl", pcurl);
                 map.put("appurl", appurl);
                 map.put("creator", creator);