yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

待办工作数

master
wangpengfei 2 years ago
parent
844ff601f7
commit
883b56b33e
5 changed files with 79 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  2. 5
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java
  3. 32
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeign.java
  4. 25
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeignFallBack.java
  5. 3
      yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java

30
yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -117,10 +117,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
public ResultBean<UserAndOrgPath> getNextNodeUserSidsOfCreate(BusinessVariables bv){
ResultBean rb = ResultBean.fireFail();
String orgSidPath=bv.getOrgSidPath();
log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(bv));
//log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(bv));
//根据业务参数取流程流转的环节 信息
List<Map<String, Object>> list = (List<Map<String, Object>>) 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<FlowTaskMapper, FlowTask
if(o==null){
return rb.setMsg("流程设计问题");
}
log.info("getNextNodeUserSidsOfCreate3:{}",JSONObject.toJSONString(o));
//log.info("getNextNodeUserSidsOfCreate3:{}",JSONObject.toJSONString(o));
return getNextUserSids(rb, orgSidPath, o);
}
public ResultBean<UserAndOrgPath> getNextUserSids(ResultBean rb, String orgSidPath, Object o) {
@ -140,9 +140,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(roleSid);
userQuery.setOrgSidPath(orgSidPath);
log.info("getNextUserSids0:{}",JSONObject.toJSONString(userQuery));
//log.info("getNextUserSids0:{}",JSONObject.toJSONString(userQuery));
List<SysUserVo> 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<FlowTaskMapper, FlowTask
//符合条件的用户的sid,拼接的字符串
String nextNodeUserSids_ = nextNodeUserSids.toString();
String nextNodeOrgPathSids_ = nextNodeOrgPathSids.toString();
log.info("getNextUserSids2:{}",nextNodeUserSids_);
//log.info("getNextUserSids2:{}",nextNodeUserSids_);
if(StringUtils.isBlank(nextNodeUserSids_))
return rb.fail().setMsg("环节没有用户");
nextNodeUserSids_ = nextNodeUserSids_.substring(0, nextNodeUserSids_.length() - 1);
nextNodeOrgPathSids_ = nextNodeOrgPathSids_.substring(0, nextNodeOrgPathSids_.length() - 1);
mapParam.setUserSid(nextNodeUserSids_);
mapParam.setOrgPath(nextNodeOrgPathSids_);
log.info("getNextUserSids3:{}",JSONObject.toJSONString(mapParam));
//log.info("getNextUserSids3:{}",JSONObject.toJSONString(mapParam));
return rb.success().setData(mapParam);
}
public ResultBean getProcessCirculationNodesByMap(BusinessVariables bv) {
@ -403,7 +403,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
*/
public ResultBean<Page<FlowTaskDto>> todoList(Integer pageNum, Integer pageSize) {
Page<FlowTaskDto> 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<FlowTaskMapper, FlowTask
public ResultBean<UserAndOrgPath> getNextNodeUserSidsOfCreateNoOrgPath(BusinessVariables dto) {
ResultBean rb = ResultBean.fireFail();
log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(dto));
//log.info("getNextNodeUserSidsOfCreate1:{}",JSONObject.toJSONString(dto));
//根据业务参数取流程流转的环节 信息
List<Map<String, Object>> list = (List<Map<String, Object>>) 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<FlowTaskMapper, FlowTask
if(o==null){
return rb.setMsg("流程设计问题");
}
log.info("getNextNodeUserSidsOfCreate3:{}",JSONObject.toJSONString(o));
//log.info("getNextNodeUserSidsOfCreate3:{}",JSONObject.toJSONString(o));
return getNextUserSidsNoOrgPath(rb, o);
}
@ -2112,9 +2112,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
//根据组织架构、角色两个参数取相关符合条件的用户信息
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(roleSid);
log.info("getNextUserSids0:{}",JSONObject.toJSONString(userQuery));
//log.info("getNextUserSids0:{}",JSONObject.toJSONString(userQuery));
List<SysUserVo> 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<FlowTaskMapper, FlowTask
}
//符合条件的用户的sid,拼接的字符串
String nextNodeUserSids_ = nextNodeUserSids.toString();
log.info("getNextUserSids2:{}",nextNodeUserSids_);
//log.info("getNextUserSids2:{}",nextNodeUserSids_);
if(StringUtils.isBlank(nextNodeUserSids_))
return rb.fail().setMsg("环节没有用户");
nextNodeUserSids_ = nextNodeUserSids_.substring(0, nextNodeUserSids_.length() - 1);
mapParam.setUserSid(nextNodeUserSids_);
log.info("getNextUserSids3:{}",JSONObject.toJSONString(mapParam));
//log.info("getNextUserSids3:{}",JSONObject.toJSONString(mapParam));
return rb.success().setData(mapParam);
}
}

5
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java
View File

@ -32,6 +32,7 @@ import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService;
import com.yxt.supervise.report.biz.systemriskmessageslog.SystemRiskMessagesLogService;
import com.yxt.supervise.report.biz.systemriskmessageuser.SystemRiskMessageUserService;
import com.yxt.supervise.report.ds.system.SysUser;
import com.yxt.supervise.report.feign.flowable.flowtask.FlowTaskFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -59,6 +60,8 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
SystemRiskMessagesLogService systemRiskMessagesLogService;
@Autowired
SystemRiskMessageUserService systemRiskMessageUserService;
@Autowired
FlowTaskFeign flowTaskFeign;
public ResultBean save(MessagePushLogDto dto) {
//删除同天同项目消息
baseMapper.delete(new QueryWrapper<MessagePushLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
@ -159,6 +162,7 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid);
int pendingMessages=baseMapper.getCountByUser(sysUser.getAppletOpenid(),"0");
int readMessage=baseMapper.getCountByUser(sysUser.getAppletOpenid(),"1");
Integer integer=flowTaskFeign.getTodoNum(userSid).getData();
List<String> list = new ArrayList<>();
list.add("【一级风险】");
list.add("【二级风险】");
@ -167,6 +171,7 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
String[] urls = {"http://jianguan.yyundong.com/img/banner001.jpg"};
map.put("readMessage",readMessage);
map.put("pendingMessages",pendingMessages);
map.put("toDo",integer);
map.put("urls",urls);
map.put("notice",list);
return rb.success().setData(map);

32
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeign.java
View File

@ -0,0 +1,32 @@
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 io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author dimengzhe
* @date 2021/7/29 14:37
* @description
*/
@FeignClient(
contextId = "supervise-flowable-FlowTask",
name = "supervise-flowable",
path = "v1/flowable/task",
fallback = FlowTaskFeignFallBack.class)
public interface FlowTaskFeign {
@ApiOperation(value = "业务系统查询待办任务列表数量")
@GetMapping("/getTodoNum/{userSid}")
ResultBean<Integer> getTodoNum(@PathVariable(value = "userSid") String userSid);
}

25
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/flowable/flowtask/FlowTaskFeignFallBack.java
View File

@ -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;
}
}

3
yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java
View File

@ -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;

Write Preview
Loading…
Cancel
Save