1

pom.xml

@@ -64,10 +64,10 @@
         <jdom>1.1</jdom>
         <spring.websocket>5.0.4.RELEASE</spring.websocket>
         <spring.messaging>5.3.27</spring.messaging>
-        <rock.star.frame>0.6.5.6</rock.star.frame>
-        <rock.star.system>0.2.9.6.1</rock.star.system>
+        <rock.star.frame>0.6.3</rock.star.frame>
+        <rock.star.system>0.2.8.7</rock.star.system>
         <rock.star.user>0.2.2</rock.star.user>
-        <rock.star.wx>0.2.5</rock.star.wx>
+        <rock.star.wx>0.2.3</rock.star.wx>
         <rock.star.ops>0.1.1</rock.star.ops>
         <rock.star.flow>0.1.4</rock.star.flow>
     </properties>
@@ -87,13 +87,13 @@
                 <groupId>com.rockstar.anticontrol</groupId>
                 <artifactId>rock-system</artifactId>
                 <version>${rock.star.system}</version>
-                <exclusions>
-                    <!--排除easyexcel依赖-->
-                    <exclusion>
-                        <groupId>com.alibaba</groupId>
-                        <artifactId>easyexcel</artifactId>
-                    </exclusion>
-                </exclusions>
+<!--                <exclusions>-->
+<!--                    &lt;!&ndash;排除easyexcel依赖&ndash;&gt;-->
+<!--                    <exclusion>-->
+<!--                        <groupId>com.alibaba</groupId>-->
+<!--                        <artifactId>easyexcel</artifactId>-->
+<!--                    </exclusion>-->
+<!--                </exclusions>-->
             </dependency>
 
             <dependency>

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

@@ -321,9 +321,23 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
         return waitUrl;
     }
 
+    public String getUrlByKey(String key) {
+        String waitUrl = "";
+        // 查询待办页面的 菜单id
+        FramePermissionExample framePermissionExample = new FramePermissionExample();
+        framePermissionExample.createCriteria().andUrlEqualTo(key);
+        List<FramePermission> framePermissions = framePermissionService.selectByExample(framePermissionExample);
+        if (CollectionUtils.isNotEmpty(framePermissions)) {
+            FramePermission child = framePermissions.get(0);
+            waitUrl = "/backstage?menuIndex=" + child.getPid() + "&subMenu=" + child.getId();
+        }
+        return waitUrl;
+    }
+
+
 
     /**
-     * 泛微刷新 待办
+     * 泛微推送已办
      *
      * @param flowMainPush
      * @param flowMain
@@ -363,9 +377,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);
         }
@@ -462,12 +476,11 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
                     String routeParam = "id=" + flowId + "&flowMainPushId=" + flowMainPush.getId() + "&applyUser=" + flowMain.getApplyUser();
                     addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
 
-                    // TODO: 2024/11/21   和泛OA对接 推送待办
                     FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
                     String username = encryptUsername(receiveUser.getUsername());
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.PAYMENT_NAME;
-                    String pcurl = serverUrl + "?loginid=" + username;
+                    String pcurl = serverUrl + "?loginid=" + username + "&" + routeParam;
                     String appurl = pcurl;
                     String isremark = "0";
                     String viewtype = "0";
@@ -531,17 +544,15 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
                 String routeParam = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
                 addHandle(title, typeEnum, srcUserType, srcUserId, srcUserName, receiveUserId, routeParam);
 
-                // TODO: 2024/11/21 和泛微对接 推送信息
                 FrameUser receiveUser = frameUserService.selectByPrimaryKey(receiveUserId);
                 String username = encryptUsername(receiveUser.getUsername());
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.PAYMENT_NAME;
                 String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "?loginid=" + username;
+                String pcurl = serverUrl + "?loginid=" + username + "&" + routeParam;
                 String appurl = pcurl;
                 String isremark = "0";
                 String viewtype = "0";
-                // TODO: 2024/11/15 创建者和接收者需求oa协商
                 String creator = ShiroUtils.getUser().getPhone();
                 String receiver = receiveUser.getPhone();
                 String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date());

pro-wx/src/main/java/com/idea/pro/wx/web/WxPubController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.AES;
 import com.google.code.kaptcha.Constants;
+import com.idea.workPanel.service.ParkWaitHandleService;
 import com.rockstar.common.log.Log;
 import com.rockstar.frame.controller.HomeController;
 import com.rockstar.shiro.authc.EasyTypeToken;
@@ -12,6 +13,7 @@ import com.rockstar.util.Constant;
 import com.rockstar.util.StringUtils;
 import io.swagger.annotations.Api;
 import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,6 +34,8 @@ public class WxPubController extends HomeController {
 
     @Value("${ssoKey}")
     private String ssoKey;
+    @Autowired
+    private ParkWaitHandleService parkWaitHandleService;
 
     @Log(title = "免密登录")
     @PostMapping("/loginSecret")
@@ -47,7 +51,8 @@ public class WxPubController extends HomeController {
             Map<String, Object> view = loginView(username, null,code,null,false,request, false, EasyTypeToken.LoginType.NOPASSWD);
             view.put(Constant.VIEW_KEY_USER_TYPE, Constant.USER_TYPE_MANAGER);
             view.put(Constant.VIEW_KEY_TOKEN, "admin-token");
-            view.put("url","menuIndex=1296067156231847936&subMenu=1296067784098185216");
+            String urImyProcess = parkWaitHandleService.getUrlByKey("URImyProcess");
+            view.put("url",urImyProcess);
             SecurityUtils.getSubject().getSession().setTimeout(3600000L);
             return view;
         } catch (Exception e) {