Merge remote-tracking branch 'origin/master'

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.225:8088";
+    //    public static final String prefix = "http://112.25.69.225:8088";
+    public static final String prefix = "http://10.1.1.11:8088";
+
 
     public static final String syscode = "BZF";
 
@@ -28,12 +30,12 @@ public class OAUtil {
 //    }};
 
     public static final HttpHeaders headers = new HttpHeaders() {{
-        add("accept","*/*");
-        add("connection","Keep-Alive");
-        add("Content-Type","application/json");
+        add("accept", "*/*");
+        add("connection", "Keep-Alive");
+        add("Content-Type", "application/json");
     }};
 
-    public static String receiveRequestInfoByJson(Map<String,Object>  parma) {
+    public static String receiveRequestInfoByJson(Map<String, Object> parma) {
 
         String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
         String body = JSON.toJSONString(parma);
@@ -58,16 +60,16 @@ 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", "8bd0e7e5-d313-11ef-88a0-00ffc9efaf05");
-        json.put("requestname", "测试手机号发起3");
+        json.put("syscode", "BZF");
+        json.put("flowid", "248d7120-d320-11ef-9c17-0242ac110003");
+        json.put("requestname", "测试手机号发起");
         json.put("workflowname", "付款申请");
         json.put("nodename", "节点名称1");
         json.put("pcurl", "http://www.baidu.com");
         json.put("appurl", "http://mobile.baidu.com");
-        json.put("creator", "17315039095");
+        json.put("creator", "13000001111");
         json.put("createdatetime", date);
-        json.put("receiver", "17315039095");
+        json.put("receiver", "13000001111");
         json.put("receivedatetime", date);
         json.put("isremark", "0");
         json.put("viewtype", "0");

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

@@ -184,9 +184,9 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
         example.setOrderByClause("created_at desc");
         ParkWaitHandleExample.Criteria criteria = example.createCriteria();
         criteria.andReceiveUserIdEqualTo(ShiroUtils.getUserId());
-        if(null != onStr && onStr.size() > 0)
+        if (null != onStr && onStr.size() > 0)
             criteria.andIdNotIn(onStr);
-        if(null != type)
+        if (null != type)
             criteria.andHandleTypeEqualTo(type);
         List<ParkWaitHandle> list = modelMapper.selectByExample(example);
         PageInfo<ParkWaitHandle> pageInfo = new PageInfo<>(list);
@@ -204,15 +204,15 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
         example.setOrderByClause("created_at desc");
         ParkWaitHandleExample.Criteria criteria = example.createCriteria();
 //        criteria.andReceiveUserIdEqualTo(userId);
-        if(StringUtils.isNotEmpty(userId)){
+        if (StringUtils.isNotEmpty(userId)) {
             FrameUser user = frameUserService.selectByPrimaryKey(userId);
-            if(null != user){
+            if (null != user) {
                 criteria.andReceiveUserIdIn(CollUtil.newArrayList("0", userId, user.getDataRole()));
             }
         }
-        if(null != onStr && onStr.size() > 0)
+        if (null != onStr && onStr.size() > 0)
             criteria.andIdNotIn(onStr);
-        if(StringUtils.isNotEmpty(types)){
+        if (StringUtils.isNotEmpty(types)) {
             List<Integer> typeList = Arrays.stream(types.split(",")).map(item -> Integer.parseInt(item)).collect(Collectors.toList());
             criteria.andHandleTypeIn(typeList);
         }
@@ -230,23 +230,23 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
         ParkWaitHandleExample example = new ParkWaitHandleExample();
         ParkWaitHandleExample.Criteria criteria = example.createCriteria();
         criteria.andReceiveUserIdEqualTo(userId);
-        if(null != onStr && onStr.size() > 0)
+        if (null != onStr && onStr.size() > 0)
             criteria.andIdNotIn(onStr);
-        if(null != type)
+        if (null != type)
             criteria.andHandleTypeEqualTo(type);
         Long size = modelMapper.countByExample(example);
-        return null==size?0:size.intValue();
+        return null == size ? 0 : size.intValue();
     }
 
     // 处理
     @Transactional
     public void userHandle(HandleTypeEnum typeEnum, String param, String userId) {
-        if(!StringUtils.isNotEmpty(param))
+        if (!StringUtils.isNotEmpty(param))
             return;
         ParkWaitHandleExample example = new ParkWaitHandleExample();
         example.createCriteria().andHandleTypeEqualTo(typeEnum.getValue()).andRouteParamEqualTo(param);
         List<ParkWaitHandle> handleList = modelMapper.selectByExample(example);
-        if(null == handleList || handleList.size() <= 0)
+        if (null == handleList || handleList.size() <= 0)
             return;
         SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0L, 0L);
         for (ParkWaitHandle parkWaitHandle : handleList) {
@@ -262,13 +262,14 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
 
     /**
      * 添加待办
-     * @param title 显示标题
-     * @param typeEnum 处理类型枚举
-     * @param srcUserType 来源用户类型 0管理,1企业
-     * @param srcUserId 来源用户id
-     * @param srcUserName 来源用户名称
+     *
+     * @param title         显示标题
+     * @param typeEnum      处理类型枚举
+     * @param srcUserType   来源用户类型 0管理,1企业
+     * @param srcUserId     来源用户id
+     * @param srcUserName   来源用户名称
      * @param receiveUserId 接收用户id or 0=全部
-     * @param routeParam 跳转携带参数，例： id=***&type=**
+     * @param routeParam    跳转携带参数，例： id=***&type=**
      */
     public void addHandle(String title, HandleTypeEnum typeEnum, Integer srcUserType, String srcUserId, String srcUserName,
                           String receiveUserId, String routeParam) {
@@ -300,7 +301,7 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
 
     }
 
-    public String getUrl(String parentName, String childName){
+    public String getUrl(String parentName, String childName) {
         String waitUrl = "";
         // 查询待办页面的 菜单id
         FramePermissionExample framePermissionExample = new FramePermissionExample();
@@ -321,9 +322,9 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
     }
 
 
-
     /**
      * 泛微刷新 待办
+     *
      * @param flowMainPush
      * @param flowMain
      */
@@ -337,7 +338,7 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
             String requestname = flowMain.getApplyTheme();
             String workflowname = ConstantFlowType.PAYMENT_NAME;
             String nodeName = flowMainPush.getNodeName();
-            String pcurl = serverUrl + "&loginid=" + username;
+            String pcurl = serverUrl + "?loginid=" + username;
             String appurl = pcurl;
             String isremark = "2";
             String viewtype = "0";
@@ -374,6 +375,7 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
 
     /**
      * 泛微推送已办
+     *
      * @param flowMainPushId
      * @param flowMain
      */
@@ -389,7 +391,7 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
             String requestname = flowMain.getApplyTheme();
             String workflowname = ConstantFlowType.PAYMENT_NAME;
             String nodeName = flowMainPush.getNodeName();
-            String pcurl = serverUrl + "&loginid=" + username;
+            String pcurl = serverUrl + "?loginid=" + username;
             String appurl = pcurl;
             String isremark = "2";
             String viewtype = "0";
@@ -426,10 +428,11 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
 
     /**
      * 发起流程 推送泛微和工作台待办
+     *
      * @param id
      * @param applyTheme
      */
-    public void startOaAndHandle(String id,String applyTheme,HandleTypeEnum typeEnum) {
+    public void startOaAndHandle(String id, String applyTheme, HandleTypeEnum typeEnum) {
 
         try {
 
@@ -464,7 +467,7 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
                     String username = encryptUsername(receiveUser.getUsername());
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.PAYMENT_NAME;
-                    String pcurl = serverUrl + "&loginid=" + username;
+                    String pcurl = serverUrl + "?loginid=" + username;
                     String appurl = pcurl;
                     String isremark = "0";
                     String viewtype = "0";
@@ -502,7 +505,6 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
     }
 
 
-
     /**
      * 推送泛微和工作台待办
      *
@@ -535,13 +537,13 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.PAYMENT_NAME;
                 String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "&loginid=" + username;
+                String pcurl = serverUrl + "?loginid=" + username;
                 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() + "";
 
@@ -573,7 +575,6 @@ public class ParkWaitHandleService implements BaseService<ParkWaitHandle, ParkWa
     }
 
 
-
     /**
      * 加密用户名
      *

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

@@ -47,7 +47,7 @@ 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");
             SecurityUtils.getSubject().getSession().setTimeout(3600000L);
             return view;
         } catch (Exception e) {