From 2056d03a9493be1619ecb58a9503ec8c800472fa Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 11 Apr 2023 17:08:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feishu/enums/TemplateInfoEnum2.java | 5 ++ .../feishu/service/IFeishuService.java | 7 +++ .../service/impl/FeishuServiceImpl.java | 46 +++++++++++++++++ .../impl/LawsOpinionGatherEOServiceImpl.java | 50 ++++++++++++++----- .../mapper/xml/ProcessInfoEOMapper.xml | 4 +- .../impl/ProcessInfoEOServiceImpl.java | 6 +++ 6 files changed, 105 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java index 544a9d473..b4435659f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java @@ -82,6 +82,11 @@ public enum TemplateInfoEnum2 { */ LAWS_WARN("法规预警","ctp_AArYGerQrOcE","Regulation Early Warning"), + /** + * 法规意见收集 + */ + REGULATION_OPINION_COLLECTION("法规意见收集","ctp_AArfYGLozU47","Regulation Opinion Collection"), + ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java index 3fe15cf62..f399bea99 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/IFeishuService.java @@ -145,4 +145,11 @@ public interface IFeishuService { */ void sendMessageLawsWarn(String templeteId,Map params); + /** + * 飞书消息模板--法规意见收集 + * @param templeteId + * @param params + */ + void sendMessageRegulationOpinionCollection(String templeteId,Map params); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 3f5aa20db..d7ed9e62e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -1516,4 +1516,50 @@ public class FeishuServiceImpl implements IFeishuService { } } + @Override + public void sendMessageRegulationOpinionCollection(String templeteId, Map params) { + List userIdList = (List) params.get("userIdList"); + if (CollectionUtils.isNotEmpty(userIdList)) { + List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + + String contentCn = (String) params.get("contentInfoFeiCn"); + String contentEn = (String) params.get("contentInfoFeiEn"); + String back_url = (String) params.get("back_url"); + String titleCn = (String) params.get("titleCn"); + String titleEn = (String) params.get("titleEn"); + String regulationNo = (String) params.get("regulationNo"); + String initiator = (String) params.get("initiator"); + String initiatorEn = (String) params.get("initiatorEn"); + String dueDate = (String) params.get("dueDate"); + try { + for (String userId : userIdList) { + String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId); + if(StringUtils.isNotEmpty(thirdId)){ + // 根据结束时间进行排序，获取最近的时间，发消息时使用。 + JSONObject larkMesJson = new JSONObject(); + larkMesJson.put("template_id", templeteId); + larkMesJson.put("userIds",thirdId); + Map templateVariableMap = new HashMap<>(); + templateVariableMap.put("contentInfoFeiCn",contentCn); + templateVariableMap.put("contentInfoFeiEn",contentEn); + templateVariableMap.put("view_url_cn",back_url); + templateVariableMap.put("view_url_en",back_url); + templateVariableMap.put("titleCn",titleCn); + templateVariableMap.put("titleEn",titleEn); + templateVariableMap.put("regulationNo",regulationNo); + templateVariableMap.put("initiator",initiator); + templateVariableMap.put("initiatorEn",initiatorEn); + templateVariableMap.put("dueDate",dueDate); + + larkMesJson.put("templateVariableMap",templateVariableMap); + batchSendLarkCardMsgByTemplate2(larkMesJson); + } + } + } catch (Exception e) { + log.error("飞书消息推送失败"); + } + } + + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index b0355b6e8..4c79546a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -13,6 +13,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.enums.DictCodeEnum; +import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsg2Vo; import com.jero.modules.feishu.vo.FeishuMsgVo; @@ -329,6 +330,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl lawsOpinionGatherPrcInfo = this.workFlowFeignClient.getLawsOpinionGatherPrcInfo(lawsOpinionGatherId); String initiator = ""; + String initiatorEn = ""; String title = MessageType2Enum.REGULATION_OPINION_COLLECTION.getCn() + "/" + MessageType2Enum.REGULATION_OPINION_COLLECTION.getEn(); String endTime = new SimpleDateFormat("yyyy-MM-dd").format(lawsOpinionGatherEO.getEndTime());//截止日期 //String prcNum = lawsOpinionGatherPrcInfo.get("prcNum"); @@ -383,7 +385,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl params = new HashMap<>(); + params.put("contentInfoFeiCn",cnContentUpper); + params.put("contentInfoFeiEn",enContentUpper); + params.put("userIdList",userIdList); + params.put("back_url",hrefFeishu); + params.put("titleCn"," "+lawsOpinionGatherEO.getTitle()); + params.put("titleEn"," "+bussDocumentLibraryEO.getTitleEn()); + params.put("regulationNo"," "+lawsOpinionGatherEO.getSerialNumber()); + params.put("initiator"," "+initiator); + if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_THREE_DAYS_BEFORE_MSG.getValue()) + || StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_TODAY_MSG.getValue()) + ||StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_COMPLETE_MSG.getValue())){ + params.put("initiatorEn"," "+initiatorEn); + }else{ + params.put("initiatorEn"," "+initiator); + } + params.put("dueDate"," "+endTime); + feishuService.sendMessageRegulationOpinionCollection(TemplateInfoEnum2.REGULATION_OPINION_COLLECTION.getValue(),params); + } catch (Exception e) { log.error("飞书消息推送失败"); } //系统内部跳转链接 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index d19e6b2bd..960c1266e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -19,7 +19,9 @@ - and project_name is not null + + and project_name is not null + and ( temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%') diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index 699bf2da2..e36720080 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -226,6 +226,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl qdqrFlowTypeValue = new ArrayList<>(); qdqrFlowTypeValue.add(FlowTypeEnum.QDQR.getValue()); @@ -251,6 +252,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryProjectProcessPageList(page,params); @@ -273,6 +275,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryProjectProcessPageList(page,params); @@ -365,6 +368,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryLawsAssessPageList(page,params); @@ -388,6 +392,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryLawsAssessPageList(page,params); @@ -411,6 +416,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl result = this.baseMapper.queryLawsAssessPageList(page,params); From d79e4c9f72da81f32f58cb72de25fd2bc2a03dcf Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 11 Apr 2023 17:31:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/feishu/service/impl/FeishuServiceImpl.java | 4 ++++ .../service/impl/LawsOpinionGatherEOServiceImpl.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index d7ed9e62e..7315a234c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -1531,6 +1531,8 @@ public class FeishuServiceImpl implements IFeishuService { String initiator = (String) params.get("initiator"); String initiatorEn = (String) params.get("initiatorEn"); String dueDate = (String) params.get("dueDate"); + String carTitleCn = (String) params.get("carTitleCn"); + String carTitleEn = (String) params.get("carTitleEn"); try { for (String userId : userIdList) { String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId); @@ -1550,6 +1552,8 @@ public class FeishuServiceImpl implements IFeishuService { templateVariableMap.put("initiator",initiator); templateVariableMap.put("initiatorEn",initiatorEn); templateVariableMap.put("dueDate",dueDate); + templateVariableMap.put("carTitleCn",carTitleCn); + templateVariableMap.put("carTitleEn",carTitleEn); larkMesJson.put("templateVariableMap",templateVariableMap); batchSendLarkCardMsgByTemplate2(larkMesJson); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 4c79546a1..628e729e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -466,6 +466,8 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl