| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -33,6 +33,7 @@ import com.epmet.commons.tools.utils.Result; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.commons.tools.utils.ScanContentUtils; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.constant.ParameterKeyConstant; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.constant.ProjectConstant; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.constant.SmsTemplateConstant; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.constant.UserMessageConstant; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.dao.ProjectDao; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import com.epmet.dao.ProjectOrgRelationDao; | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -629,6 +630,23 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							if (!result.success()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								logger.error("项目退回成功,发送微信订阅消息失败" + JSON.toJSONString(result)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//短信消息
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<ProjectSendMsgFormDTO> smsList = new ArrayList<>(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							CustomerStaffDTO staffDTO = new CustomerStaffDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							staffDTO.setUserId(projectStaffDTO.getStaffId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							Result<CustomerStaffDTO> staffResult = epmetUserFeignClient.getCustomerStaffInfoByUserId(staffDTO); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							if (staffResult.success() && null != staffResult.getData()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								sms.setCustomerId(staffResult.getData().getCustomerId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								sms.setMobile(staffResult.getData().getMobile()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								smsList.add(sms); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							result = epmetMessageOpenFeignClient.projectSendMsg(smsList); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							if (!result.success()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								logger.error("项目退回,发送手机短信失败" + JSON.toJSONString(result)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						@Override | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -855,6 +873,24 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							issueProjectResultDTO.setOrgName(processEntity.getDepartmentName()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							issueProjectResultDTO.setShiftedTime(projectEntity.getCreatedTime()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//短信消息
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<ProjectSendMsgFormDTO> smsList = new ArrayList<>(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							staffList.forEach(staff -> { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								CustomerStaffDTO staffDTO = new CustomerStaffDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								staffDTO.setUserId(staff.getStaffId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								Result<CustomerStaffDTO> staffDTOResult = epmetUserFeignClient.getCustomerStaffInfoByUserId(staffDTO); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								if (staffDTOResult.success() && null != staffDTOResult.getData()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									sms.setCustomerId(staffDTOResult.getData().getCustomerId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									sms.setMobile(staffDTOResult.getData().getMobile()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									smsList.add(sms); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							}); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							Result result = epmetMessageOpenFeignClient.projectSendMsg(smsList); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							if (!result.success()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								logger.error("项目吹哨,发送手机短信失败" + JSON.toJSONString(result)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							return issueProjectResultDTO; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						} | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -1242,6 +1278,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<UserMessageFormDTO> msgList = new ArrayList<>(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//10.29 项目滞留提醒添加推送微信消息  sun
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<WxSubscribeMessageFormDTO> wxmpMsgList = new ArrayList<>(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//短信消息
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<ProjectSendMsgFormDTO> smsList = new ArrayList<>(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							list.forEach(dto -> { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								String title; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								String msg; | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -1291,6 +1329,18 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								wxmp.setMessageTime(new Date()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								wxmp.setGridId(StrConstant.STAR); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								wxmpMsgList.add(wxmp); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								//短信消息
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								CustomerStaffDTO staffDTO = new CustomerStaffDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								staffDTO.setUserId(dto.getStaffId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								Result<CustomerStaffDTO> staffDTOResult = epmetUserFeignClient.getCustomerStaffInfoByUserId(staffDTO); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								if (staffDTOResult.success() && null != staffDTOResult.getData()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									sms.setCustomerId(staffDTOResult.getData().getCustomerId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									sms.setMobile(staffDTOResult.getData().getMobile()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_OVERDUE); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									smsList.add(sms); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							}); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							messageFeignClient.saveUserMessageList(msgList); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							logger.info("项目滞留提醒,开始推送微信订阅消息"); | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -1298,6 +1348,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							if (!result.success()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								logger.error("项目滞留提醒,发送微信订阅消息失败" + JSON.toJSONString(result)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							result = epmetMessageOpenFeignClient.projectSendMsg(smsList); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							if (!result.success()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								logger.error("项目滞留提醒,发送手机短信失败" + JSON.toJSONString(result)); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |