smartor.git - Gitblit

			@@ -16,6 +16,7 @@
			import com.ruoyi.common.utils.http.HttpUtils;
			import com.smartor.common.LSHospTokenUtil;
			import com.smartor.domain.*;
			import com.smartor.mapper.HeLibraryMapper;
			import com.smartor.mapper.PatArchiveMapper;
			import com.smartor.mapper.ServiceSubtaskMapper;
			import com.smartor.mapper.ServiceTaskMapper;
			@@ -62,6 +63,9 @@

			@Autowired
			private ServiceSubtaskMapper ivrTaskcallMapper;

			@Autowired
			private HeLibraryMapper heLibraryMapper;

			@Autowired
			private ServiceTaskMapper ivrTaskMapper;
			@@ -275,16 +279,13 @@
			subIds.clear();
			subIds.addAll(lssubIds);
			lssubIds.clear();
			}
			else if (descByCode.equals("多媒体")) {
			} else if (descByCode.equals("多媒体")) {
			//多媒体
			continue;
			}
			else if (descByCode.equals("纸质")) {
			} else if (descByCode.equals("纸质")) {
			//纸质
			continue;
			}
			else if (descByCode.equals("短信")) {
			} else if (descByCode.equals("短信")) {
			//短信
			//对url中两个参数加密
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			@@ -354,7 +355,6 @@
			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());
			iServiceOutPathService.insertServiceOutPath(serviceOutPath);
			@@ -362,15 +362,22 @@
			serviceOutPath.setRadix(format);
			serviceOutPath.setUpdateTime(new Date());
			iServiceOutPathService.updateServiceOutPath(serviceOutPath);
			// sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false");
			sendMagParam.setPhone(serviceSubtask.getPhone());
			sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format);
			if (serviceSubtask.getOrgid().equals("47255004333112711A1001")) {
			sendMagParam.setContent("【景宁畲族自治县人民医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
			} else if (serviceSubtask.getOrgid().equals("47255004333112711A1001")) {
			sendMagParam.setContent("【丽水中医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
			} else
			sendMagParam.setContent("【新华医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
			//需要通过模板ID去判断要发的内容是宣教还是通知
			HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid());
			if (heLibrary.getHetype().equals("1")) {
			sendMagParam.setPhone(serviceSubtask.getPhone());
			sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format);
			if (serviceSubtask.getOrgid().equals("47255004333112711A1001")) {
			sendMagParam.setContent("【景宁畲族自治县人民医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
			} else if (serviceSubtask.getOrgid().equals("47255004333112711A1001")) {
			sendMagParam.setContent("【丽水中医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
			} else
			sendMagParam.setContent("【新华医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
			} else {
			//通知
			sendMagParam.setPhone(serviceSubtask.getPhone());
			sendMagParam.setContent(heLibrary.getPreachcontent());
			}
			}
			//短信还需要模板
			String s = null;
			@@ -395,9 +402,9 @@
			serviceSubtaskMapper.updateServiceSubtask(ss);
			continue;
			}
			log.error("---------mq丽水短信发送入参address：{}, sendMagParam:{}, orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
			log.info("---------mq丽水短信发送入参address：{}, sendMagParam:{}, orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
			String dxCode = getDXCode(map.get("address"), sendMagParam.getPhone(), sendMagParam.getContent(), map.get("sendPersonId"), map.get("sendPersonName"), MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()), token);
			log.error("---------丽水短信发送结果：{}-------", dxCode);
			log.info("---------丽水短信发送结果：{}-------", dxCode);
			ObjectMapper objectMapper = new ObjectMapper();
			Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
			String code = textParam.get("Code").toString();
			@@ -409,7 +416,6 @@
			}
			if (s.equals("true")) {
			//在子任务表里记录一下
			log.error("serviceSubtask保存成功了吗？：{}", s);
			String uuid = UUID.randomUUID().toString();
			serviceSubtask.setResult("success");
			serviceSubtask.setRemark("短信发送成功");
			@@ -457,8 +463,7 @@
			subIds.clear();
			subIds.addAll(lssubIds);
			lssubIds.clear();
			}
			else if (descByCode.equals("公众号")) {
			} else if (descByCode.equals("公众号")) {
			//公众号
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);