smartor.git - Gitblit

			@@ -12,12 +12,10 @@
			import com.ruoyi.common.utils.sms.smsUtils;
			import com.smartor.common.MtSubmitSmUtil;
			import com.smartor.common.ShiyiSmsUtil;
			import com.smartor.domain.ServiceOutPath;
			import com.smartor.domain.ShiyiSmsRequest;
			import com.smartor.domain.ShiyiSmsResponse;
			import com.smartor.domain.smsVO;
			import com.smartor.domain.*;
			import com.smartor.mapper.UtilsMapper;
			import com.smartor.service.IServiceOutPathService;
			import com.smartor.service.IServiceSubtaskService;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import lombok.extern.slf4j.Slf4j;
			@@ -71,6 +69,8 @@

			@Autowired
			private IServiceOutPathService iServiceOutPathService;
			@Autowired
			private IServiceSubtaskService iServiceSubtaskService;

			@Value("${spring.profiles.active}")
			private String active;
			@@ -106,6 +106,12 @@
			@PostMapping("/send")
			public AjaxResult sendAsk(@RequestBody smsVO vo) throws UnsupportedEncodingException {
			String content = "";
			if (StringUtils.isNotEmpty(vo.getSubId())) {
			ServiceSubtask serviceSubtask = iServiceSubtaskService.selectServiceSubtaskById(Long.valueOf(vo.getSubId()));
			if (serviceSubtask.getSendstate() == 4L) content = "该任务不执行";
			return AjaxResult.error(content);
			}

			if (StringUtils.isNotEmpty(vo.getTaskId()) && StringUtils.isNotEmpty(vo.getPatId()) && StringUtils.isNotEmpty(vo.getSubId())) {
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
			@@ -193,8 +199,13 @@
			*/
			@ApiOperation("微信发送")
			@PostMapping("/sendChat")
			public AjaxResult sendChat(@RequestBody smsVO vo) throws UnsupportedEncodingException {
			public AjaxResult sendChat(@RequestBody smsVO vo) {
			String sendMsg = "";
			if (StringUtils.isNotEmpty(vo.getSubId())) {
			ServiceSubtask serviceSubtask = iServiceSubtaskService.selectServiceSubtaskById(Long.valueOf(vo.getSubId()));
			if (serviceSubtask.getSendstate() == 4L) sendMsg = "该任务不执行";
			return AjaxResult.error(sendMsg);
			}
			if (StringUtils.isNotEmpty(vo.getTaskId()) && StringUtils.isNotEmpty(vo.getPatId()) && StringUtils.isNotEmpty(vo.getSubId())) {
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
			@@ -246,6 +257,11 @@
			serviceOutPath.setUrl(url);
			iServiceOutPathService.insertServiceOutPath(serviceOutPath);
			}
			if (StringUtils.isNotEmpty(vo.getSubId())) {
			ServiceSubtask serviceSubtask = iServiceSubtaskService.selectServiceSubtaskById(Long.valueOf(vo.getSubId()));
			if (serviceSubtask.getSendstate() == 4L) content = "该任务不执行";
			}

			return AjaxResult.success(content);
			}