From a124f72b7f11bcf34a290778bc2691f460bfe174 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 1 Mar 2023 11:43:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusVehicleApplyService.java | 31 ++++++++++-- .../busmaindeposit/BusMainDepositService.java | 11 ++++- .../flowable/api/flow/FlowableFallback.java | 2 +- .../flowable/api/flow/FlowableFeign.java | 2 +- .../anrui/flowable/biz/flow/FlowableRest.java | 8 +-- .../api/sysstaffinfo/SysStaffinfoFeign.java | 5 ++ .../SysStaffinfoFeignFallback.java | 5 ++ .../biz/sysstaffinfo/SysStaffinfoRest.java | 10 ++++ .../biz/sysstaffinfo/SysStaffinfoService.java | 49 +++++++++++++++++++ 9 files changed, 112 insertions(+), 11 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 67e64a1f17..94c5fd4a95 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -66,6 +66,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; +import com.yxt.messagecenter.api.message.MessageFlowableQueryForCC; import com.yxt.messagecenter.api.messagelist.MessageListFeign; import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; import org.apache.commons.lang3.StringUtils; @@ -978,13 +979,35 @@ public class BusVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); ResultBean> resultBean = flowableFeign.selectFlowVaributes(taskId); if(!resultBean.getData().isEmpty()){ - Map appMap = (Map)resultBean.getData().get("app"); + appMap = (Map)resultBean.getData().get("app"); } log.info("分享方法-resultBean:{}", JSONObject.toJSONString(resultBean)); - - // - return null; + ShareUserQuery shareUserQuery1 = new ShareUserQuery(); + shareUserQuery1.setMemberSids(memberSidList); + shareUserQuery1.setOrgSids(orgSidList); + ResultBean> shareResultBean = sysUserFeign.shareSelectUser(shareUserQuery1); + StringBuilder userSids = new StringBuilder(); + shareResultBean.getData().forEach(f->{ + userSids.append(f).append(","); + }); + userSids.deleteCharAt(userSids.length() - 1); + MessageFlowableQueryForCC mfq = new MessageFlowableQueryForCC(); + /*MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(uff, messageFlowVo); + mfq.setUfVo(messageFlowVo);*/ + mfq.setAppMap(appMap); + mfq.setBusinessSid(busVehicleApply.getSid()); + mfq.setMsgContent("分享的流程审批，请查看"); + + ResultBean stringResultBean = messageFeign.pushMessageCC(mfq); + log.info("分享成功-resultBean:{}", resultBean); + if (!resultBean.getSuccess()) { + log.info("分享失败，同送消息异常！:{}", JSONObject.toJSONString(stringResultBean)); + return rb.setMsg("分享失败，同送消息异常！"); + } + return rb.success().setMsg("分享成功！"); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 2c0e7482c2..6f83d8772c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.busmaindeposit; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -87,7 +88,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.portal.api.sysuser.*; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign; import com.yxt.anrui.portal.config.DictCommonType; @@ -103,6 +107,8 @@ import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.apache.tomcat.util.threads.ThreadPoolExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -130,7 +136,7 @@ import java.util.stream.Collectors; */ @Service public class BusMainDepositService extends MybatisBaseService { - + Logger log = LoggerFactory.getLogger(BusMainDepositService.class); @Autowired private SysUserFeign sysUserFeign; @@ -2122,6 +2128,7 @@ public class BusMainDepositService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + log.info("流程返回：{}", JSONObject.toJSONString(resultBean)); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java index d4906af263..f0a644a648 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java @@ -11,7 +11,7 @@ import java.util.Map; @Component public class FlowableFallback implements FlowableFeign { @Override - public ResultBean cc(Map map) { + public ResultBean cc(Map map,String taskDefKey) { return null; } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java index c7f8d158e0..d9582b1c5c 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java @@ -25,7 +25,7 @@ public interface FlowableFeign { * @return */ @PostMapping("/cc") - public ResultBean cc(@RequestBody Map map); + public ResultBean cc(@RequestBody Map map,@RequestParam("taskDefKey") String taskDefKey); /** * 业务系统发起流程申请 * diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 059ad6672b..96abf66f10 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -109,7 +109,7 @@ public class FlowableRest implements FlowableFeign { * @return */ @Override - public ResultBean cc(Map map) { + public ResultBean cc(Map map,String taskDefKey) { ResultBean rb = ResultBean.fireFail(); log.info("FlowableRest-cc:{}", JSONObject.toJSONString(map)); Object bv1 = map.get("bv"); @@ -118,6 +118,7 @@ public class FlowableRest implements FlowableFeign { Object uff1 = map.get("uff"); UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); BeanUtil.copyProperties(uff1, uff); + uff.setTaskDefKey(taskDefKey); //流程定义的id String modelId = bv.getModelId(); @@ -313,8 +314,10 @@ public class FlowableRest implements FlowableFeign { public ResultBean handleProsess(BusinessVariables dto) { ResultBean rb = ResultBean.fireFail(); ResultBean updateFlowFieldVoResultBean = handleProsess(dto, true); + log.info("流程返回：{}",JSONObject.toJSONString(updateFlowFieldVoResultBean)); //需要判断办结后再执行 TODO if (updateFlowFieldVoResultBean.getSuccess()) { + log.info("流程返回：{}",JSONObject.toJSONString(updateFlowFieldVoResultBean)); if ("Event_end".equals(updateFlowFieldVoResultBean.getData().getTaskDefKey())) { try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() @@ -327,9 +330,8 @@ public class FlowableRest implements FlowableFeign { HashMap map = new HashMap<>(); map.put("bv", dto); UpdateFlowFieldVo ufVo = updateFlowFieldVoResultBean.getData(); - ufVo.setTaskDefKey(dto.getTaskDefKey()); map.put("uff", ufVo); - cc(map); + cc(map,dto.getTaskDefKey()); }); } catch (Exception e) { e.printStackTrace(); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index 4b396a1dd3..15507c27c7 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -122,6 +122,11 @@ public interface SysStaffinfoFeign { @PostMapping("/searchAppContactsList") public ResultBean> searchAppContactsList(@RequestBody PagerQuery pq); + @ApiOperation("App通讯录搜索2") + @ResponseBody + @PostMapping("/searchAppContactsList2") + public ResultBean> searchAppContactsList2(@RequestBody PagerQuery pq); + @ApiOperation("销售订单-内部推荐人下拉框") @ResponseBody @GetMapping("/selectStaffList") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index f4727b99a7..74756c5924 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -78,6 +78,11 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return ResultBean.fireFail().setMsg("接口anrui_portal/searchAppContactsList无法访问"); } + @Override + public ResultBean> searchAppContactsList2(PagerQuery pq) { + return null; + } + @Override public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { return null; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index fc52aecfa9..460001af9c 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -188,6 +188,16 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return new ResultBean>().success().setData(pv_result); } + @Override + public ResultBean> searchAppContactsList2(PagerQuery pq) { + PagerVo page1 = new PagerVo<>(); + IPage iPage = sysStaffinfoService.searchAppContactsList2(pq); + //把Ipage转换为PageVo + PagerVo pv_result = PagerUtil.pageToVo(iPage, page1); + pv_result.setMsg("找到 " + pv_result.getTotal() + " 个联系人 "); + return new ResultBean>().success().setData(pv_result); + } + @Override public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { return sysStaffinfoService.selectStaffList(pcSysStaffQuery); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 4d0fe0fdd4..6b2ec29e8f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -119,12 +119,61 @@ public class SysStaffinfoService extends MybatisBaseService stringList = sysUserService.getPost(vo.getSid()); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + vo.setPosition(String.join("|", stringList)); + } }); map.put("list", list); map.put("info", "找到 " + iPage.getRecords().size() + " 个联系人 "); return iPage; } + public IPage searchAppContactsList2(PagerQuery pagerQuery) { + String names = pagerQuery.getParams().getName(); + Map map = new HashMap<>(); + List paramList = new ArrayList<>(); + String chnStr = ""; // 中文查询字符串 + String mobileStr = ""; // 中文查询字符串 + if (StringUtils.isNotBlank(names)) { + if (names.matches("^\\d*$")) { // 数字 + mobileStr = names; + } else { + String[] namesArray = names.split(""); + for (int i = 0; i < namesArray.length; i++) { + if (StringUtils.isNotBlank(namesArray[i])) { + if (namesArray[i].matches("^[\u4e00-\u9fa5]+$")) { // 中文 + chnStr = chnStr + namesArray[i]; + } + String pinYinName = PinYinUtils.getPinYinName(namesArray[i]); + if (pinYinName.equals("_") || pinYinName.equals("%")) { + pinYinName = "\\" + pinYinName; + } + paramList.add(pinYinName); + } + } + } + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage iPage = baseMapper.searchAppContactsPageList(page, paramList, chnStr, mobileStr); + List list = iPage.getRecords(); + list.stream().forEach(vo -> { + if (StringUtils.isNotBlank(vo.getHeadImage())) { + vo.setHeadImage(fileUploadComponent.getUrlPrefix() + vo.getHeadImage()); + } + List stringList = sysUserService.getPost(vo.getSid()); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + vo.setPosition(String.join("|", stringList)); + } + }); + map.put("list", list); + map.put("info", "找到 " + iPage.getRecords().size() + " 个联系人 "); + return iPage; + } + + public AppContactsDetailsVo selectAppContactsVO(String staffSid) { return baseMapper.selectAppContactsVO(staffSid); }