~liusheng/smartor.git

			@@ -18,6 +18,7 @@
			import com.ruoyi.common.utils.http.HttpUtils;
			import com.smartor.common.SendService;
			import com.smartor.domain.*;
			import com.smartor.mapper.ServiceSubtaskMapper;
			import com.smartor.mapper.ServiceTaskMapper;
			import com.smartor.mapper.SysUserImportMapper;
			import com.smartor.service.*;
			@@ -94,7 +95,7 @@
			private ServiceTaskMapper serviceTaskMapper;

			@Autowired
			private SendService sendService;
			private ServiceSubtaskMapper serviceSubtaskMapper;

			@Autowired
			private RedisCache redisCache;
			@@ -286,55 +287,69 @@
			ivrTaskcall.setSendstate(2L);
			List<ServiceSubtask> selectServiceSubtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
			if (descByCode.equals("电话")) {
			String value = "";
			for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
			ServiceTask ivrTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
			if (ivrTask.getSendState() != null && ivrTask.getSendState() == 3 \|\| ivrTask.getSendState() != null && ivrTask.getSendState() == 4) {
			//如何任务被“暂停”或“终止”
			break;
			}
			//获取到value值最少的key
			String key = getKey();
			if (commonTaskcallMQ.getSendType().equals("2")) {
			//说明是立即发送
			String value = redisCache.getCacheObject("cache-0");
			ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
			serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
			List<ServiceSubtask> selectServiceSubtaskList1 = iServiceSubtaskService.selectServiceSubtaskList(serviceSubtask1);
			for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
			if (StringUtils.isEmpty(value)) {
			value = "," + serviceSubtask2.getId().toString() + ",";
			} else {
			value = value + "," + serviceSubtask2.getId().toString() + ",";
			boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
			//说明是立即发送(先把消息放到cache-0中， displayNo不知道怎么配置)
			if (dateToday) {
			try {
			ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
			serviceSubtask1.setTaskid(ivrTask.getTaskid());
			List<ServiceSubtask> selectServiceSubtaskList1 = iServiceSubtaskService.selectServiceSubtaskList(serviceSubtask1);
			for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
			if (StringUtils.isEmpty(value)) {
			value = "," + serviceSubtask2.getId().toString() + ",";
			} else {
			if (!value.contains("," + serviceSubtask2.getId().toString()))
			value = value + "," + serviceSubtask2.getId().toString() + ",";
			}
			}
			} catch (Exception e) {
			String guid = UUID.randomUUID().toString();
			log.error("长期任务，电话发送失败原因：{},{}", e.getMessage(), guid);
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark("系统错误");
			serviceSubtask.setSendstate(3L);
			serviceSubtask.setFinishtime(new Date());
			serviceSubtask.setGuid(guid);
			iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
			}
			redisCache.setCacheObject("cache-0", value);
			} else {
			//非立即发送
			String value = redisCache.getCacheObject(key);
			ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
			serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
			List<ServiceSubtask> selectServiceSubtaskList1 = iServiceSubtaskService.selectServiceSubtaskList(serviceSubtask1);
			for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
			if (StringUtils.isEmpty(value)) {
			value = "," + serviceSubtask2.getId().toString() + ",";
			} else {
			value = value + "," + serviceSubtask2.getId().toString() + ",";
			}
			}
			redisCache.setCacheObject(key, value);

			//在子任务表里记录一下
			String uuid = UUID.randomUUID().toString();
			serviceSubtask.setResult("success");
			serviceSubtask.setRemark("电话发送成功");
			serviceSubtask.setGuid(uuid);
			serviceSubtask.setSendstate(3L);
			serviceSubtask.setFinishtime(new Date());
			serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);

			//任务发送记录
			ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
			serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
			serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
			serviceSubtaskRecord.setUuid(uuid);
			serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
			serviceSubtaskRecord.setPreachform("3");
			serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
			serviceSubtaskRecord.setRemark("电话发送成功");
			serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);

			}

			//任务发送记录（这个代码应该写在phoneTask中，先写在这，后面再改）
			ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
			serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
			serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
			serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
			serviceSubtaskRecord.setPreachform("3");
			serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
			serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);

			// //通过多线程的方式去打电话
			// //通过多线程的方式去打电话（这个是上海的方法）
			// executorService.submit(new PhoneTask(serviceSubtask, ivrTaskTemplateVO1, redisCache, sendService, phonePath, robotPhoneUtils));
			}
			//将要执行的放到缓存中
			String cache0 = redisCache.getCacheObject("cache-0");
			if (StringUtils.isNotEmpty(cache0)) {
			redisCache.setCacheObject("cache-0", cache0 + value);
			} else if (StringUtils.isEmpty(cache0) && StringUtils.isNotEmpty(value)) {
			redisCache.setCacheObject("cache-0", value);
			}
			} else if (descByCode.equals("多媒体")) {
			//多媒体
			@@ -403,7 +418,7 @@
			iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
			} catch (Exception e) {
			String guid = UUID.randomUUID().toString();
			log.error("长期任务，发送失败原因：{},{}", e.getMessage(), guid);
			log.error("长期任务，短信发送失败原因：{},{}", e.getMessage(), guid);
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark("系统错误");
			serviceSubtask.setSendstate(5L);
			@@ -464,7 +479,7 @@
			iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
			} catch (Exception e) {
			String guid = UUID.randomUUID().toString();
			log.error("长期任务，发送失败原因：{},{}", e.getMessage(), guid);
			log.error("长期任务，公众号发送失败原因：{},{}", e.getMessage(), guid);
			serviceSubtask.setResult("error");
			serviceSubtask.setRemark("系统错误");
			serviceSubtask.setSendstate(5L);