From e841dfe0368dc815fc2c77258ff31a4aa9264e65 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Tue, 25 Oct 2022 17:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=B6=88=E6=81=AF(=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=B6=88=E6=81=AF=E6=B2=A1=E5=86=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 180 +++++++++++++++---
 1 file changed, 150 insertions(+), 30 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 7e9ba3277..07ed93543 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1280,13 +1280,103 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					|| CollectManifestStateEnum.CERT_BACK.getValue().equals(paramsCollectManifestEO.getState())) {
 
 				updateEO.setState(String.valueOf(Integer.parseInt(paramsCollectManifestEO.getState()) - 2)); // 设置对应状态
-
 			} else {
 				updateEO.setState(String.valueOf(Integer.parseInt(paramsCollectManifestEO.getState()) + 1)); // 设置对应状态
 			}
 			updateEOList.add(updateEO);
 		}
-		return updateBatchById(updateEOList);
+		boolean update = updateBatchById(updateEOList);
+		if (update) {
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
+			//飞书
+			for (ParamsCollectManifestEO paramsCollectManifestEO : updateEOList) {
+				paramsCollectManifestEO = getById(paramsCollectManifestEO.getId());
+				ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsCollectManifestEO.getParamsManifestId());
+				//日期
+				String deadline = new SimpleDateFormat("yyyy-MM-dd").format(paramsCollectManifestEO.getDeadline());
+				//项目名称
+				ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(paramsManifestEO.getProjectId()); // 获取项目信息
+				//url
+				String urlParamsStr = parseUrlParams(paramsManifestEO);
+				String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+				//认证工程师
+				String[] engThirdIds = new String[1];
+				List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseMapper.queryById(paramsManifestEO.getProjectId());
+				if (ObjectUtils.isNotEmpty(projectLibraryBases)) {
+					SysUser engineer = sysUserService.getById(projectLibraryBases.get(0).getCertificationEngineer());
+					if (ObjectUtils.isNotEmpty(engineer)) {
+						engThirdIds[0] = engineer.getThirdId();
+					}
+
+				}
+				if (CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())) {
+					//通知认证工程师
+					try {
+						FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+						feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+						feishuMsgVo.setCnContentUpper("您好，"+ currentUser.getUsername() +"退回了参数NIO-"+ paramsCollectManifestEO.getNioNumber() +"，请及时处理");
+						feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+								"\n发起人: " + currentUser.getUsername() +
+								"\n截止时间: " + deadline);
+						feishuMsgVo.setEnContentUpper("Hello! "+ currentUser.getUsername() +" has returned the Parameter NIO-"+ paramsCollectManifestEO.getNioNumber() +". Please address it in a timely manner");
+						feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+								"\nInitiator: " + currentUser.getUsername() +
+								"\nDue Date: " + deadline);
+						feishuMsgVo.setUrl(hrefFeishu);
+						feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色
+						feishuService.sendCard(engThirdIds, feishuMsgVo);
+					} catch (IOException e) {
+						log.error("飞书消息推送失败");
+					}
+				} else if (CollectManifestStateEnum.DRE_BACK.getValue().equals(paramsCollectManifestEO.getState())) {
+
+					//通知认证工程师
+					try {
+						FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+						feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+						feishuMsgVo.setCnContentUpper("您好，"+ currentUser.getUsername() +"申请撤回参数NIO-"+ paramsCollectManifestEO.getNioNumber() +"，请及时处理");
+						feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+								"\n发起人: " + currentUser.getUsername() +
+								"\n截止时间: " + deadline);
+						feishuMsgVo.setEnContentUpper("Hello! "+ currentUser.getUsername() +" requested for withdrawing Parameter NIO-"+ paramsCollectManifestEO.getNioNumber() +". Please address it in a timely manner");
+						feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+								"\nInitiator: " + currentUser.getUsername() +
+								"\nDue Date: " + deadline);
+						feishuMsgVo.setUrl(hrefFeishu);
+						feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色
+						feishuService.sendCard(engThirdIds, feishuMsgVo);
+					} catch (IOException e) {
+						log.error("飞书消息推送失败");
+					}
+					//通知工程接口人
+					SysUser sdtUser = sysUserService.getUserByName(paramsCollectManifestEO.getSdt());
+					String[] SdtThirdIds = new String[1];
+					if (ObjectUtils.isNotEmpty(sdtUser)) {
+						SdtThirdIds[0] = sdtUser.getThirdId();
+					}
+					try {
+						FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+						feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+						feishuMsgVo.setCnContentUpper("您好，"+ currentUser.getUsername() +"退回了参数NIO-"+ paramsManifestEO.getTitle() +"，请及时处理");
+						feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+								"\n发起人: " + currentUser.getUsername() +
+								"\n截止时间: " + deadline);
+						feishuMsgVo.setEnContentUpper("Hello! "+ currentUser.getUsername() +" has returned the Parameter NIO-"+ paramsManifestEO.getTitle() +". Please address it in a timely manner");
+						feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+								"\nInitiator: " + currentUser.getUsername() +
+								"\nDue Date: " + deadline);
+						feishuMsgVo.setUrl(hrefFeishu);
+						feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色
+						feishuService.sendCard(engThirdIds, feishuMsgVo);
+					} catch (IOException e) {
+						log.error("飞书消息推送失败");
+					}
+
+				}
+
+			}
+		}
+		return update;
 	}
 
 	@Override
