smartor.git - Gitblit

			@@ -10,6 +10,7 @@
			import com.ruoyi.common.core.redis.RedisCache;
			import com.ruoyi.common.enums.MsgLSEnum;
			import com.ruoyi.common.enums.ServiceFromEnum;
			import com.ruoyi.common.enums.VisitSendStateEnum;
			import com.ruoyi.common.enums.WxGZHEnum;
			import com.ruoyi.common.exception.base.BaseException;
			import com.ruoyi.common.utils.HttpUtil;
			@@ -282,7 +283,7 @@


			/**
			* 长期任务执行（电话）
			* 长期任务执行
			*/
			public void longTaskSend() {
			//获取任务信息
			@@ -334,6 +335,15 @@
			ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
			ivrTaskcall.setSendstate(2L);
			List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
			//丽水有的医院还没法做长期任务随访
			List<ServiceSubtask> subtaskList2 = new ArrayList<>();
			if (visitHosp == 2) {
			for (ServiceSubtask serviceSubtask : subtaskList) {
			Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
			if (b) subtaskList2.add(serviceSubtask);
			}
			subtaskList = subtaskList2;
			}

			// 按照 endtime 离当前时间最近的排序
			List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
			@@ -351,7 +361,7 @@
			serviceSubtask.setRemark("手机号为空");
			serviceSubtask.setSendstate(4L);
			serviceSubtask.setResult("error");
			serviceSubtask.setFinishtime(new Date());
			// serviceSubtask.setFinishtime(new Date());
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
			continue;
			}
			@@ -384,7 +394,8 @@
			// redisCache.setCacheListLeft("cache-0", list);
			redisCache.setCacheListLeftAndDistinct("cache-0", list);
			}
			} else if (descByCode.equals("多媒体")) {
			}
			else if (descByCode.equals("多媒体")) {
			//多媒体
			} else if (descByCode.equals("纸质")) {
			//纸质
			@@ -431,7 +442,8 @@
			serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
			}
			}
			} else if (descByCode.equals("短信")) {
			}
			else if (descByCode.equals("短信")) {
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
			for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
			@@ -446,7 +458,7 @@
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark(patArchive.getNotrequiredreason());
			serviceSubtask.setSendstate(4L);
			serviceSubtask.setFinishtime(new Date());
			// serviceSubtask.setFinishtime(new Date());
			iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
			continue;
			}
			@@ -484,7 +496,7 @@
			ss.setRemark("短信发送失败,该机构没有配置短信地址");
			ss.setSendstate(5L);
			ss.setId(serviceSubtask.getId());
			ss.setFinishtime(new Date());
			// ss.setFinishtime(new Date());
			serviceSubtaskMapper.updateServiceSubtask(ss);
			continue;
			}
			@@ -527,19 +539,20 @@
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark("系统错误");
			serviceSubtask.setSendstate(5L);
			serviceSubtask.setFinishtime(new Date());
			// serviceSubtask.setFinishtime(new Date());
			serviceSubtask.setGuid(guid);
			iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
			}
			}
			}
			} else if (descByCode.equals("公众号")) {
			}
			else if (descByCode.equals("公众号")) {
			log.error("公众号进来了吗？{}", descByCode);
			//公众号
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
			for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
			log.error("serviceSubtask---------进来了吗？{}", serviceSubtask);
			// log.error("serviceSubtask---------进来了吗？{}", serviceSubtask);
			boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
			if (dateToday) {
			try {
			@@ -550,7 +563,7 @@
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark(patArchive.getNotrequiredreason());
			serviceSubtask.setSendstate(4L);
			serviceSubtask.setFinishtime(new Date());
			// serviceSubtask.setFinishtime(new Date());
			iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
			continue;
			}
			@@ -567,7 +580,7 @@
			ss.setRemark("该机构的公众号配置信息不全，无法通过公众号发送");
			ss.setSendstate(5L);
			ss.setId(serviceSubtask.getId());
			ss.setFinishtime(new Date());
			// ss.setFinishtime(new Date());
			serviceSubtaskMapper.updateServiceSubtask(ss);
			continue;
			}
			@@ -578,7 +591,7 @@
			ss.setRemark("公众号发送失败,his系统的患者id为空");
			ss.setSendstate(5L);
			ss.setId(serviceSubtask.getId());
			ss.setFinishtime(new Date());
			// ss.setFinishtime(new Date());
			serviceSubtaskMapper.updateServiceSubtask(ss);
			continue;
			}
			@@ -614,7 +627,7 @@
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark("系统错误");
			serviceSubtask.setSendstate(5L);
			serviceSubtask.setFinishtime(new Date());
			// serviceSubtask.setFinishtime(new Date());
			serviceSubtask.setGuid(guid);
			iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
			}