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() {
			//获取任务信息
			@@ -307,23 +308,15 @@
			* @return
			*/
			public boolean isDateToday(Date date) {
			//如果给的日期小于当前日期，也直接发送
			LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
			if (localDateTime.isBefore(LocalDateTime.now())) {
			return true;
			if (date == null) {
			return false;
			}
			// 获取当前日期
			Calendar calendarNow = Calendar.getInstance();
			int todayYear = calendarNow.get(Calendar.YEAR);
			int todayMonth = calendarNow.get(Calendar.MONTH);
			int todayDay = calendarNow.get(Calendar.DAY_OF_MONTH);

			// 创建一个 Calendar 实例用于检查的日期
			Calendar calendarToCheck = Calendar.getInstance();
			calendarToCheck.setTime(date);

			// 比较年、月和日
			return (calendarToCheck.get(Calendar.YEAR) == todayYear && calendarToCheck.get(Calendar.MONTH) == todayMonth && calendarToCheck.get(Calendar.DAY_OF_MONTH) == todayDay);
			// 将 Date 转为 LocalDate
			LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
			// 获取今天的 LocalDate
			LocalDate today = LocalDate.now();
			// 如果日期早于或等于今天，返回 true
			return !localDate.isAfter(today);
			}

			public void sfHandlle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
			@@ -342,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());
			@@ -359,7 +361,7 @@
			serviceSubtask.setRemark("手机号为空");
			serviceSubtask.setSendstate(4L);
			serviceSubtask.setResult("error");
			serviceSubtask.setFinishtime(new Date());
			// serviceSubtask.setFinishtime(new Date());
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
			continue;
			}
			@@ -392,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("纸质")) {
			//纸质
			@@ -439,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) {
			@@ -454,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;
			}
			@@ -492,7 +496,7 @@
			ss.setRemark("短信发送失败,该机构没有配置短信地址");
			ss.setSendstate(5L);
			ss.setId(serviceSubtask.getId());
			ss.setFinishtime(new Date());
			// ss.setFinishtime(new Date());
			serviceSubtaskMapper.updateServiceSubtask(ss);
			continue;
			}
			@@ -535,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 {
			@@ -558,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;
			}
			@@ -575,7 +580,7 @@
			ss.setRemark("该机构的公众号配置信息不全，无法通过公众号发送");
			ss.setSendstate(5L);
			ss.setId(serviceSubtask.getId());
			ss.setFinishtime(new Date());
			// ss.setFinishtime(new Date());
			serviceSubtaskMapper.updateServiceSubtask(ss);
			continue;
			}
			@@ -586,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;
			}
			@@ -610,7 +615,7 @@
			if ((Boolean) map.get("succ") == true) {
			serviceSubtask.setResult("success");
			} else {
			log.error("serviceSubtask1231313的值为：{}",serviceSubtask);
			log.error("serviceSubtask1231313的值为：{}", serviceSubtask);
			serviceSubtask.setResult("error");
			serviceSubtask.setSendstate(5L);
			serviceSubtask.setRemark(map.get("msg").toString());
			@@ -622,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);
			}