@@ -1439,13 +1529,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		thirdIds[0] = sysUser.getThirdId();
 		String urlParamsStr = parseUrlParams(paramsManifestEO);
 		String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
-		String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
-		String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
-		String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
-		String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete";
+		//String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
+		//String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
+		//String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
+		//String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete";
 
 		// 发送系统消息
-		SysAnnouncement sysAnnouncement  = new SysAnnouncement();
+		/*SysAnnouncement sysAnnouncement  = new SysAnnouncement();
 		sysAnnouncement.setDelFlag("0");
 		sysAnnouncement.setSendStatus("0");
 		sysAnnouncement.setSendTime(new Date());
@@ -1462,10 +1552,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
 		obj.put(WebsocketConst.MSG_ID, paramsManifestId);
 		obj.put(WebsocketConst.MSG_TXT, contentInfo);
-		webSocket.sendMessage(obj.toJSONString());
+		webSocket.sendMessage(obj.toJSONString());*/
 
 		// 发送飞书消息
-		try {
+		/*try {
 			FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 			feishuMsgVo.setTitle(MessageTypeEnum.HOMO_TASK.getName());
 			feishuMsgVo.setContent(content);
@@ -1477,6 +1567,23 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			feishuService.sendCardMsg(thirdIds, feishuMsgVo);
 		} catch (IOException e) {
 			log.error("飞书消息推送失败");
+		}*/
+		try {
+			FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+			feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+			feishuMsgVo.setCnContentUpper("您好，"+ currentUser.getUsername() +"向您分发了认证参数填写任务，请及时处理。");
+			feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+					"\n发起人: " + currentUser.getUsername() +
+					"\n截止时间: " + sdf.format(deadline));
+			feishuMsgVo.setEnContentUpper("Hello! "+ currentUser.getUsername() +" has assigned the task of filling in Homo Parameter to you. Please address it in a timely manner.");
+			feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+					"\nInitiator: " + currentUser.getUsername() +
+					"\nDue Date: " + sdf.format(deadline));
+			feishuMsgVo.setUrl(hrefFeishu);
+			feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+			feishuService.sendCard(thirdIds, feishuMsgVo);
+		} catch (IOException e) {
+			log.error("飞书消息推送失败");
 		}
 
 		return isSuccess;
@@ -1593,7 +1700,23 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				 webSocket.sendMessage(obj.toJSONString());*/
 
 				// 发送飞书消息
-				sendFeishuMsg(deadline, currentUser, projectInfo, sdf, thirdIds, hrefFeishu);
+				try {
+					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+					feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+					feishuMsgVo.setCnContentUpper("您好，请及时分配参数填写人");
+					feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+							"\n发起人: " + currentUser.getUsername() +
+							"\n截止时间: " + sdf.format(deadline));
+					feishuMsgVo.setEnContentUpper("Hello! Please assign the task of filling in Homo Parameter in a timely manner");
+					feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+							"\nInitiator: " + currentUser.getUsername() +
+							"\nDue Date: " + sdf.format(deadline));
+					feishuMsgVo.setUrl(hrefFeishu);
+					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+					feishuService.sendCard(thirdIds, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
 			}
 		}
 
@@ -1714,32 +1837,29 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				webSocket.sendMessage(obj.toJSONString());*/
 
 				// 发送飞书消息
-				sendFeishuMsg(deadline, currentUser, projectInfo, sdf, thirdIds, hrefFeishu);
+				try {
+					FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
+					feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
+					feishuMsgVo.setCnContentUpper("您好，请及时分配参数填写人");
+					feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
+							"\n发起人: " + currentUser.getUsername() +
+							"\n截止时间: " + sdf.format(deadline));
+					feishuMsgVo.setEnContentUpper("Hello! Please assign the task of filling in Homo Parameter in a timely manner");
+					feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
+							"\nInitiator: " + currentUser.getUsername() +
+							"\nDue Date: " + sdf.format(deadline));
+					feishuMsgVo.setUrl(hrefFeishu);
+					feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
+					feishuService.sendCard(thirdIds, feishuMsgVo);
+				} catch (IOException e) {
+					log.error("飞书消息推送失败");
+				}
 			}
 		}
 
 		return getMsgOfIssueCollection(msgMapList, cut, "1");
 	}
 
-	private void sendFeishuMsg(Date deadline, LoginUser currentUser, ParamsManifestVO projectInfo, SimpleDateFormat sdf, String[] thirdIds, String hrefFeishu) {
-		try {
-			FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
-			feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
-			feishuMsgVo.setCnContentUpper("您好，请及时分配参数填写人");
-			feishuMsgVo.setCnContentLower("项目: " + projectInfo.getProjectName() +
-					"\n发起人: " + currentUser.getUsername() +
-					"\n截止时间: " + sdf.format(deadline));
-			feishuMsgVo.setEnContentUpper("Hello! Please assign the task of filling in Homo Parameter in a timely manner");
-			feishuMsgVo.setEnContentLower("Project: " + projectInfo.getProjectName() +
-					"\nInitiator: " + currentUser.getUsername() +
-					"\nDue Date: " + sdf.format(deadline));
-			feishuMsgVo.setUrl(hrefFeishu);
-			feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
-			feishuService.sendCard(thirdIds, feishuMsgVo);
-		} catch (IOException e) {
-			log.error("飞书消息推送失败");
-		}
-	}
 
 	private List<String> getMsgOfIssueCollection(List<Map<String, String>> msgMapList, String cut, String operation) {
 		List<String> msgList = new ArrayList<>();