增加对象转url参数 修改待办url拼接

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonserviceImpl.java

@@ -22,12 +22,16 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 
 @Service
 public class CommonserviceImpl {
@@ -151,4 +155,32 @@ public class CommonserviceImpl {
         Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));
 
     }
+
+    public  <T> String toQueryParams(T obj) throws UnsupportedEncodingException {
+        StringBuilder sb = new StringBuilder();
+
+        for (Class<?> clazz = obj.getClass(); !clazz.equals(Object.class); clazz = clazz.getSuperclass()) {
+            Field[] fields = clazz.getDeclaredFields();
+
+            for (Field field : fields) {
+                if (!Modifier.isStatic(field.getModifiers())) {
+                    field.setAccessible(true);
+
+                    try {
+                        Object value = field.get(obj);
+
+                        if (value != null && !"".equals(value)) {
+                            String encodedValue = URLEncoder.encode(value.toString(), "UTF-8");
+                            sb.append(field.getName()).append('=').append(encodedValue).append('&');
+                        }
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        }
+
+        return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : "";
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -54,6 +54,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -210,13 +211,20 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
             List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
             String roleIds = String.join(",", userOrgRoleList);
+            String urlParams = null;
+            try {
+                model.setEquip(null);
+                urlParams = commonservice.toQueryParams(model);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
             if (StringUtils.isNotBlank(model.getProcessInstanceId())){
                 commonservice.buildTaskModel(MapBuilder.<String, Object>create().put("instanceId", model.getProcessInstanceId()).put("startDate",new Date())
                         .put("agencyCode",reginParams.getUserModel().getAgencyCode()).put("userId",reginParams.getUserModel().getUserId()).put("startUser",reginParams.getUserModel().getUserId()).put("startUserId",reginParams.getUserModel().getUserId())
                         .put("taskStatus",FlowStatusEnum.TO_BE_PROCESSED.getCode()).put("taskStatusLabel",FlowStatusEnum.TO_BE_PROCESSED.getName()).put("taskName",taskName).put("taskType", model.getBizType()).put("taskTypeLabel", BizTypeEnum.getNameByCode(model.getBizType())).put("taskContent","")
                         .put("taskTitle",reginParams.getUserModel().getUserName()+"发起了"+taskName).put("taskDesc","").put("taskCode",model.getApplicationNo())
                         .put("extras",JSON.toJSONString(model)).put("createUserId",reginParams.getUserModel().getUserName()).put("startUserId",reginParams.getUserModel().getUserId())
-                        .put("routePath",url.replace("{sequenceNbr}",String.valueOf(model.getSequenceNbr())).replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds).replace("{ProcessInstanceId}",model.getProcessInstanceId()))
+                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds)+"&"+urlParams)
                         .build());
             }
 
@@ -310,22 +318,31 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     url = map.get("url").toString();
                 }
             }
+            Map<String,Object> params = new HashMap<>();
+            params.put("relationId",model.getProcessInstanceId());
+            params.put("taskStatus",FlowStatusEnum.TO_BE_FINISHED.getCode());
+            params.put("taskStatusLabel",FlowStatusEnum.TO_BE_FINISHED.getName());
+            TaskV2Model taskV2Model = commonservice.updateTaskModel(params);
 
             Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
             List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
             String roleIds = String.join(",", userOrgRoleList);
+            String urlParams = null;
+            try {
+                model.setEquip(null);
+                urlParams = commonservice.toQueryParams(model);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
             commonservice.buildTaskModel(MapBuilder.<String, Object>create().put("instanceId", model.getProcessInstanceId()).put("startDate",new Date())
                         .put("agencyCode",reginParams.getUserModel().getAgencyCode()).put("userId",reginParams.getUserModel().getUserId()).put("startUser",reginParams.getUserModel().getUserId()).put("startUserId",reginParams.getUserModel().getUserId())
                         .put("taskStatus",FlowStatusEnum.REJECTED.getCode()).put("taskStatusLabel",FlowStatusEnum.REJECTED.getName()).put("taskName",taskName).put("taskType", model.getBizType()).put("taskTypeLabel", BizTypeEnum.getNameByCode(model.getBizType())).put("taskContent","")
                         .put("taskTitle",reginParams.getUserModel().getUserName()+"发起了"+taskName).put("taskDesc","").put("taskCode",model.getApplicationNo())
                         .put("extras",JSON.toJSONString(model)).put("createUserId",reginParams.getUserModel().getUserName()).put("startUserId",reginParams.getUserModel().getUserId())
-                        .put("routePath",url.replace("{sequenceNbr}",String.valueOf(model.getSequenceNbr())).replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds))
+                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds)+"&"+urlParams)
+                     //   .put("routePath",url.replace("{sequenceNbr}",String.valueOf(model.getSequenceNbr())).replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds))
                         .build());
-            Map<String,Object> params = new HashMap<>();
-            params.put("relationId",model.getProcessInstanceId());
-            params.put("taskStatus",FlowStatusEnum.TO_BE_PROCESSED.getCode());
-            params.put("taskStatusLabel",FlowStatusEnum.TO_BE_PROCESSED.getName());
-            TaskV2Model taskV2Model = commonservice.updateTaskModel(params);
+
         }
         return model;
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/bizTypeInfo.json

@@ -2,26 +2,26 @@
   {
     "type":"supervise",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1735205097765367809&sequenceNbr={sequenceNbr}&roleIds={roleIds}&userId=userId={userId}&pageType=look&ProcessInstanceId={ProcessInstanceId}"
+    "url": "/mixuap?appId=1742358052905971713&id=1735205097765367809&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"firstinspect",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1736588187213524994&sequenceNbr={sequenceNbr}&roleIds={roleIds}&userId=userId={userId}&pageType=look&ProcessInstanceId={ProcessInstanceId}"
+    "url": "/mixuap?appId=1742358052905971713&id=1736588187213524994&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"detection",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1736642376224501762&sequenceNbr={sequenceNbr}&roleIds={roleIds}&userId=userId={userId}&pageType=look&ProcessInstanceId={ProcessInstanceId}"
+    "url": "/mixuap?appId=1742358052905971713&id=1736642376224501762&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"supervise",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736642376224501762&sequenceNbr={sequenceNbr}&roleIds={roleIds}&userId=userId={userId}&pageType=edit&ProcessInstanceId={ProcessInstanceId}"
+    "url": "/mixuap?appId=1742358052905971713&id=1736642376224501762&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
     "type":"firstinspect",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&sequenceNbr={sequenceNbr}&roleIds={roleIds}&userId=userId={userId}&pageType=edit&ProcessInstanceId={ProcessInstanceId}"
+    "url": "/mixuap?appId=1742358052905971713&id=1736728282272919554&roleIds={roleIds}&userId={userId}&pageType=edit"
   },  {
     "type":"detection",
     "pageType": "edit",
-    "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&sequenceNbr={sequenceNbr}&roleIds={roleIds}&userId=userId={userId}&pageType=edit&ProcessInstanceId={ProcessInstanceId}"
+    "url": "/mixuap?appId=1742358052905971713&id=1736733779709423618&roleIds={roleIds}&userId={userId}&pageType=edit"
   }
 ]
\ No newline at end of file