WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改手机端发送消息

Browse Source
This commit is contained in:
高嵩
2023-07-07 22:44:51 +08:00
parent 26f77c517d
commit ba1a9d682c
20 changed files with 258 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java
+5
View File
@@ -87,6 +87,8 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl<AuthDummyIn
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
@Resource
private IFeishuService iFeishuService;
@@ -488,12 +490,15 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl<AuthDummyIn
contentEn = "1. New regulations: " + org.apache.commons.lang3.StringUtils.join(serialNumberAddList,",") + "\n"
+"2. Remove regulations: " + org.apache.commons.lang3.StringUtils.join(serialNumberDeleteList,",");
}
contentCn = contentCn + "-请在PC端查看";
contentEn = contentEn + "-Check on the PC";
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",contentInfoFeiCn + "\n" + contentCn);
params.put("contentInfoFeiEn",contentLogFeishuTemp + "\n" + contentEn);
params.put("userIdList",userIdList);
params.put("back_url",href);
params.put("back_url_phone",backUrlPhone);
params.put("titleCn", TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+42
View File
@@ -175,6 +175,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
@Autowired
private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
@@ -2302,6 +2304,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
try {
String contentInfoFeiCn = "您好，" + currentUser.getUsername() + "退回了参数" + StringUtils.join(nioNumberList,",") + "，请及时处理。";
String contentInfoFeiEn = "Hello! " + currentUser.getUsername() + " has returned the Parameter " + StringUtils.join(nioNumberList,",") + ". Please address it in a timely manner.";
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",contentInfoFeiCn);
@@ -2313,6 +2318,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("initiatorEn",currentUser.getUsername());
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_BACK.getValue(),params,null);
} catch (Exception e) {
log.error("飞书消息推送失败");
@@ -2324,6 +2330,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String contentInfoFeiCn = "您好，" + currentUser.getUsername() + "退回了参数" + StringUtils.join(nioNumberList,",") + "，请及时处理。";
String contentInfoFeiEn = "Hello! " + currentUser.getUsername() + " has returned the Parameter " + StringUtils.join(nioNumberList,",") + ". Please address it in a timely manner.";
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",contentInfoFeiCn);
@@ -2335,6 +2343,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("initiatorEn",currentUser.getUsername());
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_BACK.getValue(),params,null);
} catch (Exception e) {
log.error("飞书消息推送失败");
@@ -2410,6 +2419,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String contentInfoFeiCn = "您参与填写的参数 " + StringUtils.join(nioNumberList,",") + " 已被 " + currentUser.getUsername() + " 撤回。";
String contentInfoFeiEn = "The parameter " + StringUtils.join(nioNumberList,",") + " you filled in have been withdrawn by " + currentUser.getUsername();
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// //飞书消息（模板-20230410）
@@ -2424,6 +2435,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("dueDate","");
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_NO_DEADLINE.getValue(),params,null);
return updateBatchById(updateEOList);
@@ -2651,6 +2663,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String contentInfoFeiCn = "您好，" + currentUser.getUsername() + "向您分发了认证参数填写任务，请及时处理。";
String contentInfoFeiEn = "Hello! " + currentUser.getUsername() + " has assigned the task of filling in Homo Parameter to you. Please address it in a timely manner.";
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",contentInfoFeiCn);
@@ -2663,6 +2677,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("dueDate",sdf.format(deadline));
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
} catch (Exception e) {
@@ -2818,6 +2833,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String contentInfoFeiCn = "您好，请及时分配参数填写人。";
String contentInfoFeiEn = "Hello! Please assign the task of filling in Homo Parameter in a timely manner.";
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
if(StringUtils.isNotBlank(paramsCollectManifestVO.getProjectId())){
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(paramsCollectManifestVO.getProjectId());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
@@ -2840,6 +2857,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("dueDate",sdf.format(deadline));
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
// params.put("back_url_cn",(String)hrefFeishuMap.get("hrefFeishu_cn"));
// params.put("back_url_en",(String)hrefFeishuMap.get("hrefFeishu_en"));
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
@@ -6454,6 +6472,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
//
String contentInfoFeiCn = "您参与填写的参数" + join + "，还有7天到期，请及时查看处理。";
String contentInfoFeiEn = "The parameter " + join + " you filled in will expire in 7 days. Please check and address it in a timely manner.";
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
userIdList7 = userIdList7.stream().distinct().collect(Collectors.toList());
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
@@ -6467,6 +6488,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("dueDate",dueDate);
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,flag);
} catch (Exception e) {
log.error("飞书消息推送失败");
@@ -6492,6 +6514,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String contentInfoFeiCn = "您参与填写的参数" + join + "，还有3天到期，请及时查看处理。";
String contentInfoFeiEn = "The parameter " + join + " you filled in will expire in 3 days. Please check and address it in a timely manner.";
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
userIdList3 = userIdList3.stream().distinct().collect(Collectors.toList());
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
@@ -6505,6 +6530,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("dueDate",dueDate);
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,flag);
} catch (Exception e) {
@@ -6531,6 +6557,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String contentInfoFeiCn = "您参与填写的参数" + join + "，将于今天到期，请及时查看处理。";
String contentInfoFeiEn = "The parameter " + join + " you filled in will expire today. Please check and address it in a timely manner.";
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
userIdList0 = userIdList0.stream().distinct().collect(Collectors.toList());
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
@@ -6544,6 +6573,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("dueDate",dueDate);
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,flag);
} catch (Exception e) {
@@ -6896,6 +6926,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String contentInfoFeiCn = "您参与填写的参数 " + StringUtils.join(nioNumberList,",") + " 已被 " + currentUser.getUsername() + " 撤回。";
String contentInfoFeiEn = "The parameter " + StringUtils.join(nioNumberList,",") + " you filled in have been withdrawn by " + currentUser.getUsername();
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// //飞书消息（模板-20230410）
@@ -6910,6 +6942,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("dueDate","");
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_NO_DEADLINE.getValue(),params,null);
@@ -7006,6 +7039,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String cnContentUpper = "您参与填写的参数 " + nioNumbers + "，已被 " + currentUser.getUsername() + " 重新分发给 " + dre + " 请及时查看。";
String enContentUpper = "The parameter " + nioNumbers + " you distributed have been re-assigned to " + currentUser.getUsername() + " by " + dre;
cnContentUpper = cnContentUpper + "-请在PC端查看";
enContentUpper = enContentUpper + "-Check on the PC";
// 消息内容
SysUser sysUser = this.sysUserService.getUserByName(sdtUserName);
String[] thirdIds = new String[1];
@@ -7046,6 +7081,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("initiatorEn",currentUser.getUsername());
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
params.put("dueDate",sdf.format(deadline));
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
@@ -7073,6 +7109,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String cnContentUpper = "您参与填写的参数 " + nioNumbers + " 已被 " + currentUser.getUsername() + " 撤回。";
String enContentUpper = "The parameter " + nioNumbers + " you filled in have been withdrawn by " + currentUser.getUsername();
cnContentUpper = cnContentUpper + "-请在PC端查看";
enContentUpper = enContentUpper + "-Check on the PC";
// 消息内容
SysUser sysUser = sysUserService.getUserByName(dreUpdateFront);
String[] thirdIds = new String[1];
@@ -7109,6 +7147,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("initiatorEn",currentUser.getUsername());
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
params.put("dueDate",sdf.format(deadline));
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
@@ -7153,6 +7192,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String contentInfoFeiCn = "您好，" + currentUser.getUsername() + "向您分发了认证参数填写任务，请及时处理。";
String contentInfoFeiEn = "Hello! " + currentUser.getUsername() + " has assigned the task of filling in Homo Parameter to you. Please address it in a timely manner.";
contentInfoFeiCn = contentInfoFeiCn + "-请在PC端查看";
contentInfoFeiEn = contentInfoFeiEn + "-Check on the PC";
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",contentInfoFeiCn);
@@ -7165,6 +7206,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("dueDate",sdf.format(deadline));
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("back_url_phone",backUrlPhone + "/phoneTaskData?activeTab=parametercollection");
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
} catch (Exception e) {
log.error("飞书消息推送失败");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+13 -1
View File
@@ -207,6 +207,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
public static final String SEARCH_FLAG = "魑";
@@ -2375,6 +2377,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
params.put("contentInfoFeiEn",contentInfoFeiShu);
params.put("userIdList",userIdList);
params.put("back_url",hrefTemp);
params.put("back_url_phone",backUrlPhone + "/phoneDocumentDetails?id=" + idTemp);
params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
@@ -3662,6 +3665,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
params.put("contentInfoFeiEn",contentInfoFei);
params.put("userIdList",userList);
params.put("back_url",url);
params.put("back_url_phone",backUrlPhone + "/phoneDocumentDetails?id=" + id);
params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
@@ -3778,6 +3782,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
params.put("contentInfoFeiEn",contentInfoFei);
params.put("userIdList",userIdListUpdate);
params.put("back_url",url);
params.put("back_url_phone",backUrlPhone + "/phoneDocumentDetails?id=" + id);
params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
@@ -5630,6 +5635,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(documentIds);
List<String> serialNumberList = new ArrayList<>();
List<String> urlList = new ArrayList<>();
List<String> urlPhonelList = new ArrayList<>();
List<String> hrefList = new ArrayList<>();
for (Map<String, Object> map : mapList) {
serialNumberList.add(StringUtils.valueOf(map.get("serial_number")));
@@ -5637,11 +5643,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
"&title=" + map.get("title") +
"&serial_number=" + map.get("serial_number");
String href = "<a href='/docManage/library/detail?id=" + map.get("id") +
"&title=" + map.get("title") +
"&serial_number=" + map.get("serial_number") + "'" + " target='_blank'>" + map.get("serial_number") + "</a>";
String urlPhone = backUrlPhone + "/phoneDocumentDetails?id=" + map.get("id");
urlList.add(url);
hrefList.add(href);
urlPhonelList.add(urlPhone);
}
@@ -5671,7 +5681,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
//飞书
try {
for (String s : urlList) {
for (int i = 0; i < urlList.size()-1; i++) {
String s = urlList.get(i);
String encode = UriEncoder.encode(s);
List<String> list = new ArrayList<>();
mapList.stream().forEach(e->{
@@ -5695,6 +5706,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
params.put("contentInfoFeiEn",contentTemp);
params.put("userIdList",userIdList);
params.put("back_url",encode);
params.put("back_url_phone",urlPhonelList.get(i));
params.put("titleCn",TemplateInfoEnum2.TRANSPOND_PUSH.getNameCn());
params.put("titleEn",TemplateInfoEnum2.TRANSPOND_PUSH.getNameEn());
iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+5
View File
@@ -94,6 +94,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
private ISysAnnouncementService sysAnnouncementService;
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
@Resource
private IFeishuService iFeishuService;
@Autowired
@@ -574,12 +576,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
contentEn = "1. New regulations: " + StringUtils.join(serialNumberAddList,",") + "\n"
+"2. Remove regulations: " + StringUtils.join(serialNumberDeleteList,",");
}
contentCn = contentCn + "-请在PC端查看";
contentEn = contentEn + "-Check on the PC";
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",contentInfoFeiCn + "\n" + contentCn);
params.put("contentInfoFeiEn",contentLogFeishuTemp + "\n" + contentEn);
params.put("userIdList",userIdList);
params.put("back_url",href);
params.put("back_url_phone",backUrlPhone);
params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn());
params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn());
iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java
+9 -1
View File
@@ -1445,6 +1445,7 @@ public class FeishuServiceImpl implements IFeishuService {
String contentCn = (String) params.get("contentInfoFeiCn");
String contentEn = (String) params.get("contentInfoFeiEn");
String back_url = (String) params.get("back_url");
String back_url_phone = (String) params.get("back_url_phone");
String titleCn = (String) params.get("titleCn");
String titleEn = (String) params.get("titleEn");
try {
@@ -1460,6 +1461,7 @@ public class FeishuServiceImpl implements IFeishuService {
templateVariableMap.put("contentInfoFeiEn",contentEn);
templateVariableMap.put("view_url_cn",back_url);
templateVariableMap.put("view_url_en",back_url);
templateVariableMap.put("view_url_Phone",back_url_phone);
templateVariableMap.put("titleCn",titleCn);
templateVariableMap.put("titleEn",titleEn);
@@ -1487,6 +1489,7 @@ public class FeishuServiceImpl implements IFeishuService {
String contentCn = (String) params.get("contentInfoFeiCn");
String contentEn = (String) params.get("contentInfoFeiEn");
String back_url = (String) params.get("back_url");
String back_url_phone = (String) params.get("back_url_phone");
String titleCn = (String) params.get("titleCn");
String titleEn = (String) params.get("titleEn");
String regulationNo = (String) params.get("regulationNo");
@@ -1505,6 +1508,7 @@ public class FeishuServiceImpl implements IFeishuService {
templateVariableMap.put("contentInfoFeiEn",contentEn);
templateVariableMap.put("view_url_cn",back_url);
templateVariableMap.put("view_url_en",back_url);
templateVariableMap.put("back_url_phone",back_url_phone);
templateVariableMap.put("titleCn",titleCn);
templateVariableMap.put("titleEn",titleEn);
templateVariableMap.put("regulationNo",regulationNo);
@@ -1535,6 +1539,7 @@ public class FeishuServiceImpl implements IFeishuService {
String contentCn = (String) params.get("contentInfoFeiCn");
String contentEn = (String) params.get("contentInfoFeiEn");
String back_url = (String) params.get("back_url");
String back_url_Phone = (String) params.get("back_url_Phone");
String titleCn = (String) params.get("titleCn");
String titleEn = (String) params.get("titleEn");
String regulationNo = (String) params.get("regulationNo");
@@ -1555,7 +1560,8 @@ public class FeishuServiceImpl implements IFeishuService {
templateVariableMap.put("contentInfoFeiCn",contentCn);
templateVariableMap.put("contentInfoFeiEn",contentEn);
templateVariableMap.put("view_url_cn",back_url);
templateVariableMap.put("view_url_en",back_url);
templateVariableMap.put("view_url_en",back_url);;
templateVariableMap.put("back_url_Phone",back_url_Phone);
templateVariableMap.put("titleCn",titleCn);
templateVariableMap.put("titleEn",titleEn);
templateVariableMap.put("regulationNo",regulationNo);
@@ -1590,6 +1596,7 @@ public class FeishuServiceImpl implements IFeishuService {
String contentEn = (String) params.get("contentInfoFeiEn");
String back_url_cn = (String) params.get("back_url_cn");
String back_url_en = (String) params.get("back_url_en");
String back_url_Phone = (String) params.get("back_url_phone");
String projectCn = (String) params.get("projectCn");
String projectEn = (String) params.get("projectEn");
String initiatorCn = (String) params.get("initiatorCn");
@@ -1608,6 +1615,7 @@ public class FeishuServiceImpl implements IFeishuService {
templateVariableMap.put("contentInfoFeiEn",contentEn);
templateVariableMap.put("view_url_cn",back_url_cn);
templateVariableMap.put("view_url_en",back_url_en);
templateVariableMap.put("back_url_Phone",back_url_Phone);
templateVariableMap.put("projectCn"," " + projectCn);
templateVariableMap.put("projectEn"," " + projectEn);
templateVariableMap.put("initiatorCn"," " + initiatorCn);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+4
View File
@@ -84,6 +84,9 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
@Autowired
private ILawsOpinionAssessmentResultEOService lawsOpinionAssessmentResultEOService;
@Autowired
@@ -462,6 +465,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
params.put("contentInfoFeiEn",enContentUpper);
params.put("userIdList",userIdList);
params.put("back_url",hrefFeishu);
params.put("back_url_Phone",backUrlPhone);
params.put("titleCn"," "+lawsOpinionGatherEO.getTitle());
params.put("titleEn"," "+bussDocumentLibraryEO.getTitleEn());
params.put("regulationNo"," "+lawsOpinionGatherEO.getSerialNumber());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+3
View File
@@ -100,6 +100,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
private ISysUserService sysUserService;
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
@Autowired
private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
@Autowired
@@ -977,6 +979,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
params.put("contentInfoFeiEn",enContentUpper);
params.put("userIdList",userIdList);
params.put("back_url",hrefFeishu);
params.put("back_url_Phone",backUrlPhone);
params.put("titleCn"," "+lawsTechnologyEvaluationEO.getTitle());
if(ObjectUtils.isNotEmpty(bussDocumentLibraryEO)){
params.put("titleEn"," "+bussDocumentLibraryEO.getTitleEn());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
+3
View File
@@ -72,6 +72,8 @@ public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl<Proble
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
/**
* 保存
*
@@ -128,6 +130,7 @@ public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl<Proble
params.put("contentInfoFeiEn",contentENNo);
params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
params.put("back_url",url);
params.put("back_url_phone",backUrlPhone + "/phoneProblemKnowledgeBase?id=" + problemKnowledgeBaseEO.getId());
params.put("titleCn", TemplateInfoEnum2.TRANSPOND_PUSH.getNameCn());
params.put("titleEn",TemplateInfoEnum2.TRANSPOND_PUSH.getNameEn());
iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+3
View File
@@ -114,6 +114,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
private String uploadpath;
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
/**
@@ -1006,6 +1008,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
params.put("contentInfoFeiEn",msgContentENTemp);
params.put("userIdList",userIdList);
params.put("back_url",hrefFeishu);
params.put("back_url_phone",backUrlPhone + "/phoneProblemKnowledgeBase?id=" + problemKnowledgeBaseId);
params.put("titleCn", TemplateInfoEnum2.TRANSPOND_PUSH.getNameCn());
params.put("titleEn",TemplateInfoEnum2.TRANSPOND_PUSH.getNameEn());
iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java
+2
View File
@@ -30,6 +30,8 @@ public enum JumpLinkEnum {
TO_DO_CENTER_PHONE("手机端待办中心","","/phoneToDoCenter",""),
TASK_HANDING_PHONE("手机端任务办理","","/phoneProcessManagement",""),
PRE_TASK_HANDING_PHONE("手机端认证任务办理","","/phoneHandlingPage",""),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java
+31 -16
View File
@@ -7,6 +7,7 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.enums.CertificationFlowNodeEnum;
import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum;
import com.jero.modules.project.service.IProjectCertificationInventoryEOService;
import com.jero.modules.project.service.IProjectLibraryBaseService;
@@ -112,7 +113,8 @@ public class CertificationInventoryJob implements Job {
certificationEngineerId,
threeDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE6.getValue(),
threeDaysList.get(0).getEndTime()
threeDaysList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_REVIEW.getKey()
);
}
}
@@ -126,7 +128,8 @@ public class CertificationInventoryJob implements Job {
certificationEngineerId,
currentDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE7.getValue(),
currentDaysList.get(0).getEndTime()
currentDaysList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_REVIEW.getKey()
);
}
}
@@ -140,7 +143,8 @@ public class CertificationInventoryJob implements Job {
certificationEngineerId,
overdueList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE8.getValue(),
overdueList.get(0).getEndTime()
overdueList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_REVIEW.getKey()
);
}
}
@@ -170,7 +174,7 @@ public class CertificationInventoryJob implements Job {
certificationEngineerId,
threeDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE6.getValue(),
threeDaysList.get(0).getInventoryVerifyEndTime()
threeDaysList.get(0).getInventoryVerifyEndTime(),""
);
}
}
@@ -184,7 +188,7 @@ public class CertificationInventoryJob implements Job {
certificationEngineerId,
currentDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE7.getValue(),
currentDaysList.get(0).getInventoryVerifyEndTime()
currentDaysList.get(0).getInventoryVerifyEndTime(),""
);
}
}
@@ -198,7 +202,7 @@ public class CertificationInventoryJob implements Job {
certificationEngineerId,
overdueList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE8.getValue(),
overdueList.get(0).getInventoryVerifyEndTime()
overdueList.get(0).getInventoryVerifyEndTime(),""
);
}
}
@@ -253,7 +257,8 @@ public class CertificationInventoryJob implements Job {
dutyPersonUserId,
fourteenDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE19.getValue(),
fourteenDaysList.get(0).getEndTime()
fourteenDaysList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey()
);
}
@@ -266,7 +271,8 @@ public class CertificationInventoryJob implements Job {
dutyPersonUserId,
sevenDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE20.getValue(),
sevenDaysList.get(0).getEndTime()
sevenDaysList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey()
);
}
@@ -279,7 +285,8 @@ public class CertificationInventoryJob implements Job {
dutyPersonUserId,
currentDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE21.getValue(),
currentDaysList.get(0).getEndTime()
currentDaysList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey()
);
}
// 逾期的
@@ -291,7 +298,8 @@ public class CertificationInventoryJob implements Job {
dutyPersonUserId,
overdueList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE22.getValue(),
overdueList.get(0).getEndTime()
overdueList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey()
);
}
}
@@ -325,7 +333,8 @@ public class CertificationInventoryJob implements Job {
dutyPersonUserId,
fourteenDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE19.getValue(),
fourteenDaysList.get(0).getTaskConfirmEndTime()
fourteenDaysList.get(0).getTaskConfirmEndTime(),
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey()
);
}
@@ -338,7 +347,8 @@ public class CertificationInventoryJob implements Job {
dutyPersonUserId,
sevenDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE20.getValue(),
sevenDaysList.get(0).getTaskConfirmEndTime()
sevenDaysList.get(0).getTaskConfirmEndTime(),
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey()
);
}
@@ -351,7 +361,8 @@ public class CertificationInventoryJob implements Job {
dutyPersonUserId,
currentDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE21.getValue(),
currentDaysList.get(0).getTaskConfirmEndTime()
currentDaysList.get(0).getTaskConfirmEndTime(),
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey()
);
}
// 逾期的
@@ -363,7 +374,8 @@ public class CertificationInventoryJob implements Job {
dutyPersonUserId,
overdueList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE22.getValue(),
overdueList.get(0).getTaskConfirmEndTime()
overdueList.get(0).getTaskConfirmEndTime(),
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey()
);
}
}
@@ -687,7 +699,8 @@ public class CertificationInventoryJob implements Job {
List<SysUser> userList,String userId,
List<ProjectCertificationInventoryEO> list,
String templateId,
Date endTime) {
Date endTime,
String taskDefinitionKey){
String thirdId = this.sysUserService.getUserThirdIdByUserId(userList,userId);
if(StringUtils.isNotEmpty(thirdId)){
@@ -699,7 +712,9 @@ public class CertificationInventoryJob implements Job {
String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
if(StringUtils.isNotEmpty(taskDefinitionKey)){
hrefFeishu_CN_P = this.projectCertificationInventoryEOService.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,taskDefinitionKey);
}
Map<String, Object> standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(list);
String standName = (String) standNameAndItemName.get("standName");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java
+6
View File
@@ -147,6 +147,7 @@ public class TaskAffirmJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -187,6 +188,7 @@ public class TaskAffirmJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -227,6 +229,7 @@ public class TaskAffirmJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -282,6 +285,7 @@ public class TaskAffirmJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = threeDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -322,6 +326,7 @@ public class TaskAffirmJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -362,6 +367,7 @@ public class TaskAffirmJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
+4
View File
@@ -136,6 +136,7 @@ public class VerifyComplianceJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -175,6 +176,7 @@ public class VerifyComplianceJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -214,6 +216,7 @@ public class VerifyComplianceJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -252,6 +255,7 @@ public class VerifyComplianceJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
+4
View File
@@ -136,6 +136,7 @@ public class designComplianceJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -175,6 +176,7 @@ public class designComplianceJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -214,6 +216,7 @@ public class designComplianceJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -252,6 +255,7 @@ public class designComplianceJob implements Job {
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java
+2 -2
View File
@@ -226,7 +226,7 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
* @param userIdList
* @param userInfoList
*/
void sendMessageByTemplateId(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS, String templeteId, List<String> userIdList, List<SysUser> userInfoList, Date endTime);
void sendMessageByTemplateId(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS, String templeteId, List<String> userIdList, List<SysUser> userInfoList, Date endTimeString, String taskDefinitionKey);
/**
* 数据唯一校验。
@@ -249,7 +249,7 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
* @return
*/
Result<?> addConfigByIds(JSONObject json);
String handlePhoneLink(String id, String prn_cn, String key);
void certificationInventoryEOListSortByEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+31 -13
View File
@@ -232,7 +232,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(),
userIdList,
userInfoList,
projectCertificationInventoryEO.getEndTime()
projectCertificationInventoryEO.getEndTime(),""
);
}
}
@@ -260,7 +260,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE15.getValue(),
userIdList,
userInfoList,
projectCertificationInventoryEO.getEndTime()
projectCertificationInventoryEO.getEndTime(),""
);
// 如果责任人有变更，将之前责任人的待办中心任务，移交给新的责任人。
@@ -644,7 +644,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(),
userIdList,
userInfoList,
projectCertificationInventoryEO.getEndTime()
projectCertificationInventoryEO.getEndTime(),""
);
}
}
@@ -687,7 +687,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
String templeteId,
List<String> userIdList,
List<SysUser> userInfoList,
Date endTime){
Date endTime,
String taskDefinitionKey){
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
@@ -700,6 +701,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
if(StringUtils.isNotEmpty(taskDefinitionKey)){
hrefFeishu_CN_P = this.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,taskDefinitionKey);
}
Map<String, Object> standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS);
String standName = (String) standNameAndItemName.get("standName");
@@ -1863,7 +1867,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE24.getValue(),
dutyPersonIdList,
dutyPersonList,
projectCertificationInventoryEOList.get(0).getEndTime()
projectCertificationInventoryEOList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey()
);
}catch (Exception ex){
ex.printStackTrace();
@@ -1926,7 +1931,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE25.getValue(),
dutyPersonIdList,
dutyPersonList,
projectCertificationInventoryEOList.get(0).getEndTime()
projectCertificationInventoryEOList.get(0).getEndTime(),""
);
}catch (Exception ex){
ex.printStackTrace();
@@ -2048,7 +2053,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE23.getValue(),
certificationEngineerList,
certificationEngineers,
projectCertificationInventoryEOList.get(0).getEndTime()
projectCertificationInventoryEOList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_REVIEW.getKey()
);
}catch (Exception ex){
ex.printStackTrace();
@@ -2111,7 +2117,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
String hrefFeishu_CN_P = this.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,CertificationFlowNodeEnum.TASK_HANDLING.getKey());
Map<String, Object> standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOList);
String standName = (String) standNameAndItemName.get("standName");
@@ -2495,7 +2501,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
String hrefFeishu_CN_P = (String) hrefFeishuMap.get("hrefFeishu_CN_P");
//飞书手机跳转链接
String hrefFeishu_CN_P = this.handlePhoneLink(projectLibraryBase.getId(),PRN_CN,CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey());
Map<String, List<ProjectCertificationInventoryEO>> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson));
try {
@@ -2578,6 +2585,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
return Result.OK("发起任务成功！");
}
@Override
public String handlePhoneLink(String id, String prn_cn, String key) {
String hrefFeishu_CN_P = backUrlPhone
+ JumpLinkEnum.PRE_TASK_HANDING_PHONE.getLink() + "?isDisplay=false&projectLibraryId=" + id
+ "&projectName=" + prn_cn + "&taskDefinitionKey=" + key;
return hrefFeishu_CN_P;
}
/**
* 认证清单数据排序，根据截至时间顺序排序
* @param projectCertificationInventoryEOList
@@ -3212,7 +3227,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE17.getValue(),
userIdList,
userInfoList,
projectCertificationInventoryEOList.get(0).getEndTime()
projectCertificationInventoryEOList.get(0).getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey()
);
// 获取认证清单 - 飞书跳转链接
@@ -3442,7 +3458,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE16.getValue(),
userIdList,
dutyPersonList,
taskConfirmEndTime
taskConfirmEndTime,
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey()
);
}
@@ -3463,7 +3480,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(),
userIdList,
dutyPersonList,
toBeSubmitOrReturnPciEoList.get(0).getTaskConfirmEndTime()
toBeSubmitOrReturnPciEoList.get(0).getTaskConfirmEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey()
);
}
@@ -3606,7 +3624,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
//飞书手机跳转链接
String hrefFeishu_CN_P = backUrlPhone
+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink()+ "?keyWord=" + PRN_CN;
result.put("hrefFeishu_CN", URLUtil.encode(hrefFeishu_CN));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+74 -6
View File
@@ -46,6 +46,7 @@ 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;
import com.jero.modules.lawsOpinionGather.enums.LawsOpinionGatherNodeEnum;
import com.jero.modules.message.websocket.WebSocket;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
@@ -765,8 +766,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
todoCenterParams.put("projectNameCn", PRN_CN);
todoCenterParams.put("projectNameEn", PRN_EN);
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN", hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P", hrefFeishuMap.get("hrefFeishu_CN_P"));
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
@@ -870,6 +872,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
@@ -906,6 +909,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P", (String) hrefFeishuMap.get("hrefFeishu_CN_P"));
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
@@ -951,6 +955,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
@@ -995,6 +1000,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
@@ -1041,7 +1047,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
//处理手机端飞书消息跳转
String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
@@ -1081,6 +1089,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
//处理手机端飞书消息跳转
String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
params.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
@@ -1093,6 +1104,38 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
private String handlePhoneDesignLink(ProjectLawsInventoryEO projectLawsInventoryEO) {
String url = backUrlPhone + JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId());
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.SJFHXSHLC.getValue());
List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) {
String designPId = processInfoDetailEOS.get(0).getActiProcInstId();
url = backUrlPhone + JumpLinkEnum.TASK_HANDING_PHONE.getLink() + "?actiProcInstId=" + designPId + "&projectTaskInventoryId=" + projectLawsInventoryEO.getId()
+ "&projectLibraryId=" + projectLawsInventoryEO.getProjectLibraryId() + "&TaskKey=" + processInfoDetailEOS.get(0).getTaskDefinitionKey()
+ "&TaskKeyName=" + DesignComplianceFlowNodeKeyEnum.getTextByValue(processInfoDetailEOS.get(0).getTaskDefinitionKey(), CutEnum.CN.getValue())
+ "&isDisplay=false&flowType=2&Sponsor=regulationOwnerName&personLiable=designDutyIdName&typeOfDeliverables=designDeliverableTypeName&deliverableTemplate=designDeliverableTemplate&DueDate=designDueDate&remarks=designRemark";
}
return url;
}
private String handlePhoneVerifyLink(ProjectLawsInventoryEO projectLawsInventoryEO) {
String url = backUrlPhone + JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId, projectLawsInventoryEO.getId());
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.YZFHXSCLC.getValue());
List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
if (CollectionUtils.isNotEmpty(processInfoDetailEOS)) {
String verifyPId = processInfoDetailEOS.get(0).getActiProcInstId();
url = backUrlPhone + JumpLinkEnum.TASK_HANDING_PHONE.getLink() + "?actiProcInstId="+verifyPId+"&projectTaskInventoryId="+projectLawsInventoryEO.getId()
+"&projectLibraryId="+projectLawsInventoryEO.getProjectLibraryId()+"&TaskKey="+processInfoDetailEOS.get(0).getTaskDefinitionKey()
+"&TaskKeyName="+ VerifyComplianceFlowNodeKeyEnum.getTextByValue(processInfoDetailEOS.get(0).getTaskDefinitionKey(),CutEnum.CN.getValue())
+"&isDisplay=false&flowType=4&Sponsor=regulationOwnerName&personLiable=verifyDutyIdName&typeOfDeliverables=verifyDeliverableTypeName&deliverableTemplate=verifyDeliverableTemplate&DueDate=verifyDueDate&remarks=verifyRemark";
}
return url;
}
private void setProjectLawsInventoryPermission(String userId, String projectId, String lawsInventoryId, Date now, List<ProjectUserPermission> adds, String belong) {
QueryWrapper<ProjectUserPermission> del = new QueryWrapper<>();
del.eq("project_id", projectId)
@@ -3574,6 +3617,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String projectLawsInventoryId = (String) prarams.get("id");
ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId);
//处理手机端飞书消息跳转
String flowType = jsonObject.getString("flowType");
if(StringUtils.isNotEmpty(flowType)){
if("Design".equals(flowType)){
String hrefFeishu_CN_P = this.handlePhoneDesignLink(projectLawsInventoryEO);
prarams.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
}else if("Verify".equals(flowType)){
String hrefFeishu_CN_P = this.handlePhoneVerifyLink(projectLawsInventoryEO);
prarams.put("hrefFeishu_CN_P", hrefFeishu_CN_P);
}
}
String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
@@ -10643,6 +10698,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -10710,6 +10766,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -10776,6 +10833,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
@@ -10900,6 +10958,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -10967,6 +11026,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryId, todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
@@ -11033,6 +11093,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN", (String) hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN", (String) hrefFeishuMap.get("hrefFeishu_EN"));
params.put("hrefFeishu_CN_P",(String)hrefFeishuMap.get("hrefFeishu_CN_P"));
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
@@ -12092,7 +12153,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//飞书手机跳转链接
String hrefFeishu_CN_P = backUrlPhone
+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink();
+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink()+ "?keyWord=" + PRN_CN;
result.put("hrefFeishu_CN", URLUtil.encode(hrefFeishu_CN));
result.put("hrefFeishu_EN", URLUtil.encode(hrefFeishu_EN));
@@ -12117,8 +12178,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String hrefFeishu_EN = backUrl
+ JumpLinkEnum.FGRW_TO_DO_CENTER_LINK.getLink() + "?projectName=" + projectNameEn;
result.put("hrefFeishu_CN", hrefFeishu_CN);
result.put("hrefFeishu_EN", hrefFeishu_EN);
//飞书手机端跳转链接
String hrefFeishu_CN_P = backUrlPhone
+ JumpLinkEnum.TO_DO_CENTER_PHONE.getLink() + "?keyWord=" + projectNameCn;
result.put("hrefFeishu_CN", URLUtil.encode(hrefFeishu_CN));
result.put("hrefFeishu_EN", URLUtil.encode(hrefFeishu_EN));
result.put("hrefFeishu_CN_P",URLUtil.encode(hrefFeishu_CN_P));
return result;
}
@@ -12976,6 +13042,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
sendMsgJson.put("requestSource", RequestSourceEnum.WORK_FLOW.getValue());
sendMsgJson.put("operatorType", OperatorTypeEnum.SEND_MSG.getValue());
sendMsgJson.put("templateId", templateId);
sendMsgJson.put("flowType", "Design");
sendMsgJson.put("params", params);
this.processCall(sendMsgJson);
}
@@ -13086,6 +13153,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
sendMsgJson.put("requestSource", RequestSourceEnum.WORK_FLOW.getValue());
sendMsgJson.put("operatorType", OperatorTypeEnum.SEND_MSG.getValue());
sendMsgJson.put("templateId", templateId);
sendMsgJson.put("flowType", "Verify");
sendMsgJson.put("params", params);
this.processCall(sendMsgJson);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+1 -1
View File
@@ -472,7 +472,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
TemplateInfoEnum2.CERTIFICATION_MESSAGE13.getValue(),
originalCertificationEngineerIdList,
userInfoList,
projectCertificationInventoryEOList.get(0).getEndTime()
projectCertificationInventoryEOList.get(0).getEndTime(),""
);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+5 -2
View File
@@ -87,6 +87,8 @@ public class LawsWarnService {
private ISysUserService sysUserService;
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
@Autowired
private ISysAnnouncementService sysAnnouncementService;
@Resource
@@ -566,8 +568,8 @@ public class LawsWarnService {
for (String s : urlList) {
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
String encode = UriEncoder.encode(s);
String contentInfoFei = sysUser.getUsername() +" shared Regulation Early Warning infomation with you.";
String contentInfoFeiCn = sysUser.getUsername() +"向您分享了法规预警信息.";
String contentInfoFei = sysUser.getUsername() +" shared Regulation Early Warning infomation with you."+ "-Check on the PC";
String contentInfoFeiCn = sysUser.getUsername() +"向您分享了法规预警信息."+ "-请在PC端查看";
List<String> userIdListNew = userIdList;
mapList.stream().forEach(e->{
if(s.contains((String)e.get("id"))){
@@ -599,6 +601,7 @@ public class LawsWarnService {
params.put("contentInfoFeiEn",contentInfoFei);
params.put("userIdList",userIdListNew);
params.put("back_url",encode);
params.put("back_url_phone",backUrlPhone);
params.put("titleCn", " "+documentTitleCn);
params.put("titleEn"," "+documentTitleEn);
params.put("regulationNo"," "+serialNumber);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java
+11 -6
View File
@@ -56,6 +56,8 @@ public class TimedTaskWarn implements Job {
private SysUserMapper sysUserMapper;
@Value(value = "${jero.backUrl}")
private String backUrl;
@Value(value = "${jero.backUrlPhone}")
private String backUrlPhone;
/**
* 法规预警定时任务
@@ -106,6 +108,7 @@ public class TimedTaskWarn implements Job {
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
//跳转文档详情
String url = backUrl + "/docManage/library/detail?id=" + id;
String urlPhone = backUrlPhone + "/phoneDocumentDetails?id=" + id;
//订阅的用户
List<OnlCgformSubscribe> onlCgformSubscribe = subscribeList.stream().filter(e -> e.getDocumentId().equals(bussDocumentLibraryEO.getId())).collect(Collectors.toList());
List<String> userIdList = new ArrayList<>();
@@ -139,19 +142,19 @@ public class TimedTaskWarn implements Job {
// }
if(currentTime.equals(beforeTimeSixTen)){
//发送飞书消息(提前一年)
sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"1",userIdList);
sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"1",userIdList);
//站内消息
sendMessage(bussDocumentLibraryEO, userIdList,"1",sdf,href);
}
if(currentTime.equals(beforeTimeSix)){
//发送飞书消息(提前6个月)
sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"6",userIdList);
sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"6",userIdList);
//站内消息
sendMessage(bussDocumentLibraryEO, userIdList,"6",sdf,href);
}
if(currentTime.equals(xin1Che1Xing2Shi2Shi1Ri4Qi1Str)){
//发送飞书消息(当天)
sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"0",userIdList);
sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"0",userIdList);
//站内消息
sendMessage(bussDocumentLibraryEO, userIdList,"0",sdf,href);
}
@@ -178,19 +181,19 @@ public class TimedTaskWarn implements Job {
}
if(currentTime.equals(beforeTimeSixTen)){
//发送飞书消息(提前一年)
sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"1",userIdList);
sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"1",userIdList);
//站内消息
sendMessage(bussDocumentLibraryEO, userIdList,"1",sdf,href);
}
if(currentTime.equals(beforeTimeSix)){
//发送飞书消息(提前6个月)
sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"6",userIdList);
sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"6",userIdList);
//站内消息
sendMessage(bussDocumentLibraryEO, userIdList,"6",sdf,href);
}
if(currentTime.equals(implementTimeStr)){
//发送飞书消息(当天)
sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"0",userIdList);
sendFeishu(sdf, bussDocumentLibraryEO, url, urlPhone,thirdIdList,"0",userIdList);
//站内消息
sendMessage(bussDocumentLibraryEO, userIdList,"0",sdf,href);
}
@@ -201,6 +204,7 @@ public class TimedTaskWarn implements Job {
private void sendFeishu(SimpleDateFormat sdf,
BussDocumentLibraryEO bussDocumentLibraryEO,
String url,
String urlPhone,
List<String> thirdIdList,
String flag,
List<String> userIdList) {
@@ -241,6 +245,7 @@ public class TimedTaskWarn implements Job {
params.put("contentInfoFeiEn",contentEn);
params.put("userIdList",userIdList);
params.put("back_url",url);
params.put("back_url_phone",urlPhone);
params.put("titleCn", " "+ bussDocumentLibraryEO.getTitle());
params.put("titleEn", " "+ bussDocumentLibraryEO.getTitleEn());
params.put("regulationNo", " "+ bussDocumentLibraryEO.getSerialNumber());