smartor.git - Gitblit

			@@ -15,7 +15,10 @@
			import com.smartor.domain.*;
			import com.smartor.mapper.ServiceSubtaskMapper;
			import com.smartor.mapper.ServiceTaskMapper;
			import com.smartor.service.*;
			import com.smartor.service.IBaseSmsaccountService;
			import com.smartor.service.IServiceOutPathService;
			import com.smartor.service.IServiceSubtaskRecordService;
			import com.smartor.service.ISvyTaskTemplateService;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.collections4.CollectionUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -25,9 +28,6 @@
			import org.springframework.data.redis.listener.RedisMessageListenerContainer;
			import org.springframework.stereotype.Component;

			import java.math.BigInteger;
			import java.net.URLEncoder;
			import java.nio.charset.StandardCharsets;
			import java.time.LocalDateTime;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			@@ -211,7 +211,8 @@
			list.add(serviceSubtask2.getId().toString());
			}
			log.error("缓存中cache-0的值为：{}", list);
			redisCache.setCacheList("cache-0", list);
			// redisCache.setCacheListLeft("cache-0", list);
			redisCache.setCacheListLeftAndDistinct("cache-0", list);
			} else {
			//非立即发送
			ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
			@@ -221,7 +222,8 @@
			for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
			list.add(serviceSubtask2.getId().toString());
			}
			redisCache.setCacheList(key, list);
			// redisCache.setCacheListLeft(key, list);
			redisCache.setCacheListLeftAndDistinct(key, list);
			}
			} catch (Exception exception) {
			ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
			@@ -288,6 +290,7 @@

			try {
			String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
			String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
			SendMagParam sendMagParam = new SendMagParam();
			sendMagParam.setType("4");
			if (type == 1) {
			@@ -295,6 +298,7 @@
			ServiceOutPath serviceOutPath = new ServiceOutPath();
			serviceOutPath.setParam1(taskId);
			serviceOutPath.setParam2(patid);
			serviceOutPath.setParam6(subId);
			serviceOutPath.setCreateTime(new Date());
			iServiceOutPathService.insertServiceOutPath(serviceOutPath);
			// sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid + "&param5=false");
			@@ -311,6 +315,7 @@
			ServiceOutPath serviceOutPath = new ServiceOutPath();
			serviceOutPath.setParam1(taskId);
			serviceOutPath.setParam2(patid);
			serviceOutPath.setParam6(subId);
			// serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
			serviceOutPath.setParam3(ivrTask1.getTaskName());
			serviceOutPath.setCreateTime(new Date());
			@@ -328,6 +333,7 @@
			ServiceOutPath serviceOutPath = new ServiceOutPath();
			serviceOutPath.setParam1(taskId);
			serviceOutPath.setParam2(patid);
			serviceOutPath.setParam6(subId);
			// serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
			serviceOutPath.setParam3(ivrTask1.getTaskName());
			serviceOutPath.setCreateTime(new Date());