smartor.git - Gitblit

			@@ -24,6 +24,7 @@
			import com.ruoyi.system.service.ISysConfigService;
			import com.smartor.common.LSHospTokenUtil;
			import com.smartor.domain.*;
			import com.smartor.domain.entity.ServiceSubtaskEntity;
			import com.smartor.mapper.*;
			import com.smartor.service.IBaseSmsaccountService;
			import com.smartor.service.IServiceOutPathService;
			@@ -117,9 +118,6 @@
			@Autowired
			private ISysConfigService configService;

			// 创建固定大小的线程池
			private static final ExecutorService executorService = Executors.newFixedThreadPool(10);

			public RedisMqReceiver(RedisMessageListenerContainer listenerContainer) {
			super(listenerContainer);
			}
			@@ -151,12 +149,12 @@
			ServiceTask serviceTask = new ServiceTask();
			serviceTask.setTaskid(Long.valueOf(commonTaskcallMQ.getTaskid()));

			//在问卷中，选中某个选项要进行服务补偿时，只是借用该服务的外壳，不对该服务有任务影响
			if (commonTaskcallMQ.getUpdateSendstate() == null \|\| commonTaskcallMQ.getUpdateSendstate() == 1) {
			serviceTask.setSendState(5L);
			serviceTask.setFail(1L);
			serviceTaskMapper.updateServiceTask(serviceTask);
			}
			// //在问卷中，选中某个选项要进行服务补偿时，只是借用该服务的外壳，不对该服务有任务影响
			// if (commonTaskcallMQ.getUpdateSendstate() == null \|\| commonTaskcallMQ.getUpdateSendstate() == 1) {
			// serviceTask.setSendState(5L);
			// serviceTask.setFail(1L);
			// serviceTaskMapper.updateServiceTask(serviceTask);
			// }
			} catch (Exception e) {
			Integer integer = redisCache.getCacheObject(commonTaskcallMQ.getTaskid().toString());
			if (integer != null && integer == 3) {
			@@ -177,7 +175,7 @@
			}

			/**
			* 任务处理
			* 任务处理单次随访
			*
			* @param commonTaskcallMQ
			*/
			@@ -187,7 +185,7 @@
			ServiceTask ivrTask1 = ivrTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());

			//通过任务ID拿到患者信息
			ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
			ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
			serviceSubtaskVO.setTaskid(commonTaskcallMQ.getTaskid());
			serviceSubtaskVO.setSendstate(2L);
			List<ServiceSubtask> selectServiceSubtaskList = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtaskVO);
			@@ -653,7 +651,7 @@
			serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);

			} else if (descByCode.equals("人工")) {
			setFailPreachForm(serviceSubtask, sendPreachform, "人工待执行", "2");
			setFailPreachForm(serviceSubtask, sendPreachform, "人工超时", "7");
			} else if (descByCode.equals("微信小程序")) {
			setFailPreachForm(serviceSubtask, sendPreachform, "微信小程序待执行", "2");
			}
			@@ -720,10 +718,13 @@
			serviceSubtaskPreachforms = serviceSubtaskPreachformList;
			}


			// 情况1：currentPreachform为空，取sort为1的preachform
			if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())) {
			return serviceSubtaskPreachforms.stream().filter(item -> item.getSort() == 1L).map(ServiceSubtaskPreachform::getPreachform).findFirst().orElse(null);
			String firstPreachform = serviceSubtaskPreachforms.stream().filter(item -> item.getSort() == 1L).map(ServiceSubtaskPreachform::getPreachform).findFirst().orElse(null);
			serviceSubtaskPreachform.setPreachform(firstPreachform);
			serviceSubtaskPreachform.setCurrentSendTime(new Date());
			serviceSubtaskPreachformMapper.updateSSPByCondition(serviceSubtaskPreachform);
			return firstPreachform;
			}

			// 情况2：currentPreachform不为空，找下一个sort
			@@ -738,6 +739,7 @@
			if (allSendStateNot1AndNot9) {
			//说明全发送失败了
			serviceSubtask.setSendstate(5L);
			serviceSubtask.setRemark("-----getSendPreachform,发送方式全部失败");
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
			}
			return "-1";
			@@ -799,6 +801,7 @@
			serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
			serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
			serviceSubtaskPreachform.setSendstate(failSendstate);
			serviceSubtaskPreachform.setCurrentSendTime(new Date());
			if (serviceSubtask.getType().equals("3") \|\| serviceSubtask.getType().equals("4")) {
			//如果是宣教或通知，并且发送成功，直接将发送状态改成9
			if (failSendstate.equals("2")) serviceSubtaskPreachform.setSendstate("9");
			@@ -842,6 +845,12 @@
			if (failSendstate.equals("4") \|\| failSendstate.equals("5")) {
			serviceSubtask.setCurrentPreachform(preachform);
			serviceSubtask.setSendstate(5L);
			serviceSubtask.setRemark("setFailPreachForm方法当前的preachform已经是最后一个了，全部执行失败");
			//人工发送超时
			if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")){
			serviceSubtask.setSendstate(7L);
			serviceSubtask.setRemark("人工发送超时");
			}
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
			return true;
			}
			@@ -855,6 +864,11 @@
			serviceSubtask.setCurrentPreachform(preachform);
			serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime(), serviceSubtask.getCurrentPreachform()));
			serviceSubtask.setSendstate(3L);
			//人工发送超时
			if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")){
			serviceSubtask.setSendstate(7L);
			serviceSubtask.setRemark("人工发送超时");
			}
			if (serviceSubtask.getType().equals("3") \|\| serviceSubtask.getType().equals("4")) {
			//如果是宣教或通知，并且发送成功，则直接将serviceSubtask状态改成6L（这个患者是没有题做的，不会再触发接口进行状态修改）
			if (failSendstate.equals("2")) {