From 883b56b33e012d36bd16f7929a28122662b0cc4b Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 22 Sep 2023 15:10:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=B7=A5=E4=BD=9C=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/flowtask/FlowTaskService.java | 30 ++++++++--------- .../messagepushlog/MessagePushLogService.java | 5 +++ .../flowable/flowtask/FlowTaskFeign.java | 32 +++++++++++++++++++ .../flowtask/FlowTaskFeignFallBack.java | 25 +++++++++++++++ .../supervise/system/flow/FlowableRest.java | 3 +- 5 files changed, 79 insertions(+), 16 deletions(-) create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeign.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeignFallBack.java diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 265125ec..41d9e081 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -117,10 +117,10 @@ public class FlowTaskService extends MybatisBaseService getNextNodeUserSidsOfCreate(BusinessVariables bv){ ResultBean rb = ResultBean.fireFail(); String orgSidPath=bv.getOrgSidPath(); - log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(bv)); + //log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(bv)); //根据业务参数取流程流转的环节 信息 List> list = (List>) getProcessCirculationNodesByMap(bv).getData(); - log.info("getNextNodeUserSidsOfCreate2:{}",JSONObject.toJSONString(list)); + //log.info("getNextNodeUserSidsOfCreate2:{}",JSONObject.toJSONString(list)); if(list==null||list.size()<2){ return rb.setMsg("流程设计问题"); } @@ -129,7 +129,7 @@ public class FlowTaskService extends MybatisBaseService getNextUserSids(ResultBean rb, String orgSidPath, Object o) { @@ -140,9 +140,9 @@ public class FlowTaskService extends MybatisBaseService sysUserVos = sysUserFeign.getUserByRole(userQuery).getData(); - log.info("getNextUserSids1:{}",JSONObject.toJSONString(sysUserVos)); + //log.info("getNextUserSids1:{}",JSONObject.toJSONString(sysUserVos)); if(sysUserVos==null||sysUserVos.size()<1){ return rb.fail().setMsg("环节没有用户"); } @@ -155,14 +155,14 @@ public class FlowTaskService extends MybatisBaseService> todoList(Integer pageNum, Integer pageSize) { Page page = new Page<>(); - // Long userId = SecurityUtils.getLoginUser().getUser().getUserId(); + // Long userId = SecurityUtils.get//loginUser().getUser().getUserId(); TaskQuery taskQuery = taskService.createTaskQuery() .active() .includeProcessVariables() @@ -2089,10 +2089,10 @@ public class FlowTaskService extends MybatisBaseService getNextNodeUserSidsOfCreateNoOrgPath(BusinessVariables dto) { ResultBean rb = ResultBean.fireFail(); - log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(dto)); + //log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(dto)); //根据业务参数取流程流转的环节 信息 List> list = (List>) getProcessCirculationNodesByMap(dto).getData(); - log.info("getNextNodeUserSidsOfCreate2:{}",JSONObject.toJSONString(list)); + //log.info("getNextNodeUserSidsOfCreate2:{}",JSONObject.toJSONString(list)); if(list==null||list.size()<2){ return rb.setMsg("流程设计问题"); } @@ -2101,7 +2101,7 @@ public class FlowTaskService extends MybatisBaseService sysUserVos = sysUserFeign.getUserByRoleNoOrgPath(userQuery).getData(); - log.info("getNextUserSids1:{}",JSONObject.toJSONString(sysUserVos)); + //log.info("getNextUserSids1:{}",JSONObject.toJSONString(sysUserVos)); if(sysUserVos==null||sysUserVos.size()<1){ return rb.fail().setMsg("环节没有用户"); } @@ -2124,12 +2124,12 @@ public class FlowTaskService extends MybatisBaseService().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate())); @@ -159,6 +162,7 @@ public class MessagePushLogService extends MybatisBaseService list = new ArrayList<>(); list.add("【一级风险】"); list.add("【二级风险】"); @@ -167,6 +171,7 @@ public class MessagePushLogService extends MybatisBaseService getTodoNum(@PathVariable(value = "userSid") String userSid); + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeignFallBack.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeignFallBack.java new file mode 100644 index 00000000..5568bc07 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeignFallBack.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.report.feign.flowable.flowtask; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; + +import com.yxt.supervise.system.flow.FlowTaskDto; +import com.yxt.supervise.system.flow.FlowTaskQuery; +import com.yxt.supervise.system.flow.FlowTaskVo; +import org.springframework.stereotype.Component; + +/** + * @author dimengzhe + * @date 2021/8/20 15:43 + * @description + */ +@Component +public class FlowTaskFeignFallBack implements FlowTaskFeign { + + @Override + public ResultBean getTodoNum(String userSid) { + return null; + } + +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java index 22ee79db..c03abfec 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java @@ -71,7 +71,8 @@ import java.util.Map; @RequestMapping("v1/flow") @Api(tags = "业务系统中业务和工作流相关操作") //public class FlowableRest implements FlowableFeign { -public class FlowableRest { +public class +FlowableRest { @Autowired private FlowableService flowableService;