From 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 05 十一月 2025 11:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 22
ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSend.java | 96 +-
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserList.java | 26
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumberResponse.java | 24
ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsService.java | 2
ruoyi-admin/src/main/resources/application-sltd.yml | 3
ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumberResponse.java | 24
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContentResponse.java | 20
ruoyi-admin/src/main/resources/application-xh.yml | 2
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 34
ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReplyResponse.java | 24
ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReply.java | 60
ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java | 5
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserListResponse.java | 24
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 38 +
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContent.java | 144 ++--
ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReport.java | 12
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyResponse.java | 24
ruoyi-common/src/main/java/com/ruoyi/common/dx/HelloResponse.java | 24
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateList.java | 24
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerify.java | 36
ruoyi-admin/src/main/resources/application-ls.yml | 3
ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsServiceSoap.java | 44
ruoyi-admin/src/main/resources/application-hzszlyy.yml | 2
ruoyi-common/src/main/java/com/ruoyi/common/dx/ObjectFactory.java | 70 +-
ruoyi-admin/src/main/resources/application-hn.yml | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 3
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumber.java | 12
smartor/src/main/java/com/smartor/domain/PatArchiveSrmVO.java | 44 +
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateListResponse.java | 24
ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSendResponse.java | 24
ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumber.java | 12
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivate.java | 24
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java | 2
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivateResponse.java | 26
/dev/null | 920 ---------------------------
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 20
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 22
ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReportResponse.java | 24
ruoyi-admin/src/main/resources/application-druid.yml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 24
ruoyi-admin/src/main/resources/application-ywry.yml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/dx/Hello.java | 12
46 files changed, 601 insertions(+), 1,416 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index a96db79..0a856e8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -96,9 +96,6 @@
@Value("${xhsmsPath}")
private String xhsmsPath;
- @Value("${visitHosp}")
- private Integer visitHosp;
-
@Value("${server.port}")
private String port;
@@ -299,9 +296,9 @@
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
- if (visitHosp == 2) {
+ if (active.equals("ls") || active.equals("sltd")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
- } else if (visitHosp == 1) {
+ } else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
}
@@ -325,10 +322,12 @@
//濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛�
if (serviceSubtask.getType().equals("1"))
sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
- if (visitHosp == 2) {
+ if (active.equals("ls") || active.equals("ssltd")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
- } else if (visitHosp == 1) {
+ } else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
+ } else if (active.equals("druid")) {
+ sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
}
} else if (type == 3) {
//瀹ｆ暀
@@ -348,9 +347,9 @@
if (heLibrary.getHetype().equals("1")) {
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format);
- if (visitHosp == 2) {
+ if (active.equals("ls") || active.equals("sltd")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌瀹ｆ暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
- } else if (visitHosp == 1) {
+ } else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌瀹ｆ暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
}
} else {
@@ -362,13 +361,13 @@
//鐭俊杩橀渶瑕佹ā鏉�
String s = null;
- if (visitHosp == 1) {
+ if (active.equals("xh")) {
//鏂板崕鐨勭煭淇″彂閫佹柟寮�
Map<String, String> req = new HashMap<>();
req.put("phone", sendMagParam.getPhone());
req.put("content", sendMagParam.getContent());
s = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
- } else if (visitHosp == 2) {
+ } else if (active.equals("ls")) {
String url = configService.selectConfigByKey("token.360", serviceSubtask.getOrgid());
log.info("-------00token.360鐨刄RL涓猴細{}", url);
//涓芥按鐨勭煭淇″彂閫佹柟寮�
@@ -396,7 +395,7 @@
setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�", "5");
throw new BaseException("鐭俊鍙戦�佸け璐�");
}
- } else if (visitHosp == 3) {
+ } else if (active.equals("sltd")) {
//鐪佺珛鍚屽痉鐨勭煭淇″彂閫佹柟寮�
JSONObject data = MessageSend.sendMsg(sendMagParam.getContent(), "2", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
String code = data.get("code").toString();
@@ -516,7 +515,6 @@
setFailPreachForm(serviceSubtask, sendPreachform, "璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�", "5");
continue;
}
-
String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskName(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatidHis(), wxqqxx);
log.error("wxCode鐨勫�间负:{}", wxCode);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver3.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver3.java
deleted file mode 100644
index 35d5380..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver3.java
+++ /dev/null
@@ -1,814 +0,0 @@
-package com.ruoyi.web.component;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.dx.MessageSend;
-import com.ruoyi.common.enums.MsgLSEnum;
-import com.ruoyi.common.enums.ServiceFromEnum;
-import com.ruoyi.common.enums.WxGZHEnum;
-import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.HttpUtil;
-import com.ruoyi.common.utils.OkHttpExample;
-import com.ruoyi.common.utils.RSAPublicKeyExample;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.system.service.ISysConfigService;
-import com.smartor.common.LSHospTokenUtil;
-import com.smartor.domain.*;
-import com.smartor.mapper.*;
-import com.smartor.service.IBaseSmsaccountService;
-import com.smartor.service.IServiceOutPathService;
-import com.smartor.service.IServiceSubtaskRecordService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.connection.Message;
-import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.security.MessageDigest;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import static cn.hutool.core.convert.Convert.toHex;
-
-@Slf4j
-@Component//鐩戝惉姝ら槦鍒�
-public class RedisMqReceiver3 extends KeyExpirationEventMessageListener {
-
- @Value("${phonePath}")
- private String phonePath;
-
- @Value("${pub_key}")
- private String pub_key;
-
- @Value("${localIP}")
- private String localIP;
-
- @Value("${req_path}")
- private String req_path;
-
- @Autowired
- private IServiceOutPathService iServiceOutPathService;
-
- @Autowired
- private ServiceSubtaskMapper ivrTaskcallMapper;
-
- @Autowired
- private HeLibraryMapper heLibraryMapper;
-
- @Autowired
- private ServiceTaskMapper ivrTaskMapper;
-
- @Autowired
- private PatArchiveMapper patArchiveMapper;
-
- @Autowired
- private RedisCache redisCache;
-
- @Autowired
- private ServiceTaskMapper svyTaskMapper;
-
- @Autowired
- private ServiceSubtaskMapper serviceSubtaskMapper;
-
- @Autowired
- private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
-
- @Autowired
- private IServiceSubtaskRecordService serviceSubtaskRecordService;
-
- @Autowired
- IBaseSmsaccountService baseSmsaccountService;
-
- @Autowired
- private ISysConfigService configService;
-
- @Value("${xhsmsPath}")
- private String xhsmsPath;
-
- @Value("${visitHosp}")
- private Integer visitHosp;
-
- @Value("${server.port}")
- private String port;
-
- // 鍒涘缓鍥哄畾澶у皬鐨勭嚎绋嬫睜
- private static final ExecutorService executorService = Executors.newFixedThreadPool(10);
-
- public RedisMqReceiver3(RedisMessageListenerContainer listenerContainer) {
- super(listenerContainer);
- }
-
- @Override
- public void onMessage(Message message, byte[] pattern) {
- log.info("鐩戝惉Redis key杩囨湡锛宬ey锛歿}锛宑hannel锛歿}", message.toString(), new String(pattern));
- String ip = localIP;
- log.info("鏈満鐨勭綉缁淚P涓�:{}", ip);
- String content = message.toString();
- //鍒ゆ柇鏄笉鏄换鍔′俊鎭紝濡傛灉涓嶆槸锛岀洿鎺ヨ繑鍥烇紝涓嶉渶瑕佹墽琛�
- if (!content.contains("taskid") || !port.equals("8095")) {
- log.error("涓嶆槸浠诲姟淇℃伅");
- return;
- }
- CommonTaskcallMQ commonTaskcallMQ = null;
- try {
- ObjectMapper mapper = new ObjectMapper();
- if (!content.startsWith("{")) {
- commonTaskcallMQ = mapper.readValue("{" + content + "}", CommonTaskcallMQ.class);
- } else {
- commonTaskcallMQ = mapper.readValue(content, CommonTaskcallMQ.class);
- }
- if (commonTaskcallMQ != null) tsakHandle(commonTaskcallMQ, ip, commonTaskcallMQ.getTaskType());
-
- //澶勭悊瀹屾垚锛岀Щ闄edis
- redisCache.deleteObject(message.toString());
- //灏嗙姸鎬佹敼鎴愬畬鎴�
- ServiceTask serviceTask = new ServiceTask();
- serviceTask.setTaskid(Long.valueOf(commonTaskcallMQ.getTaskid()));
- serviceTask.setSendState(5L);
- serviceTask.setFail(1L);
- svyTaskMapper.updateServiceTask(serviceTask);
- } catch (Exception e) {
- Integer integer = redisCache.getCacheObject(commonTaskcallMQ.getTaskid().toString());
- if (integer != null && integer == 3) {
- redisCache.deleteObject(message.toString());
- ServiceTask serviceTask = new ServiceTask();
- serviceTask.setTaskid(Long.valueOf(commonTaskcallMQ.getTaskid().toString()));
- serviceTask.setFail(0L);
- svyTaskMapper.updateServiceTask(serviceTask);
- //灏嗘秷鎭粠闃熷垪涓垹闄�
- } else if (integer == null) {
- redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), 1, 120, TimeUnit.MINUTES);
- } else {
- redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), integer + 1, 120, TimeUnit.MINUTES);
- }
- log.error("============娑堣垂澶辫触,灏濊瘯娑堟伅琛ュ彂鍐嶆娑堣垂!============== {}", e.getMessage());
- redisCache.setCacheObject(message.toString(), message.toString(), 60, TimeUnit.SECONDS);
- }
- }
-
- /**
- * 浠诲姟澶勭悊
- *
- * @param commonTaskcallMQ
- */
- public void tsakHandle(CommonTaskcallMQ commonTaskcallMQ, String ip, Integer type) {
- log.info("杩涗换鍔′簡鍚楋紵{}", commonTaskcallMQ);
- //鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
- ServiceTask ivrTask1 = ivrTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
-
- if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
- //濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
- String[] split = commonTaskcallMQ.getPreachform().split(",");
- log.info("split鐨勫�间负锛歿}", split);
-
- //瀹氫箟涓�涓泦鍚堬紝鐢ㄤ笌瀛樻病鏈夋墽琛岀殑瀛愪换鍔D
- List<Long> subIds = new ArrayList<>();
- //涓存椂瀛樻病鏈夋墽琛岀殑瀛愪换鍔D
- List<Long> lssubIds = new ArrayList<>();
- //鏄惁灏嗗叏閮ㄦ偅鑰呰�呭彂閫佸畬
- Boolean isSend = false;
-
- aa:
- for (String serviceFrom : split) {
- String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(serviceFrom));
- if (isSend == true) {
- break aa;
- }
-
- //閫氳繃浠诲姟ID鎷垮埌鎮ｈ�呬俊鎭�
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
- serviceSubtaskVO.setTaskid(commonTaskcallMQ.getTaskid());
- serviceSubtaskVO.setSendstate(1L);
- List<ServiceSubtask> selectServiceSubtaskList = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtaskVO);
- if (CollectionUtils.isEmpty(selectServiceSubtaskList)) {
- continue;
- }
- if (descByCode.equals("鐢佃瘽")) {
- for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- //鍏堝垽鏂竴涓嬶紝subIds鏄惁涓虹┖锛屽鏋滀笉涓虹┖锛屽彧鎵цsubIds閲岀殑鎮ｈ��
- if (CollectionUtils.isNotEmpty(subIds)) {
- boolean contains = subIds.contains(serviceSubtask.getId());
- //濡傛灉contains涓嶄负true,璇存槑褰撳墠鐨勬偅鑰呭凡缁忓彂閫佹垚鍔燂紝鐩存帴寰幆涓嬩竴涓汉灏辫
- if (!contains) continue;
- }
-
- //鍒ゆ柇璇ョ姸鎬佹槸鍚︽墽琛岃繃
- if (checkFinishPreachForm(serviceSubtask, serviceFrom)) {
- continue;
- }
-
- try {
- ServiceTask ivrTask = ivrTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
- if (ivrTask.getSendState() != null && ivrTask.getSendState() == 3 || ivrTask.getSendState() != null && ivrTask.getSendState() == 4) {
- //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
- break;
- }
- //鑾峰彇鍒皏alue鍊兼渶灏戠殑key
- String key = getKey();
- if (commonTaskcallMQ.getSendType().equals("2")) {
- //璇存槑鏄珛鍗冲彂閫�
- ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
- serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
- log.info("缂撳瓨涓璼erviceSubtask1鐨勫�间负锛歿}", serviceSubtask1);
- List<String> list = new ArrayList<>();
- List<ServiceSubtask> selectServiceSubtaskList1 = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtask1);
- for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
- list.add(serviceSubtask2.getId().toString());
- }
- log.info("缂撳瓨涓璫ache-0鐨勫�间负锛歿}", list);
-// redisCache.setCacheListLeft("cache-0", list);
- redisCache.setCacheListLeftAndDistinct("cache-0", list);
- } else {
- //闈炵珛鍗冲彂閫�
- ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
- serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
- List<ServiceSubtask> selectServiceSubtaskList1 = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtask1);
- List<String> list = new ArrayList<>();
- for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
- list.add(serviceSubtask2.getId().toString());
- }
-// redisCache.setCacheListLeft(key, list);
- redisCache.setCacheListLeftAndDistinct(key, list);
- }
- } catch (Exception exception) {
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
- serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
- serviceSubtaskRecord.setPreachform("3");
- serviceSubtaskRecord.setResult("fail");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setRemark("闃熷垪浠诲姟鐢佃瘽鍙戦�佸け璐�");
- log.error("闃熷垪浠诲姟鐢佃瘽鍙戦�佸け璐ワ細{}", exception.getMessage());
- lssubIds.add(serviceSubtask.getId());
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- //灏嗙數璇濈姸鎬佽缃负澶辫触
- setFailPreachForm(serviceSubtask, serviceFrom, "闃熷垪浠诲姟鐢佃瘽鍙戦�佸け璐�", "4");
- continue;
- }
- //鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
- 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);
- }
- if (CollectionUtils.isEmpty(lssubIds)) {
- //濡傛灉鈥滀复鏃跺瓙浠诲姟鈥濅负绌猴紝璇存槑鍏ㄥ彂閫佸畬浜�
- isSend = true;
- }
- //灏嗗瓙浠诲姟ID娓呯┖锛屽皢鈥滀复鏃跺瓙浠诲姟鈥濇暟鎹� 鏀惧埌 鈥滃瓙浠诲姟鈥� 涓�
- subIds.clear();
- subIds.addAll(lssubIds);
- lssubIds.clear();
- } else if (descByCode.equals("澶氬獟浣�")) {
- //澶氬獟浣�
- continue;
- } else if (descByCode.equals("绾歌川")) {
- //绾歌川
- continue;
- } else if (descByCode.equals("鐭俊")) {
- //鐭俊
- //瀵箄rl涓袱涓弬鏁板姞瀵�
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
-
- for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- //鍏堝垽鏂竴涓嬶紝subIds鏄惁涓虹┖锛屽鏋滀笉涓虹┖锛屽彧鎵цsubIds閲岀殑鎮ｈ��
- if (CollectionUtils.isNotEmpty(subIds)) {
- boolean contains = subIds.contains(serviceSubtask.getId());
- //濡傛灉contains涓嶄负true,璇存槑褰撳墠鐨勬偅鑰呭凡缁忓彂閫佹垚鍔燂紝鐩存帴寰幆涓嬩竴涓汉灏辫
- if (!contains) continue;
- }
- //鍒ゆ柇璇ョ姸鎬佹槸鍚︽墽琛岃繃
- if (checkFinishPreachForm(serviceSubtask, serviceFrom)) {
- continue;
- }
-
- 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) {
- //闅忚
- 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 + "¶m2=" + patid + "¶m5=false");
- //杞垚16杩涘埗
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
- sendMagParam.setPhone(serviceSubtask.getPhone());
- sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
- if (visitHosp == 2) {
- sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌瀹ｆ暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
- } else if (visitHosp == 1) {
- sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
- }
-
- } else if (type == 2) {
- //闂埜锛堥棶棰橈級
- 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());
- iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
-// sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
- sendMagParam.setPhone(serviceSubtask.getPhone());
- sendMagParam.setUrl(ip + ":" + req_path + "/wt?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 if (type == 3) {
- //瀹ｆ暀
- ServiceOutPath serviceOutPath = new ServiceOutPath();
- serviceOutPath.setParam1(taskId);
- serviceOutPath.setParam2(patid);
- serviceOutPath.setParam6(subId);
- serviceOutPath.setParam3(ivrTask1.getTaskName());
- serviceOutPath.setCreateTime(new Date());
- iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
- //闇�瑕侀�氳繃妯℃澘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;
- if (visitHosp == 1) {
- //鏂板崕鐨勭煭淇″彂閫佹柟寮�
- Map<String, String> req = new HashMap<>();
- req.put("phone", sendMagParam.getPhone());
- req.put("content", sendMagParam.getContent());
- s = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
- } else if (visitHosp == 2) {
- String url = configService.selectConfigByKey("token.360");
- //涓芥按鐨勭煭淇″彂閫佹柟寮�
- Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
- String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(),url);
- log.info("-----------token鐨勫�间负锛歿}", token);
- if (ObjectUtils.isNotEmpty(map) && StringUtils.isEmpty(map.get("address"))) {
- ServiceSubtask ss = new ServiceSubtask();
- ss.setResult("error");
- ss.setRemark("鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�");
- ss.setSendstate(5L);
- ss.setId(serviceSubtask.getId());
-// ss.setFinishtime(new Date());
-
- setFailPreachForm(serviceSubtask, serviceFrom, "鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�", "4");
- serviceSubtaskMapper.updateServiceSubtask(ss);
- continue;
- }
- log.info("---------mq涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿}, 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.info("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode);
- ObjectMapper objectMapper = new ObjectMapper();
- Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
- String code = textParam.get("Code").toString();
- if (code.equals("0")) {
- s = "true";
- } else {
- throw new BaseException("鐭俊鍙戦�佸け璐�");
- }
- } else if (visitHosp == 3) {
- //鐪佺珛鍚屽痉鐨勭煭淇″彂閫佹柟寮�
- JSONObject data = MessageSend.sendMsg(sendMagParam.getContent(), "2", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
- String code = data.get("code").toString();
- if (StringUtils.isNotEmpty(code) && code.equals("00000")) {
- s = "true";
- } else {
- throw new BaseException("鐭俊鍙戦�佸け璐�");
- }
- }
- if (s.equals("true")) {
- //鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
- 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("5");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult("success");
- serviceSubtaskRecord.setRemark("鐭俊鍙戦�佹垚鍔�");
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- log.error("serviceSubtaskRecord淇濆瓨鎴愬姛浜嗗悧锛燂細{}", serviceSubtaskRecord);
- }
- } catch (Exception e) {
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
- serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
- serviceSubtaskRecord.setPreachform("4");
- serviceSubtaskRecord.setResult("fail");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setRemark("鐭俊鍙戦�佸け璐�");
- log.error("鐭俊鍙戦�佸け璐ワ細{}", e.getMessage());
- lssubIds.add(serviceSubtask.getId());
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- setFailPreachForm(serviceSubtask, serviceFrom, "鐭俊鍙戦�佸け璐�", "4");
- continue;
- }
-
-
- }
- if (CollectionUtils.isEmpty(lssubIds)) {
- //濡傛灉鈥滀复鏃跺瓙浠诲姟鈥濅负绌猴紝璇存槑鍏ㄥ彂閫佸畬浜�
- isSend = true;
- }
- //灏嗗瓙浠诲姟ID娓呯┖锛屽皢鈥滀复鏃跺瓙浠诲姟鈥濇暟鎹� 鏀惧埌 鈥滃瓙浠诲姟鈥� 涓�
- subIds.clear();
- subIds.addAll(lssubIds);
- lssubIds.clear();
- } else if (descByCode.equals("鍏紬鍙�")) {
- //鍏紬鍙�
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
- for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
-
- //鍒ゆ柇璇ョ姸鎬佹槸鍚︽墽琛岃繃
- if (checkFinishPreachForm(serviceSubtask, serviceFrom)) {
- continue;
- }
-
- try {
- SendMagParam sendMagParam = new SendMagParam();
- sendMagParam.setType("5");
- String url = null;
- Boolean aBoolean = false;
- if (type == 1) {
- //闅忚
- ServiceOutPath serviceOutPath = new ServiceOutPath();
- serviceOutPath.setParam1(taskId);
- serviceOutPath.setParam2(patid);
- serviceOutPath.setCreateTime(new Date());
- iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
- url = ip + ":" + req_path + "/sf?p=" + format;
- } else if (type == 2) {
- //闂埜
- ServiceOutPath serviceOutPath = new ServiceOutPath();
- serviceOutPath.setParam1(taskId);
- serviceOutPath.setParam2(patid);
-// serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
- serviceOutPath.setParam3(ivrTask1.getTaskName());
- serviceOutPath.setCreateTime(new Date());
- iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
- url = ip + ":" + req_path + "/wt?p=" + format;
- } else if (type == 3) {
- //瀹ｆ暀
- ServiceOutPath serviceOutPath = new ServiceOutPath();
- serviceOutPath.setParam1(taskId);
- serviceOutPath.setParam2(patid);
- serviceOutPath.setParam3(ivrTask1.getTaskName());
- serviceOutPath.setCreateTime(new Date());
- iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
- url = ip + ":" + req_path + "/xj?p=" + format;
- }
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask.getPatid());
- if (StringUtils.isEmpty(patArchive.getPatidHis())) {
- ServiceSubtask ss = new ServiceSubtask();
- ss.setResult("error");
- ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
- ss.setSendstate(5L);
- ss.setId(serviceSubtask.getId());
-// ss.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtask(ss);
- //澶辫触璁板綍
- setFailPreachForm(serviceSubtask, serviceFrom, "鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖", "4");
- continue;
- }
-
- //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
- log.error("鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D锛歿}", patArchive.getOrgid());
- List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
- if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
- ServiceSubtask ss = new ServiceSubtask();
- ss.setResult("error");
- ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
- ss.setSendstate(5L);
- ss.setId(serviceSubtask.getId());
-// ss.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtask(ss);
-
- //澶辫触璁板綍
- setFailPreachForm(serviceSubtask, serviceFrom, "璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�", "4");
- continue;
- }
-
-
- String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskName(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatidHis(), wxqqxx);
- log.error("wxCode鐨勫�间负:{}", wxCode);
- Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
- log.error("map鐨勫�间负:{}", map);
- if (!map.isEmpty()) {
- serviceSubtask.setResult("success");
- serviceSubtask.setSendstate(3L);
- log.error("aBoolean鐨勫�间负:{}", aBoolean);
- if (map.get("succ").toString().equals("true")) {
- aBoolean = true;
- }
- if (aBoolean == false) {
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
- serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
- serviceSubtaskRecord.setPreachform("5");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setRemark(ObjectUtils.isNotEmpty(map.get("msg")) ? map.get("msg").toString() : null);
- lssubIds.add(serviceSubtask.getId());
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- continue;
- }
- }
- } catch (Exception e) {
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
- serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
- serviceSubtaskRecord.setPreachform("5");
- serviceSubtaskRecord.setResult("fail");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setRemark("鍏紬鍙峰彂閫佸け璐�");
- log.error("鍏紬鍙峰彂閫佸け璐ワ細{}", e.getMessage());
- lssubIds.add(serviceSubtask.getId());
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- //澶辫触璁板綍
- setFailPreachForm(serviceSubtask, serviceFrom, "鍏紬鍙峰彂閫佸け璐�", "4");
- continue;
- }
- //鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
- 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.setUuid(uuid);
- serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
- serviceSubtaskRecord.setPreachform("5");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult("success");
- serviceSubtaskRecord.setRemark("鍏紬鍙峰彂閫佹垚鍔�");
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- }
- if (CollectionUtils.isEmpty(lssubIds)) {
- //濡傛灉鈥滀复鏃跺瓙浠诲姟鈥濅负绌猴紝璇存槑鍏ㄥ彂閫佸畬浜�
- isSend = true;
- }
- //灏嗗瓙浠诲姟ID娓呯┖锛屽皢鈥滀复鏃跺瓙浠诲姟鈥濇暟鎹� 鏀惧埌 鈥滃瓙浠诲姟鈥� 涓�
- subIds.clear();
- subIds.addAll(lssubIds);
- lssubIds.clear();
- }
- //閫氱煡 MQ 娑堟伅宸茶鎺ユ敹,鍙互ACK(浠庨槦鍒椾腑鍒犻櫎)浜� 锛堣繖涓渶瑕佹牴鎹笟鍔″啀鍘诲鐞咥CK锛�
- }
- }
-
- }
-
- /**
- * 鏍￠獙璇ョ姸鎬佹槸鍚﹀惁鎵ц杩�
- *
- * @param serviceSubtask
- * @param preachform
- * @return
- */
- public Boolean checkFinishPreachForm(ServiceSubtask serviceSubtask, String preachform) {
- ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
- serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
- serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
- serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
- List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
- for (ServiceSubtaskPreachform ssp : serviceSubtaskPreachforms) {
- if (ssp.getSendstate().equals("9")) {
- //濡傛灉涓�9鐨勮瘽.璇存槑宸茬粡閫氳繃杩囨煇绉嶆墽琛屾柟寮忔墽琛屾垚鍔熶簡
- return true;
- } else if (ssp.getPreachform().equals(preachform) && !ssp.getSendstate().equals("1")) {
- //涓嶄负1,璇存槑宸茬粡閫氳繃璇ョ鏂瑰紡鎵ц杩囦簡,鏃犺鎴愬姛涓庡惁閮戒笉鎵ц
- return true;
- }
- }
- return false;
- }
-
-
- /**
- * @param serviceSubtask
- * @param preachform
- * @param remark
- * @param failSendstate
- * @return
- */
- public Boolean setFailPreachForm(ServiceSubtask serviceSubtask, String preachform, String remark, String failSendstate) {
- //灏嗙數璇濈姸鎬佽缃负澶辫触
- ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
- serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
- serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
- serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
- serviceSubtaskPreachform.setPreachform(preachform);
- //1:鏈彂閫佺姸鎬�
- serviceSubtaskPreachform.setSendstate("1");
- List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
- if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
- ServiceSubtaskPreachform serviceSubtaskPreachform1 = serviceSubtaskPreachforms.get(0);
- serviceSubtaskPreachform1.setSendstate(failSendstate);
- serviceSubtaskPreachform1.setRemark(remark);
- serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(serviceSubtaskPreachform1);
- }
- return true;
- }
-
-
- private String getKey() {
- Map<String, String> map = new HashMap<>();
- for (int i = 0; i < 6; i++) {
- Boolean aBoolean = redisCache.hasKey("cache-" + i);
- if (!aBoolean) {
- redisCache.setCacheObject("cache-" + i, "");
- map.put("cache-" + i, "");
- } else {
- map.put("cache-" + i, redisCache.getCacheObject("cache-" + i));
- }
- }
-
- String key = null;
- String value = "";
- for (Map.Entry<String, String> entry : map.entrySet()) {
- if (StringUtils.isEmpty(value)) {
- value = entry.getValue();
- key = entry.getKey();
- } else {
- if (entry.getValue().split(",").length < value.split(",").length) {
- value = entry.getValue();
- key = entry.getKey();
- }
- }
- }
- return key;
- }
-
- private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String patientname, String setPatientid, List<String> wxqqxx) {
- XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
- xinHuaWXReq.setIdcard(idcard);
- xinHuaWXReq.setUrl(url);
- xinHuaWXReq.setPatientid(setPatientid);
- xinHuaWXReq.setPatientname(patientname);
- xinHuaWXReq.setMobile(phone);
- xinHuaWXReq.setMedcardno(null);
- xinHuaWXReq.setTitlename(taskName);
- xinHuaWXReq.setContent(taskDesc);
- xinHuaWXReq.setAppid(wxqqxx.get(1));
- log.error("-----寰俊鍏紬鍙风殑鍑哄弬涓�----锛歿}", xinHuaWXReq);
-// new Gson().toJson(xinHuaWXReq);
- GsonBuilder gb = new GsonBuilder();
- gb.disableHtmlEscaping();
- String body = gb.create().toJson(xinHuaWXReq);
-
- log.error("encode鐨勫叆鍙備负wxqqxx 锛歿}, body:{}", wxqqxx.get(2), body);
- String encode = encode(wxqqxx.get(2).concat(body));
- log.error("--------encode鐨勫�间负锛歿}-----", encode);
- Map<String, String> headerMap = new HashMap<>();
- headerMap.put("sign", encode);
- String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
- log.error("--------result鐨勫�间负锛歿}-----", result);
-
- JSONObject jsonObject = JSONObject.parseObject(result);
- String code = (String) jsonObject.toString();
- return code;
- }
-
-
- private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap, String token) {
- Map<String, Object> map = new LinkedHashMap<>();
-
- Map<String, Object> YeWuXX = new LinkedHashMap<>();
- Map<String, Object> DuanXinXX = new LinkedHashMap<>();
- DuanXinXX.put("ShouJiHM", ShouJiHM);
- DuanXinXX.put("FaSongNR", FaSongNR);
- DuanXinXX.put("FaSongRID", FaSongRID);
- DuanXinXX.put("FaSongRXM", FaSongRXM);
- YeWuXX.put("DuanXinXX", DuanXinXX);
-
- map.put("XiaoXiTou", headerMap);
- map.put("YeWuXX", YeWuXX);
-
- String body = new Gson().toJson(map);
-
-// String result = HttpUtils.sendPost(address, body);
- String result = null;
- try {
- result = OkHttpExample.sendPostRequest(address, body, token);
- } catch (IOException e) {
- e.printStackTrace();
- }
- log.error("--------result鐨勫�间负锛歿}-----", result);
-
- JSONObject jsonObject = JSONObject.parseObject(result);
- String code = (String) jsonObject.toString();
- return code;
- }
-
-
- public String encode(String arg) {
- if (arg == null) {
- arg = "";
- }
- MessageDigest md5 = null;
- try {
- md5 = MessageDigest.getInstance("MD5");
- md5.update(arg.getBytes("UTF-8"));
- } catch (Exception e) {
- e.printStackTrace();
- }
- return toHex(md5.digest());
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
index 8e05ed9..73b2d40 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaScriptController.java
@@ -25,7 +25,7 @@
/**
* 闂璇濇湳搴揅ontroller
*
- * @author ruoyi
+ * @author ls
* @date 2023-12-21
*/
@Api(description = "闂璇濇湳搴�")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index 107db8d..f04d30c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -2,6 +2,7 @@
import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -24,6 +25,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
@@ -224,8 +226,10 @@
*/
@ApiOperation("鑾峰彇鎮ｈ�呬俊鎭�")
@PostMapping("/getPatientInfo")
- public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
- PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize());
+ public Map<String, Object> getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
+ if (patArchiveReq.getPageSize() != null && patArchiveReq.getPageNum() != null)
+ patArchiveReq.setPageNum(PageUtils.getOffset(patArchiveReq.getPageNum(), patArchiveReq.getPageSize()));
+
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
patArchiveReq.setOrgid(user.getOrgid());
@@ -236,13 +240,17 @@
patArchiveReq.setLeaveldeptcodes(null);
}
List<PatArchiveOthreInfo> patientInfo = patArchiveService.getPatientInfo(patArchiveReq);
- long count = PageUtils.count(new ISelect() {
- @Override
- public void doSelect() {
- patArchiveService.getPatientInfo(patArchiveReq);
- }
- });
- return getDataTable2(count, patientInfo);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", HttpStatus.SUCCESS);
+ map.put("msg", "鏌ヨ鎴愬姛");
+ map.put("rows", patientInfo);
+
+ patArchiveReq.setPageNum(null);
+ patArchiveReq.setPageSize(null);
+ List<PatArchiveOthreInfo> count = patArchiveService.getPatientInfo(patArchiveReq);
+ map.put("total", count);
+ return map;
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index 6e59d31..3ccd381 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -42,9 +42,6 @@
@Autowired
private IPatMedOuthospService iPatMedOuthospService;
- @Value("${visitHosp}")
- private Integer visitHosp;
-
/**
* 鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index b3593bb..2fb4c59 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -2,6 +2,7 @@
import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -10,6 +11,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.PreachFormEnum;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -19,9 +21,11 @@
import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
import com.smartor.service.IServiceTaskService;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import net.bytebuddy.implementation.bytecode.Throw;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -386,4 +391,21 @@
return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq));
}
+
+ /**
+ * 鍙戦�佺煭淇℃ā鏉�
+ */
+ @ApiOperation("鍙戦�佺煭淇℃ā鏉�")
+ @PostMapping("/sendMsgTemplate")
+ public Map<String, Object> sendMsgTemplate(@RequestBody List<PatArchiveSrmVO> patArchiveSrmVOS) {
+ if (CollectionUtils.isEmpty(patArchiveSrmVOS)) {
+ throw new BaseException("鎮ｈ�呬俊鎭笉鑳戒负绌�");
+ }
+ List<PatArchiveSrmVO> pasList = serviceSubtaskService.sendMsgTemplate(patArchiveSrmVOS);
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", HttpStatus.SUCCESS);
+ map.put("fail", CollectionUtils.isEmpty(pasList) ? null : pasList);
+ return map;
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
index dd4aebf..3b67108 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
@@ -40,9 +40,6 @@
@Autowired
private IBaseSmsaccountService baseSmsaccountService;
- @Value("${visitHosp}")
- private Integer visitHosp;
-
@Value("${xhsmsPath}")
private String xhsmsPath;
@@ -52,11 +49,14 @@
@Value("${xhsmsPwd}")
private String xhsmsPwd;
+ @Value("${spring.profiles.active}")
+ private String active;
+
/**
* 鏌ヨ鐭俊璐﹀彿鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
- @PostMapping("/list")
+ @PostMapping("/list")
public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
startPage();
List<BaseSmsaccount> list = baseSmsaccountService.selectBaseSmsaccountList(baseSmsaccount);
@@ -122,17 +122,17 @@
@PostMapping("/sendMsg")
@RepeatSubmit
public AjaxResult sendMsg(@RequestBody BaseSmsRequest baseSmsRequest) {
- String sendMsg="";
- if(visitHosp.equals("3")) {
- try{
+ String sendMsg = "";
+ if (active.equals("hzszlyy")) {
+ try {
JSONObject jsTemp = JSON.parseObject(baseSmsRequest.getTemplateParam());
- String content=jsTemp.getString("name");
- sendMsg= smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,baseSmsRequest.getPhoneNumber(),content);
+ String content = jsTemp.getString("name");
+ sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, baseSmsRequest.getPhoneNumber(), content);
} catch (Exception ex) {
- return AjaxResult.error(ex.getMessage()) ;
+ return AjaxResult.error(ex.getMessage());
}
return AjaxResult.success(sendMsg);
- }else {
+ } else {
if (baseSmsaccountService.sendMsg(baseSmsRequest) == null) {
return error();
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index fdd3e7b..37110f0 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -266,8 +266,6 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
-visitHosp: 2
isEncryp:
diff --git a/ruoyi-admin/src/main/resources/application-hn.yml b/ruoyi-admin/src/main/resources/application-hn.yml
index 4aa989f..0e263c9 100644
--- a/ruoyi-admin/src/main/resources/application-hn.yml
+++ b/ruoyi-admin/src/main/resources/application-hn.yml
@@ -254,9 +254,6 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3鐪佺珛鍚屽痉
-visitHosp: 0
-
#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
dealDeptCode:
diff --git a/ruoyi-admin/src/main/resources/application-hzszlyy.yml b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
index 4c2bc54..c60e4d8 100644
--- a/ruoyi-admin/src/main/resources/application-hzszlyy.yml
+++ b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
@@ -213,5 +213,3 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3 鏉窞甯備竴鍖婚櫌鍚村北闄㈠尯
-visitHosp: 3
diff --git a/ruoyi-admin/src/main/resources/application-ls.yml b/ruoyi-admin/src/main/resources/application-ls.yml
index a28d611..b0fb629 100644
--- a/ruoyi-admin/src/main/resources/application-ls.yml
+++ b/ruoyi-admin/src/main/resources/application-ls.yml
@@ -243,9 +243,6 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3鐪佺珛鍚屽痉
-visitHosp: 2
-
#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
dealDeptCode:
diff --git a/ruoyi-admin/src/main/resources/application-sltd.yml b/ruoyi-admin/src/main/resources/application-sltd.yml
index b239f5c..3891972 100644
--- a/ruoyi-admin/src/main/resources/application-sltd.yml
+++ b/ruoyi-admin/src/main/resources/application-sltd.yml
@@ -231,9 +231,6 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3甯備竴 4鐪佺珛鍚屽痉
-visitHosp: 4
-
#鐢ㄦ埛榛樿瀵嗙爜
userPwd: sltd@0230
diff --git a/ruoyi-admin/src/main/resources/application-xh.yml b/ruoyi-admin/src/main/resources/application-xh.yml
index 692cc4b..663631f 100644
--- a/ruoyi-admin/src/main/resources/application-xh.yml
+++ b/ruoyi-admin/src/main/resources/application-xh.yml
@@ -229,8 +229,6 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3鐪佺珛鍚屽痉
-visitHosp: 1
#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
dealDeptCode:
diff --git a/ruoyi-admin/src/main/resources/application-ywry.yml b/ruoyi-admin/src/main/resources/application-ywry.yml
index b278b68..225a3e2 100644
--- a/ruoyi-admin/src/main/resources/application-ywry.yml
+++ b/ruoyi-admin/src/main/resources/application-ywry.yml
@@ -215,8 +215,6 @@
#admin绠＄悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
-visitHosp: 2
#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
dealDeptCode:
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9634a5b..e418f3f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: ls
+ active: sltd
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/Hello.class b/ruoyi-common/src/main/java/com/ruoyi/common/dx/Hello.class
deleted file mode 100644
index c0cc148..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/Hello.class
+++ /dev/null
Binary files differ
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/Hello.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/Hello.java
index 230c90a..80d7008 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/Hello.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/Hello.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -20,8 +20,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/HelloResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/HelloResponse.java
index 2e2c243..101c82a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/HelloResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/HelloResponse.java
@@ -9,10 +9,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -24,8 +24,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -38,24 +38,24 @@
protected String helloResult;
/**
- * 鑾峰彇helloResult灞炴�х殑鍊笺��
- *
+ * 获取helloResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getHelloResult() {
return helloResult;
}
/**
- * 璁剧疆helloResult灞炴�х殑鍊笺��
- *
+ * 设置helloResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setHelloResult(String value) {
this.helloResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReply.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReply.java
index a1d2d9c..0b9b7aa 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReply.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReply.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -26,8 +26,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -45,96 +45,96 @@
protected String sUserNumber;
/**
- * 鑾峰彇sServerNumber灞炴�х殑鍊笺��
- *
+ * 获取sServerNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSServerNumber() {
return sServerNumber;
}
/**
- * 璁剧疆sServerNumber灞炴�х殑鍊笺��
- *
+ * 设置sServerNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSServerNumber(String value) {
this.sServerNumber = value;
}
/**
- * 鑾峰彇sTemplateNumber灞炴�х殑鍊笺��
- *
+ * 获取sTemplateNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSTemplateNumber() {
return sTemplateNumber;
}
/**
- * 璁剧疆sTemplateNumber灞炴�х殑鍊笺��
- *
+ * 设置sTemplateNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSTemplateNumber(String value) {
this.sTemplateNumber = value;
}
/**
- * 鑾峰彇sOrderNo灞炴�х殑鍊笺��
- *
+ * 获取sOrderNo属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSOrderNo() {
return sOrderNo;
}
/**
- * 璁剧疆sOrderNo灞炴�х殑鍊笺��
- *
+ * 设置sOrderNo属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSOrderNo(String value) {
this.sOrderNo = value;
}
/**
- * 鑾峰彇sUserNumber灞炴�х殑鍊笺��
- *
+ * 获取sUserNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSUserNumber() {
return sUserNumber;
}
/**
- * 璁剧疆sUserNumber灞炴�х殑鍊笺��
- *
+ * 设置sUserNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSUserNumber(String value) {
this.sUserNumber = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReplyResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReplyResponse.java
index ca7adb0..c0e56d8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReplyResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReplyResponse.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -23,8 +23,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -36,24 +36,24 @@
protected String i5GReplyResult;
/**
- * 鑾峰彇i5GReplyResult灞炴�х殑鍊笺��
- *
+ * 获取i5GReplyResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getI5GReplyResult() {
return i5GReplyResult;
}
/**
- * 璁剧疆i5GReplyResult灞炴�х殑鍊笺��
- *
+ * 设置i5GReplyResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setI5GReplyResult(String value) {
this.i5GReplyResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReport.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReport.java
index 1c42ba2..f4dfc3c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReport.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReport.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -20,8 +20,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReportResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReportResponse.java
index 7e1c62a..00b0140 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReportResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GReportResponse.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -23,8 +23,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -36,24 +36,24 @@
protected String i5GReportResult;
/**
- * 鑾峰彇i5GReportResult灞炴�х殑鍊笺��
- *
+ * 获取i5GReportResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getI5GReportResult() {
return i5GReportResult;
}
/**
- * 璁剧疆i5GReportResult灞炴�х殑鍊笺��
- *
+ * 设置i5GReportResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setI5GReportResult(String value) {
this.i5GReportResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumber.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumber.java
index 113ede0..a05c454 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumber.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumber.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -20,8 +20,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumberResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumberResponse.java
index d29e053..3add6e7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumberResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSearchNumberResponse.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -23,8 +23,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -36,24 +36,24 @@
protected String i5GSearchNumberResult;
/**
- * 鑾峰彇i5GSearchNumberResult灞炴�х殑鍊笺��
- *
+ * 获取i5GSearchNumberResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getI5GSearchNumberResult() {
return i5GSearchNumberResult;
}
/**
- * 璁剧疆i5GSearchNumberResult灞炴�х殑鍊笺��
- *
+ * 设置i5GSearchNumberResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setI5GSearchNumberResult(String value) {
this.i5GSearchNumberResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSend.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSend.java
index ac44737..b435292 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSend.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSend.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -29,8 +29,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -54,168 +54,168 @@
protected String sScheduleTime;
/**
- * 鑾峰彇sServerNumber灞炴�х殑鍊笺��
- *
+ * 获取sServerNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSServerNumber() {
return sServerNumber;
}
/**
- * 璁剧疆sServerNumber灞炴�х殑鍊笺��
- *
+ * 设置sServerNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSServerNumber(String value) {
this.sServerNumber = value;
}
/**
- * 鑾峰彇sTemplateNumber灞炴�х殑鍊笺��
- *
+ * 获取sTemplateNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSTemplateNumber() {
return sTemplateNumber;
}
/**
- * 璁剧疆sTemplateNumber灞炴�х殑鍊笺��
- *
+ * 设置sTemplateNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSTemplateNumber(String value) {
this.sTemplateNumber = value;
}
/**
- * 鑾峰彇sOrderNo灞炴�х殑鍊笺��
- *
+ * 获取sOrderNo属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSOrderNo() {
return sOrderNo;
}
/**
- * 璁剧疆sOrderNo灞炴�х殑鍊笺��
- *
+ * 设置sOrderNo属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSOrderNo(String value) {
this.sOrderNo = value;
}
/**
- * 鑾峰彇sMessageContent灞炴�х殑鍊笺��
- *
+ * 获取sMessageContent属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMessageContent() {
return sMessageContent;
}
/**
- * 璁剧疆sMessageContent灞炴�х殑鍊笺��
- *
+ * 设置sMessageContent属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMessageContent(String value) {
this.sMessageContent = value;
}
/**
- * 鑾峰彇sMessageType灞炴�х殑鍊笺��
- *
+ * 获取sMessageType属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMessageType() {
return sMessageType;
}
/**
- * 璁剧疆sMessageType灞炴�х殑鍊笺��
- *
+ * 设置sMessageType属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMessageType(String value) {
this.sMessageType = value;
}
/**
- * 鑾峰彇sUserNumber灞炴�х殑鍊笺��
- *
+ * 获取sUserNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSUserNumber() {
return sUserNumber;
}
/**
- * 璁剧疆sUserNumber灞炴�х殑鍊笺��
- *
+ * 设置sUserNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSUserNumber(String value) {
this.sUserNumber = value;
}
/**
- * 鑾峰彇sScheduleTime灞炴�х殑鍊笺��
- *
+ * 获取sScheduleTime属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSScheduleTime() {
return sScheduleTime;
}
/**
- * 璁剧疆sScheduleTime灞炴�х殑鍊笺��
- *
+ * 设置sScheduleTime属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSScheduleTime(String value) {
this.sScheduleTime = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSendResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSendResponse.java
index 9e3a06f..fe20611 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSendResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/I5GSendResponse.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -23,8 +23,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -36,24 +36,24 @@
protected String i5GSendResult;
/**
- * 鑾峰彇i5GSendResult灞炴�х殑鍊笺��
- *
+ * 获取i5GSendResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getI5GSendResult() {
return i5GSendResult;
}
/**
- * 璁剧疆i5GSendResult灞炴�х殑鍊笺��
- *
+ * 设置i5GSendResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setI5GSendResult(String value) {
this.i5GSendResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java
index 2b2922c..f7c359f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java
@@ -2,10 +2,12 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.utils.uuid.UUID;
+import lombok.extern.slf4j.Slf4j;
/**
* 鐪佺珛鍚屽痉淇℃伅鍙戦�佹帴鍙�
*/
+@Slf4j
public class MessageSend {
/**
* // * @param sServiceNumber 鍘傚璁稿彲
@@ -19,7 +21,8 @@
* @return
*/
public static JSONObject sendMsg(String sMessageContent, String sMessageType, String sUserNumber, String sScheduleTime) {
- SmsService service = new SmsService();
+ log.info("--sMessageContent鐨勫�间负锛歿} ,--sMessageType鐨勫�间负锛歿}, --sUserNumber鐨勫�间负锛歿}, --sScheduleTime鐨勫�间负锛歿}", sMessageContent, sMessageType, sUserNumber, sScheduleTime);
+ com.ruoyi.common.dx.SmsService service = new SmsService();
SmsServiceSoap soap = service.getSmsServiceSoap();
String result = soap.i5GSend("202508291634227086", "T202508291635259440", UUID.randomUUID().toString(), sMessageContent, sMessageType, sUserNumber, sScheduleTime);
return JSONObject.parseObject(result);
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/ObjectFactory.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/ObjectFactory.java
index b1f1940..4672823 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/ObjectFactory.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/ObjectFactory.java
@@ -5,33 +5,33 @@
/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the com.ruoyi.web.webservice.dx package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the com.ruoyi.common.dx package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
* provided in this class.
- *
+ *
*/
@XmlRegistry
public class ObjectFactory {
/**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.ruoyi.web.webservice.dx
- *
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.ruoyi.common.dx
+ *
*/
public ObjectFactory() {
}
/**
* Create an instance of {@link SMSGetNumberResponse }
- *
+ *
*/
public SMSGetNumberResponse createSMSGetNumberResponse() {
return new SMSGetNumberResponse();
@@ -39,7 +39,7 @@
/**
* Create an instance of {@link SMSVerify }
- *
+ *
*/
public SMSVerify createSMSVerify() {
return new SMSVerify();
@@ -47,7 +47,7 @@
/**
* Create an instance of {@link I5GSearchNumberResponse }
- *
+ *
*/
public I5GSearchNumberResponse createI5GSearchNumberResponse() {
return new I5GSearchNumberResponse();
@@ -55,7 +55,7 @@
/**
* Create an instance of {@link I5GSendResponse }
- *
+ *
*/
public I5GSendResponse createI5GSendResponse() {
return new I5GSendResponse();
@@ -63,7 +63,7 @@
/**
* Create an instance of {@link SMSVerifyResponse }
- *
+ *
*/
public SMSVerifyResponse createSMSVerifyResponse() {
return new SMSVerifyResponse();
@@ -71,7 +71,7 @@
/**
* Create an instance of {@link I5GSend }
- *
+ *
*/
public I5GSend createI5GSend() {
return new I5GSend();
@@ -79,7 +79,7 @@
/**
* Create an instance of {@link SMSGetUserList }
- *
+ *
*/
public SMSGetUserList createSMSGetUserList() {
return new SMSGetUserList();
@@ -87,7 +87,7 @@
/**
* Create an instance of {@link I5GReportResponse }
- *
+ *
*/
public I5GReportResponse createI5GReportResponse() {
return new I5GReportResponse();
@@ -95,7 +95,7 @@
/**
* Create an instance of {@link I5GReply }
- *
+ *
*/
public I5GReply createI5GReply() {
return new I5GReply();
@@ -103,7 +103,7 @@
/**
* Create an instance of {@link SMSGetTemplateList }
- *
+ *
*/
public SMSGetTemplateList createSMSGetTemplateList() {
return new SMSGetTemplateList();
@@ -111,7 +111,7 @@
/**
* Create an instance of {@link SMSGetNumber }
- *
+ *
*/
public SMSGetNumber createSMSGetNumber() {
return new SMSGetNumber();
@@ -119,7 +119,7 @@
/**
* Create an instance of {@link Hello }
- *
+ *
*/
public Hello createHello() {
return new Hello();
@@ -127,7 +127,7 @@
/**
* Create an instance of {@link I5GReport }
- *
+ *
*/
public I5GReport createI5GReport() {
return new I5GReport();
@@ -135,7 +135,7 @@
/**
* Create an instance of {@link SMSGetUserListResponse }
- *
+ *
*/
public SMSGetUserListResponse createSMSGetUserListResponse() {
return new SMSGetUserListResponse();
@@ -143,7 +143,7 @@
/**
* Create an instance of {@link SMSSaveContent }
- *
+ *
*/
public SMSSaveContent createSMSSaveContent() {
return new SMSSaveContent();
@@ -151,7 +151,7 @@
/**
* Create an instance of {@link SMSSaveContentResponse }
- *
+ *
*/
public SMSSaveContentResponse createSMSSaveContentResponse() {
return new SMSSaveContentResponse();
@@ -159,7 +159,7 @@
/**
* Create an instance of {@link I5GSearchNumber }
- *
+ *
*/
public I5GSearchNumber createI5GSearchNumber() {
return new I5GSearchNumber();
@@ -167,7 +167,7 @@
/**
* Create an instance of {@link I5GReplyResponse }
- *
+ *
*/
public I5GReplyResponse createI5GReplyResponse() {
return new I5GReplyResponse();
@@ -175,7 +175,7 @@
/**
* Create an instance of {@link HelloResponse }
- *
+ *
*/
public HelloResponse createHelloResponse() {
return new HelloResponse();
@@ -183,7 +183,7 @@
/**
* Create an instance of {@link SMSGetTemplateListResponse }
- *
+ *
*/
public SMSGetTemplateListResponse createSMSGetTemplateListResponse() {
return new SMSGetTemplateListResponse();
@@ -191,7 +191,7 @@
/**
* Create an instance of {@link SMSVerifyPrivateResponse }
- *
+ *
*/
public SMSVerifyPrivateResponse createSMSVerifyPrivateResponse() {
return new SMSVerifyPrivateResponse();
@@ -199,7 +199,7 @@
/**
* Create an instance of {@link SMSVerifyPrivate }
- *
+ *
*/
public SMSVerifyPrivate createSMSVerifyPrivate() {
return new SMSVerifyPrivate();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumber.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumber.java
index 0d4ef66..47f5bdc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumber.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumber.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type锟斤拷 Java 锟洁。
- *
- * <p>锟斤拷锟斤拷模式片锟斤拷指锟斤拷锟斤拷锟斤拷锟节达拷锟斤拷锟叫碉拷预锟斤拷锟斤拷锟捷★拷
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -20,8 +20,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumberResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumberResponse.java
index fc4c505..bc0f1f7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumberResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetNumberResponse.java
@@ -9,10 +9,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -24,8 +24,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -38,24 +38,24 @@
protected String smsGetNumberResult;
/**
- * 鑾峰彇smsGetNumberResult灞炴�х殑鍊笺��
- *
+ * 获取smsGetNumberResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMSGetNumberResult() {
return smsGetNumberResult;
}
/**
- * 璁剧疆smsGetNumberResult灞炴�х殑鍊笺��
- *
+ * 设置smsGetNumberResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMSGetNumberResult(String value) {
this.smsGetNumberResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateList.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateList.java
index 508ab2d..d00e36e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateList.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateList.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -23,8 +23,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -36,24 +36,24 @@
protected String sUserName;
/**
- * 鑾峰彇sUserName灞炴�х殑鍊笺��
- *
+ * 获取sUserName属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSUserName() {
return sUserName;
}
/**
- * 璁剧疆sUserName灞炴�х殑鍊笺��
- *
+ * 设置sUserName属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSUserName(String value) {
this.sUserName = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateListResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateListResponse.java
index 5b47c60..ce037cd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateListResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetTemplateListResponse.java
@@ -9,10 +9,10 @@
/**
- * <p>anonymous complex type锟斤拷 Java 锟洁。
- *
- * <p>锟斤拷锟斤拷模式片锟斤拷指锟斤拷锟斤拷锟斤拷锟节达拷锟斤拷锟叫碉拷预锟斤拷锟斤拷锟捷★拷
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -24,8 +24,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -38,24 +38,24 @@
protected String smsGetTemplateListResult;
/**
- * 锟斤拷取smsGetTemplateListResult锟斤拷锟皆碉拷值锟斤拷
- *
+ * 获取smsGetTemplateListResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMSGetTemplateListResult() {
return smsGetTemplateListResult;
}
/**
- * 锟斤拷锟斤拷smsGetTemplateListResult锟斤拷锟皆碉拷值锟斤拷
- *
+ * 设置smsGetTemplateListResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMSGetTemplateListResult(String value) {
this.smsGetTemplateListResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserList.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserList.java
index d442868..715c58e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserList.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserList.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -23,12 +23,12 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "sUserName"
+ "sUserName"
})
@XmlRootElement(name = "SMSGetUserList")
public class SMSGetUserList {
@@ -36,24 +36,24 @@
protected String sUserName;
/**
- * 鑾峰彇sUserName灞炴�х殑鍊笺��
- *
+ * 获取sUserName属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSUserName() {
return sUserName;
}
/**
- * 璁剧疆sUserName灞炴�х殑鍊笺��
- *
+ * 设置sUserName属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSUserName(String value) {
this.sUserName = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserListResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserListResponse.java
index d867b54..a638a12 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserListResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSGetUserListResponse.java
@@ -9,10 +9,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -24,8 +24,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -38,24 +38,24 @@
protected String smsGetUserListResult;
/**
- * 鑾峰彇smsGetUserListResult灞炴�х殑鍊笺��
- *
+ * 获取smsGetUserListResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMSGetUserListResult() {
return smsGetUserListResult;
}
/**
- * 璁剧疆smsGetUserListResult灞炴�х殑鍊笺��
- *
+ * 设置smsGetUserListResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMSGetUserListResult(String value) {
this.smsGetUserListResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContent.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContent.java
index 90b4269..9740d32 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContent.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContent.java
@@ -9,10 +9,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -34,8 +34,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -69,264 +69,264 @@
protected String sMark;
/**
- * 鑾峰彇ssUseq灞炴�х殑鍊笺��
- *
+ * 获取ssUseq属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSSUseq() {
return ssUseq;
}
/**
- * 璁剧疆ssUseq灞炴�х殑鍊笺��
- *
+ * 设置ssUseq属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSSUseq(String value) {
this.ssUseq = value;
}
/**
- * 鑾峰彇ssTseq灞炴�х殑鍊笺��
- *
+ * 获取ssTseq属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSSTseq() {
return ssTseq;
}
/**
- * 璁剧疆ssTseq灞炴�х殑鍊笺��
- *
+ * 设置ssTseq属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSSTseq(String value) {
this.ssTseq = value;
}
/**
- * 鑾峰彇sOrderNo灞炴�х殑鍊笺��
- *
+ * 获取sOrderNo属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSOrderNo() {
return sOrderNo;
}
/**
- * 璁剧疆sOrderNo灞炴�х殑鍊笺��
- *
+ * 设置sOrderNo属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSOrderNo(String value) {
this.sOrderNo = value;
}
/**
- * 鑾峰彇sMessageType灞炴�х殑鍊笺��
- *
+ * 获取sMessageType属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMessageType() {
return sMessageType;
}
/**
- * 璁剧疆sMessageType灞炴�х殑鍊笺��
- *
+ * 设置sMessageType属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMessageType(String value) {
this.sMessageType = value;
}
/**
- * 鑾峰彇sMessageContent灞炴�х殑鍊笺��
- *
+ * 获取sMessageContent属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMessageContent() {
return sMessageContent;
}
/**
- * 璁剧疆sMessageContent灞炴�х殑鍊笺��
- *
+ * 设置sMessageContent属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMessageContent(String value) {
this.sMessageContent = value;
}
/**
- * 鑾峰彇sUserNumber灞炴�х殑鍊笺��
- *
+ * 获取sUserNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSUserNumber() {
return sUserNumber;
}
/**
- * 璁剧疆sUserNumber灞炴�х殑鍊笺��
- *
+ * 设置sUserNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSUserNumber(String value) {
this.sUserNumber = value;
}
/**
- * 鑾峰彇sSerialNumber灞炴�х殑鍊笺��
- *
+ * 获取sSerialNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSSerialNumber() {
return sSerialNumber;
}
/**
- * 璁剧疆sSerialNumber灞炴�х殑鍊笺��
- *
+ * 设置sSerialNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSSerialNumber(String value) {
this.sSerialNumber = value;
}
/**
- * 鑾峰彇sScheduleTime灞炴�х殑鍊笺��
- *
+ * 获取sScheduleTime属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSScheduleTime() {
return sScheduleTime;
}
/**
- * 璁剧疆sScheduleTime灞炴�х殑鍊笺��
- *
+ * 设置sScheduleTime属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSScheduleTime(String value) {
this.sScheduleTime = value;
}
/**
- * 鑾峰彇sExtendAccessNum灞炴�х殑鍊笺��
- *
+ * 获取sExtendAccessNum属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSExtendAccessNum() {
return sExtendAccessNum;
}
/**
- * 璁剧疆sExtendAccessNum灞炴�х殑鍊笺��
- *
+ * 设置sExtendAccessNum属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSExtendAccessNum(String value) {
this.sExtendAccessNum = value;
}
/**
- * 鑾峰彇sStatus灞炴�х殑鍊笺��
- *
+ * 获取sStatus属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSStatus() {
return sStatus;
}
/**
- * 璁剧疆sStatus灞炴�х殑鍊笺��
- *
+ * 设置sStatus属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSStatus(String value) {
this.sStatus = value;
}
/**
- * 鑾峰彇sMark灞炴�х殑鍊笺��
- *
+ * 获取sMark属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMark() {
return sMark;
}
/**
- * 璁剧疆sMark灞炴�х殑鍊笺��
- *
+ * 设置sMark属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMark(String value) {
this.sMark = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContentResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContentResponse.java
index 16605bf..8ff9a40 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContentResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSSaveContentResponse.java
@@ -9,10 +9,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -24,8 +24,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -38,16 +38,16 @@
protected int smsSaveContentResult;
/**
- * 鑾峰彇smsSaveContentResult灞炴�х殑鍊笺��
- *
+ * 获取smsSaveContentResult属性的值。
+ *
*/
public int getSMSSaveContentResult() {
return smsSaveContentResult;
}
/**
- * 璁剧疆smsSaveContentResult灞炴�х殑鍊笺��
- *
+ * 设置smsSaveContentResult属性的值。
+ *
*/
public void setSMSSaveContentResult(int value) {
this.smsSaveContentResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerify.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerify.java
index b09751a..1556712 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerify.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerify.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type?? Java ??
- *
- * <p>??????????????????????械?????????
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -24,8 +24,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -39,48 +39,48 @@
protected String sTemplateNumber;
/**
- * ???sServerNumber????????
- *
+ * 获取sServerNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSServerNumber() {
return sServerNumber;
}
/**
- * ????sServerNumber????????
- *
+ * 设置sServerNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSServerNumber(String value) {
this.sServerNumber = value;
}
/**
- * ???sTemplateNumber????????
- *
+ * 获取sTemplateNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSTemplateNumber() {
return sTemplateNumber;
}
/**
- * ????sTemplateNumber????????
- *
+ * 设置sTemplateNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSTemplateNumber(String value) {
this.sTemplateNumber = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivate.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivate.java
index c74df7a..6cf7ece 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivate.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivate.java
@@ -8,10 +8,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -23,8 +23,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -36,24 +36,24 @@
protected String sServerNumber;
/**
- * 鑾峰彇sServerNumber灞炴�х殑鍊笺��
- *
+ * 获取sServerNumber属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSServerNumber() {
return sServerNumber;
}
/**
- * 璁剧疆sServerNumber灞炴�х殑鍊笺��
- *
+ * 设置sServerNumber属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSServerNumber(String value) {
this.sServerNumber = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivateResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivateResponse.java
index 6ac69b2..aca1e14 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivateResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyPrivateResponse.java
@@ -9,10 +9,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -24,12 +24,12 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "smsVerifyPrivateResult"
+ "smsVerifyPrivateResult"
})
@XmlRootElement(name = "SMSVerifyPrivateResponse")
public class SMSVerifyPrivateResponse {
@@ -38,24 +38,24 @@
protected String smsVerifyPrivateResult;
/**
- * 鑾峰彇smsVerifyPrivateResult灞炴�х殑鍊笺��
- *
+ * 获取smsVerifyPrivateResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMSVerifyPrivateResult() {
return smsVerifyPrivateResult;
}
/**
- * 璁剧疆smsVerifyPrivateResult灞炴�х殑鍊笺��
- *
+ * 设置smsVerifyPrivateResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMSVerifyPrivateResult(String value) {
this.smsVerifyPrivateResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyResponse.java
index 66c0746..519c8f0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyResponse.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SMSVerifyResponse.java
@@ -9,10 +9,10 @@
/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
+ * <p>anonymous complex type的 Java 类。
+ *
+ * <p>以下模式片段指定包含在此类中的预期内容。
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -24,8 +24,8 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -38,24 +38,24 @@
protected String smsVerifyResult;
/**
- * 鑾峰彇smsVerifyResult灞炴�х殑鍊笺��
- *
+ * 获取smsVerifyResult属性的值。
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getSMSVerifyResult() {
return smsVerifyResult;
}
/**
- * 璁剧疆smsVerifyResult灞炴�х殑鍊笺��
- *
+ * 设置smsVerifyResult属性的值。
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setSMSVerifyResult(String value) {
this.smsVerifyResult = value;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsService.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsService.java
index adce938..cf89da0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsService.java
@@ -75,7 +75,7 @@
/**
*
* @param features
- * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * A list of {@link WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
* @return
* returns SmsServiceSoap
*/
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsServiceSoap.java b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsServiceSoap.java
index af9c088..b6fdefd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsServiceSoap.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/dx/SmsServiceSoap.java
@@ -14,7 +14,7 @@
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.2.9-b130926.1035
* Generated source version: 2.2
- *
+ *
*/
@WebService(name = "smsServiceSoap", targetNamespace = "http://tempuri.org/")
@XmlSeeAlso({
@@ -24,7 +24,7 @@
/**
- *
+ *
* @return
* returns java.lang.String
*/
@@ -35,8 +35,8 @@
public String hello();
/**
- * 浼犲叕鍙歌鍙拰妯℃澘璁稿彲鏌ヨ淇℃伅锛屽唴閮ㄥ钩鍙伴獙璇�
- *
+ * 传公司许可和模板许可查询信息，内部平台验证
+ *
* @param sServerNumber
* @return
* returns java.lang.String
@@ -50,8 +50,8 @@
String sServerNumber);
/**
- * 浼犲叕鍙歌鍙拰妯℃澘璁稿彲鏌ヨ淇℃伅
- *
+ * 传公司许可和模板许可查询信息
+ *
* @param sServerNumber
* @param sTemplateNumber
* @return
@@ -68,8 +68,8 @@
String sTemplateNumber);
/**
- * 鏍规嵁鍏徃鍚嶇О鏌ヨ鍏徃璁稿彲淇℃伅
- *
+ * 根据公司名称查询公司许可信息
+ *
* @param sUserName
* @return
* returns java.lang.String
@@ -83,8 +83,8 @@
String sUserName);
/**
- * 鏍规嵁鍏徃鍚嶇О鏌ヨ妯℃澘璁稿彲
- *
+ * 根据公司名称查询模板许可
+ *
* @param sUserName
* @return
* returns java.lang.String
@@ -98,8 +98,8 @@
String sUserName);
/**
- * 鑾峰彇鏁版嵁閲�
- *
+ * 获取数据量
+ *
* @return
* returns java.lang.String
*/
@@ -110,8 +110,8 @@
public String smsGetNumber();
/**
- * 鐭俊鏁版嵁淇濆瓨
- *
+ * 短信数据保存
+ *
* @param sOrderNo
* @param sUserNumber
* @param sMessageContent
@@ -155,8 +155,8 @@
String sMark);
/**
- * 鏂扮煭淇″钩鍙板彂閫佺煭淇�
- *
+ * 新短信平台发送短信
+ *
* @param sOrderNo
* @param sUserNumber
* @param sMessageContent
@@ -188,8 +188,8 @@
String sScheduleTime);
/**
- * 鏂扮煭淇″钩鍙板洖鎵ф帴鍙�
- *
+ * 新短信平台回执接口
+ *
* @return
* returns java.lang.String
*/
@@ -200,8 +200,8 @@
public String i5GReport();
/**
- * 鏂扮煭淇″钩鍙扮煭淇′綑閲忔煡璇�
- *
+ * 新短信平台短信余量查询
+ *
* @return
* returns java.lang.String
*/
@@ -212,8 +212,8 @@
public String i5GSearchNumber();
/**
- * 鏂扮煭淇″钩鍙扮煭淇″洖澶嶆煡璇�
- *
+ * 新短信平台短信回复查询
+ *
* @param sOrderNo
* @param sUserNumber
* @param sServerNumber
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index b79ebbe..0d9072d 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -40,7 +40,6 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.stream.Collectors;
import static cn.hutool.core.convert.Convert.toHex;
@@ -112,9 +111,6 @@
@Value("${req_path}")
private String req_path;
-
- @Value("${visitHosp}")
- private Integer visitHosp;
@Autowired
private ServiceTaskMapper serviceTaskMapper;
@@ -340,7 +336,7 @@
//鍑洪櫌琛�
iPatMedInhospService.dealOutHospInfo();
//闂ㄨ瘖琛�
- if (visitHosp != 1) {
+ if (active.equals("xh")) {
iPatMedOuthospService.dealOutpatientInfo();
}
}
@@ -589,12 +585,12 @@
}
}
String isSuccess = null;
- if (visitHosp == 1) {
+ if (active.equals("xh")) {
Map<String, String> req = new HashMap<>();
req.put("phone", sendMagParam.getPhone());
req.put("content", sendMagParam.getContent());
isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
- } else if (visitHosp == 2) {
+ } else if (active.equals("ls")) {
String url = configService.selectConfigByKey("token.360", serviceSubtask.getOrgid());
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
@@ -612,14 +608,14 @@
if (code.equals("0")) {
isSuccess = "true";
}
- } else if (visitHosp == 4) {
+ } else if (active.equals("sltd")) {
//鐪佺珛鍚屽痉鐨勭煭淇″彂閫佹柟寮�
JSONObject data = MessageSend.sendMsg(sendMagParam.getContent(), "2", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
String code = data.get("code").toString();
if (StringUtils.isNotEmpty(code) && code.equals("00000")) {
isSuccess = "true";
}
- } else if (visitHosp == 3) {//甯備竴鍖婚櫌
+ } else if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
String content = sendMagParam.getContent().replace("銆愭柊鍗庡尰闄€��", "");
String result = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content);
//杩欓噷闇�瑕佹牴鎹畆esult杩斿洖鐨勫�煎幓鍒ゆ柇锛屾槸鍚︽垚鍔燂紝鐒跺悗灏嗗�艰祴鍊肩粰isSuccess
@@ -680,10 +676,8 @@
return;
}
String wxCode = "";
- if (visitHosp == 3) {//甯備竴鍖婚櫌
- String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh()
- + "&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&content=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&phone=" + patArchive.getTelcode()
- + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
+ if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
+ String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh() + "&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&content=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&phone=" + patArchive.getTelcode() + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
HttpUtils.sendGet(urlTemp);
} else {
wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask2.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask2.java
deleted file mode 100644
index a5cf25d..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask2.java
+++ /dev/null
@@ -1,920 +0,0 @@
-//package com.ruoyi.quartz.task;
-//
-//import com.alibaba.fastjson2.JSONObject;
-//import com.fasterxml.jackson.databind.JsonNode;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import com.google.common.reflect.TypeToken;
-//import com.google.gson.Gson;
-//import com.google.gson.JsonArray;
-//import com.google.gson.JsonObject;
-//import com.ruoyi.common.core.redis.RedisCache;
-//import com.ruoyi.common.enums.MsgLSEnum;
-//import com.ruoyi.common.enums.ServiceFromEnum;
-//import com.ruoyi.common.enums.WxGZHEnum;
-//import com.ruoyi.common.utils.HttpUtil;
-//import com.ruoyi.common.utils.OkHttpExample;
-//import com.ruoyi.common.utils.RSAPublicKeyExample;
-//import com.ruoyi.common.utils.StringUtils;
-//import com.ruoyi.common.utils.http.HttpUtils;
-//import com.smartor.common.LSHospTokenUtil;
-//import com.smartor.domain.*;
-//import com.smartor.mapper.ServiceSubtaskMapper;
-//import com.smartor.mapper.ServiceTaskMapper;
-//import com.smartor.mapper.SysUserImportMapper;
-//import com.smartor.service.*;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.commons.collections4.CollectionUtils;
-//import org.apache.commons.lang3.ObjectUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//import org.springframework.transaction.PlatformTransactionManager;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.io.File;
-//import java.io.FileWriter;
-//import java.io.IOException;
-//import java.lang.reflect.Type;
-//import java.net.URLEncoder;
-//import java.nio.charset.StandardCharsets;
-//import java.nio.file.Files;
-//import java.nio.file.Paths;
-//import java.security.MessageDigest;
-//import java.text.ParseException;
-//import java.text.SimpleDateFormat;
-//import java.time.LocalDate;
-//import java.time.LocalDateTime;
-//import java.time.LocalTime;
-//import java.time.ZoneId;
-//import java.time.format.DateTimeFormatter;
-//import java.util.*;
-//import java.util.stream.Collectors;
-//
-//import static cn.hutool.core.convert.Convert.toHex;
-//
-///**
-// * 瀹氭椂浠诲姟璋冨害娴嬭瘯
-// *
-// * @author ruoyi
-// */
-//@Slf4j
-//@Component("ryTask2")
-//public class RyTask2 {
-// @Autowired
-// private IServiceThirdDataService iServiceThirdDataService;
-//
-// @Autowired
-// private IServiceOutPathService iServiceOutPathService;
-//
-// @Autowired
-// private IServiceSubtaskAnswerService serviceSubtaskAnswerService;
-//
-// @Autowired
-// private IPatMedInhospService iPatMedInhospService;
-//
-// @Autowired
-// private IPatMedOuthospService iPatMedOuthospService;
-//
-// @Autowired
-// private IPatMedOperationService iPatMedOperationService;
-//
-// @Autowired
-// private IServiceSubtaskService iServiceSubtaskService;
-//
-// @Autowired
-// private IServicePatientTempService iServicePatientTempService;
-//
-// @Autowired
-// private PlatformTransactionManager transactionManager;
-//
-// @Autowired
-// private SysUserImportMapper sysUserImportMapper;
-//
-// @Value("${localIP}")
-// private String localIP;
-//
-// @Value("${xhsmsPath}")
-// private String xhsmsPath;
-//
-// @Value("${pub_key}")
-// private String pub_key;
-//
-// @Value("${req_path}")
-// private String req_path;
-//
-// @Value("${visitHosp}")
-// private Integer visitHosp;
-//
-// @Autowired
-// private ServiceTaskMapper serviceTaskMapper;
-//
-// @Autowired
-// private ServiceSubtaskMapper serviceSubtaskMapper;
-//
-// @Autowired
-// private RedisCache redisCache;
-//
-// @Autowired
-// private IServiceSubtaskRecordService serviceSubtaskRecordService;
-//
-// @Autowired
-// IBaseSmsaccountService baseSmsaccountService;
-//
-// @Autowired
-// IPatArchiveService patArchiveService;
-//
-// @Autowired
-// IPatMedInhospService patMedInhospService;
-//
-// @Autowired
-// IPatMedOuthospService patMedOuthospService;
-//
-// @Autowired
-// ISvyTaskTemplateService svyTaskTemplateService;
-//
-// @Autowired
-// IIvrTaskTemplateService iIvrTaskTemplateService;
-//
-// @Value("${hosp_info_url}")
-// private String hospInfoUrl;
-//
-// @Value("${appid}")
-// private String appid;
-//
-// @Value("${server.port}")
-// private String port;
-//
-// public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
-// System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i));
-// }
-//
-// public void ryParams(String params) {
-// System.out.println("鎵ц鏈夊弬鏂规硶锛�" + params);
-// }
-//
-// public void ryNoParams() {
-// System.out.println("鎵ц鏃犲弬鏂规硶");
-// }
-//
-// public void importData() {
-// String filePath = "C:\\Users\\86176\\Desktop\\鏂板缓鏂囨湰鏂囨。 4.txt"; // 鏇挎崲涓轰綘鐨勬枃浠惰矾寰�
-//
-// try {
-// // 璇诲彇鏂囦欢鍐呭
-// String jsonContent = new String(Files.readAllBytes(Paths.get(filePath)), StandardCharsets.UTF_8);
-//
-// // 鍒涘缓ObjectMapper瀵硅薄
-// ObjectMapper objectMapper = new ObjectMapper();
-// // 瑙ｆ瀽JSON涓篔sonNode
-// JsonNode rootNode = objectMapper.readTree(jsonContent);
-// // 鑾峰彇resultList
-// JsonNode resultListNode = rootNode.path("results").path("resultList");
-// // 閬嶅巻resultList涓殑姣忎釜瀵硅薄
-// for (JsonNode item : resultListNode) {
-//
-// SysUserImport person = objectMapper.treeToValue(item, SysUserImport.class);
-// person.setStaffPhoto("");
-// sysUserImportMapper.insertSysUserImport(person);
-//
-// }
-//
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-//
-// }
-//
-// public void analysisData() {
-// System.out.println("---------------------------");
-// //鏁版嵁瑙ｆ瀽
-// ServiceThirdData serviceThirdData = new ServiceThirdData();
-// serviceThirdData.setDataType("ADT^A03");
-// serviceThirdData.setIsDeal(0);
-// serviceThirdData.setCreateTime(new Date());
-// iServiceThirdDataService.queryList(serviceThirdData);
-//
-// }
-//
-// /**
-// * 瀹氭椂澶勭悊澶栭摼鐨勬暟鎹�
-// */
-// public void runServiceSubTaskAnswer() {
-// serviceSubtaskAnswerService.saveQuestionAnswer(null, 0L);
-// }
-//
-//
-// /**
-// * 澶勭悊his鏁版嵁
-// */
-// public void dealHisData() {
-// //灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
-// // 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
-// LocalDateTime endTime = LocalDateTime.now();
-// endTime = endTime.with(LocalTime.MIN);
-//// String dateStr = "2024/11/30 00:00:00";
-//// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-//// LocalDateTime endTime = LocalDateTime.parse(dateStr, formatter);
-// // 鑾峰彇鍓嶄竴澶╃殑鏃ユ湡鍜屾椂闂�
-// LocalDateTime startTime = endTime.minusDays(1);
-// startTime = startTime.with(LocalTime.MIN);
-// getInHospInfo("0", startTime, endTime);
-// getInHospInfo("1", startTime, endTime);
-//
-// //璋冪敤dealOupHospInfo鏁版嵁澶勭悊鏂规硶锛屽鐞嗗畬鍚庯紝灏嗏�滃嚭闄㈣〃鐨刢heck_flag=1鈥�
-// //鑾峰彇褰撳墠鏃ユ湡 锛堢簿纭埌澶╋級寰�鍓嶆帹鐩稿簲澶╂暟锛堝湪鎸囧畾鐨勫熀纭�妯℃澘涓壘瀵瑰簲鐨勫ぉ鏁帮級锛�
-// //寰幆鎮ｈ�呬俊鎭紝鏍规嵁鎮ｈ��"鍑洪櫌璇婃柇ICD鍊尖�濊幏鍙栧埌鐩稿綋鐨勬ā鏉匡紙鑾峰彇鍙栫浉搴旂殑澶╂暟锛�;
-// //鏍规嵁鏌ヨ鍑烘潵鐨勬ā鏉匡紝鍘诲浐瀹氫换鍔★紙鍥哄畾浠诲姟锛屽凡缁忓皢妯℃澘涔熷浐瀹氫簡锛夊幓鍖归厤妯℃澘
-// //鏍规嵁鍖归厤鍑烘潵鐨勬ā鏉垮拰浠诲姟涓庢偅鑰呬俊鎭紝灏嗘暟鎹彃鍏ュ埌瀛愪换鍔¤〃涓�
-// }
-//
-// public void dealHisData2() {
-// //灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
-// // 鎸囧畾鐨勫紑濮嬫棩鏈�
-// LocalDate endDate = LocalDate.of(2025, 3, 3);
-// // 褰撳墠鏃ユ湡
-// LocalDate currentDate = LocalDate.now();
-// // 瀹氫箟鏃ユ湡鏍煎紡
-// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd ");
-//
-// // 浠庡紑濮嬫棩鏈熷埌褰撳墠鏃ユ湡閫愬ぉ鎵撳嵃
-// for (LocalDate date = endDate; !date.isAfter(currentDate); date = date.plusDays(1)) {
-// System.out.println(date.format(formatter));
-// getInHospInfo("0", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
-// getInHospInfo("1", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
-// }
-//
-// }
-//
-// /**
-// * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
-// */
-// public void dealOutHospInfo() {
-// if (port.equals("8095")) {
-// //鍑洪櫌琛�
-// iPatMedInhospService.dealOutHospInfo();
-// //闂ㄨ瘖琛�
-// if (visitHosp != 1) {
-// iPatMedOuthospService.dealOutpatientInfo();
-// }
-// }
-// }
-//
-//
-// /**
-// * 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
-// */
-// public void dealOperationInfo() {
-// if (port.equals("8095")) iPatMedOperationService.dealOperationInfo();
-//
-// }
-//
-// /**
-// * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(寰俊灏忕▼搴�)
-// */
-// public void dealOutHospInfoXHC() {
-// if (port.equals("8095")) {
-// PatMedInhosp patMedInhosp = new PatMedInhosp();
-// //鑾峰彇鏈鐞嗙殑鏁版嵁
-// List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp());
-// }
-// }
-//
-//
-// /**
-// * 闀挎湡浠诲姟鎵ц
-// */
-// public void longTaskSend() {
-// //鑾峰彇浠诲姟淇℃伅
-// ServiceTask st = new ServiceTask();
-// st.setDelFlag("0");
-// st.setLongTask(1);
-// List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
-// log.info("serviceTasks杩涙潵浜嗗悧锛焮}", serviceTasks.size());
-// for (ServiceTask serviceTask : serviceTasks) {
-// CommonTaskcallMQ commonTaskcallMQ = new CommonTaskcallMQ();
-// commonTaskcallMQ.setTaskid(serviceTask.getTaskid());
-// commonTaskcallMQ.setPreachform(serviceTask.getPreachform());
-// commonTaskcallMQ.setSendType("2");
-// sfHandlle(commonTaskcallMQ, localIP);
-// }
-// }
-//
-// /**
-// * 鍒ゆ柇鏃ユ湡鏄惁鏄粖澶�
-// *
-// * @param date
-// * @return
-// */
-// public boolean isDateToday(Date date) {
-// if (date == null) {
-// return false;
-// }
-// // 灏� Date 杞负 LocalDate
-// LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-// // 鑾峰彇浠婂ぉ鐨� LocalDate
-// LocalDate today = LocalDate.now();
-// // 濡傛灉鏃ユ湡鏃╀簬鎴栫瓑浜庝粖澶╋紝杩斿洖 true
-// return !localDate.isAfter(today);
-// }
-//
-// public void sfHandlle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
-// log.info("sfHandlle杩涙潵浜嗗悧锛焮}", commonTaskcallMQ);
-// //鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
-// ServiceTask ivrTask1 = serviceTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
-//
-// if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
-// //濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
-// String[] split = commonTaskcallMQ.getPreachform().split(",");
-// log.info("split杩涙潵浜嗗悧锛焮}", split);
-// for (String serviceFrom : split) {
-// String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(serviceFrom));
-// //閫氳繃浠诲姟ID鎷垮埌鎮ｈ�呬俊鎭�
-// ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO();
-// ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
-// ivrTaskcall.setSendstate(2L);
-// List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
-// //涓芥按鏈夌殑鍖婚櫌杩樻病娉曞仛闀挎湡浠诲姟闅忚
-// List<ServiceSubtask> subtaskList2 = new ArrayList<>();
-// if (visitHosp == 2) {
-// for (ServiceSubtask serviceSubtask : subtaskList) {
-//// Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
-// Boolean b = false;
-// if (b) subtaskList2.add(serviceSubtask);
-// }
-// subtaskList = subtaskList2;
-// }
-//
-// // 鎸夌収 endtime 绂诲綋鍓嶆椂闂存渶杩戠殑鎺掑簭
-// List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
-//
-// if (descByCode.equals("鐢佃瘽")) {
-// String value = "";
-// List<String> list = new ArrayList<>();
-// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
-// ServiceTask ivrTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
-// if (ivrTask.getSendState() != null && ivrTask.getSendState() == 3 || ivrTask.getSendState() != null && ivrTask.getSendState() == 4) {
-// //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
-// break;
-// }
-// if (org.apache.commons.lang3.StringUtils.isEmpty(serviceSubtask.getPhone())) {
-// serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
-// serviceSubtask.setSendstate(4L);
-// serviceSubtask.setResult("error");
-//// serviceSubtask.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
-// continue;
-// }
-// boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
-// //璇存槑鏄珛鍗冲彂閫�(鍏堟妸娑堟伅鏀惧埌cache-0涓紝 displayNo涓嶇煡閬撴�庝箞閰嶇疆)
-// if (dateToday) {
-// list.add(serviceSubtask.getId().toString());
-// //鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
-// String uuid = UUID.randomUUID().toString();
-// serviceSubtask.setResult("success");
-// serviceSubtask.setRemark("闀挎湡浠诲姟锛岀數璇濊繘鍏ラ槦鍒楁垚鍔�");
-// serviceSubtask.setGuid(uuid);
-// 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);
-//
-// }
-// }
-// //灏嗚鎵ц鐨勬斁鍒扮紦瀛樹腑
-// if (list.size() > 0) {
-//// redisCache.setCacheListLeft("cache-0", list);
-// redisCache.setCacheListLeftAndDistinct("cache-0", list);
-// }
-// } else if (descByCode.equals("澶氬獟浣�")) {
-// //澶氬獟浣�
-// } else if (descByCode.equals("绾歌川")) {
-// //绾歌川
-// } else if (descByCode.equals("寰俊灏忕▼搴�")) {
-// //寰俊灏忕▼搴�
-// log.info("ivrTask1鐨勫�间负锛歿}", ivrTask1);
-// if (ObjectUtils.isNotEmpty(ivrTask1) && ivrTask1.getPatCycle() == 1) {
-// //璇存槑璇ヤ换鍔＄殑鎮ｈ�呮槸寰幆鎵ц鐨�
-// ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
-// serviceSubtaskVO.setTaskid(ivrTask1.getTaskid());
-// List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
-// //杩欓噷闇�瑕佹牴鎹韩浠借瘉鍘婚噸
-// List<ServiceSubtask> serviceSubtaskListFilter = new ArrayList<>();
-// aa:
-// for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
-// for (ServiceSubtask ss : serviceSubtaskListFilter) {
-// if (ss.getSfzh().equals(serviceSubtask.getSfzh())) {
-// continue aa;
-// }
-// }
-// serviceSubtaskListFilter.add(serviceSubtask);
-// }
-// for (ServiceSubtask serviceSubtask : serviceSubtaskListFilter) {
-// //灏嗗瓙浠诲姟ID鍒犻櫎 銆乻endstate鏀规垚3
-// serviceSubtask.setSendstate(3L);
-// serviceSubtask.setId(null);
-// serviceSubtask.setFinishtime(null);
-// serviceSubtask.setCreateTime(new Date());
-// serviceSubtask.setUpdateTime(new Date());
-// //澶勭悊閲嶅鏂板闂锛屽厛鏌ヤ竴涓嬩粖澶╂槸涓嶆槸鏈夋柊澧炶繃锛屾柊澧炶繃灏变笉鏂板浜�
-// ServiceSubtaskVO ssvo = new ServiceSubtaskVO();
-// LocalDate today = LocalDate.now();
-// LocalTime startOfDay = LocalTime.of(0, 0, 0);
-// LocalTime endOfDay = LocalTime.of(23, 59, 59);
-// Date startOfDayDate = Date.from(today.atTime(startOfDay).atZone(ZoneId.systemDefault()).toInstant());
-// Date endOfDayDate = Date.from(today.atTime(endOfDay).atZone(ZoneId.systemDefault()).toInstant());
-// ssvo.setCreateStartTime(startOfDayDate);
-// ssvo.setCreateEndTime(endOfDayDate);
-// ssvo.setCreateBy(serviceSubtask.getCreateBy());
-// ssvo.setSendname(serviceSubtask.getSendname());
-// ssvo.setSfzh(serviceSubtask.getSfzh());
-// List<ServiceSubtask> serviceSubtaskListByCreateTime = serviceSubtaskMapper.selectServiceSubtaskListByCreateTime(ssvo);
-// if (CollectionUtils.isEmpty(serviceSubtaskListByCreateTime))
-// serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
-// }
-// }
-// } else if (descByCode.equals("鐭俊")) {
-// RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
-// String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
-// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
-// log.info("鐭俊闀挎湡浠诲姟鍙戦��---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
-// boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
-// if (dateToday) {
-// try {
-// //鍏堝垽鏂偅鑰呮槸涓嶆槸杩樿鍙戦��
-// PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask.getPatid());
-// if (!Objects.isNull(patArchive) && patArchive.getNotrequiredFlag() == "1") {
-// //涓嶉渶瑕佸彂閫�
-// serviceSubtask.setResult("error");
-// serviceSubtask.setRemark(patArchive.getNotrequiredreason());
-// serviceSubtask.setSendstate(4L);
-//// serviceSubtask.setFinishtime(new Date());
-// iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
-// continue;
-// }
-// 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");
-// ServiceOutPath serviceOutPath = new ServiceOutPath();
-// serviceOutPath.setParam1(taskId);
-// serviceOutPath.setParam2(patid);
-// serviceOutPath.setParam3(ivrTask1.getTaskName());
-// serviceOutPath.setParam6(subId);
-// serviceOutPath.setCreateTime(new Date());
-// iServiceOutPathService.insertServiceOutPath(serviceOutPath);
-// String format = String.format("%03X", serviceOutPath.getId());
-// serviceOutPath.setRadix(format);
-// serviceOutPath.setUpdateTime(new Date());
-// iServiceOutPathService.updateServiceOutPath(serviceOutPath);
-// sendMagParam.setPhone(serviceSubtask.getPhone());
-// sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format);
-// sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
-// String isSuccess = null;
-// if (visitHosp == 1) {
-// Map<String, String> req = new HashMap<>();
-// req.put("phone", sendMagParam.getPhone());
-// req.put("content", sendMagParam.getContent());
-// isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
-// } else if (visitHosp == 2) {
-// //涓芥按鐨勭煭淇″彂閫佹柟寮�
-// Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
-// String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid());
-// if (ObjectUtils.isNotEmpty(map) && StringUtils.isEmpty(map.get("address"))) {
-// ServiceSubtask ss = new ServiceSubtask();
-// ss.setResult("error");
-// ss.setRemark("鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�");
-// ss.setSendstate(5L);
-// ss.setId(serviceSubtask.getId());
-//// ss.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(ss);
-// continue;
-// }
-// log.info("---------涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿}, 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.info("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode);
-// ObjectMapper objectMapper = new ObjectMapper();
-// Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
-// String code = textParam.get("Code").toString();
-// if (code.equals("0")) {
-// isSuccess = "true";
-// }
-// }
-// //浠诲姟鍙戦�佽褰�
-// ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
-// serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
-// serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
-// serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
-// serviceSubtaskRecord.setPreachform("4");
-// serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
-// serviceSubtaskRecord.setResult("success");
-// if (StringUtils.isNotEmpty(isSuccess) && !isSuccess.equals("true"))
-// serviceSubtaskRecord.setResult("error");
-// serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
-//
-// //鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
-// serviceSubtask.setSendstate(3L);
-// if (StringUtils.isNotEmpty(isSuccess) && !isSuccess.equals("true")) {
-// serviceSubtask.setResult("success");
-// serviceSubtask.setRemark("鐭俊鍙戦�佹垚鍔�");
-// } else {
-// serviceSubtask.setResult("error");
-// serviceSubtask.setSendstate(5L);
-// serviceSubtask.setRemark("鐭俊鍙戦�佸け璐�");
-// }
-// iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
-// } catch (Exception e) {
-// String guid = UUID.randomUUID().toString();
-// log.error("闀挎湡浠诲姟锛岀煭淇″彂閫佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
-// serviceSubtask.setResult("error");
-// serviceSubtask.setRemark("绯荤粺閿欒");
-// serviceSubtask.setSendstate(5L);
-//// serviceSubtask.setFinishtime(new Date());
-// serviceSubtask.setGuid(guid);
-// iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
-// }
-// }
-// }
-// } else if (descByCode.equals("鍏紬鍙�")) {
-// log.info("鍏紬鍙疯繘鏉ヤ簡鍚楋紵{}", descByCode);
-// //鍏紬鍙�
-// RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
-// String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
-// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
-// // log.error("serviceSubtask---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
-// boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
-// if (dateToday) {
-// try {
-// //鍏堝垽鏂偅鑰呮槸涓嶆槸杩樿鍙戦��
-// PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask.getPatid());
-// if (!Objects.isNull(patArchive) && patArchive.getNotrequiredFlag() == "1") {
-// //涓嶉渶瑕佸彂閫�
-// serviceSubtask.setResult("error");
-// serviceSubtask.setRemark(patArchive.getNotrequiredreason());
-// serviceSubtask.setSendstate(4L);
-//// serviceSubtask.setFinishtime(new Date());
-// iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
-// continue;
-// }
-// String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
-// String url = null;
-// url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
-//// String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
-//
-// //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
-// List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
-// if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
-// ServiceSubtask ss = new ServiceSubtask();
-// ss.setResult("error");
-// ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
-// ss.setSendstate(5L);
-// ss.setId(serviceSubtask.getId());
-//// ss.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(ss);
-// continue;
-// }
-//
-// if (StringUtils.isEmpty(patArchive.getPatidHis())) {
-// ServiceSubtask ss = new ServiceSubtask();
-// ss.setResult("error");
-// ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
-// ss.setSendstate(5L);
-// ss.setId(serviceSubtask.getId());
-//// ss.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(ss);
-// continue;
-// }
-// String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
-//
-// Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
-// //浠诲姟鍙戦�佽褰�
-// ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
-// serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
-// serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
-// serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
-// serviceSubtaskRecord.setPreachform("4");
-// serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
-// serviceSubtaskRecord.setResult("success");
-// if (!map.isEmpty() && (Boolean) map.get("succ") == false)
-// serviceSubtaskRecord.setResult("error");
-// serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
-//
-// //鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
-// serviceSubtask.setSendstate(3L);
-// if ((Boolean) map.get("succ") == true) {
-// serviceSubtask.setResult("success");
-// } else {
-// serviceSubtask.setResult("error");
-// serviceSubtask.setSendstate(5L);
-// serviceSubtask.setRemark(map.get("msg").toString());
-// }
-// iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
-// } catch (Exception e) {
-// String guid = UUID.randomUUID().toString();
-// log.error("闀挎湡浠诲姟锛屽叕浼楀彿鍙戦�佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
-// serviceSubtask.setResult("error");
-// serviceSubtask.setRemark("绯荤粺閿欒");
-// serviceSubtask.setSendstate(5L);
-//// serviceSubtask.setFinishtime(new Date());
-// serviceSubtask.setGuid(guid);
-// iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
-// }
-// }
-// }
-// }
-// //閫氱煡 MQ 娑堟伅宸茶鎺ユ敹,鍙互ACK(浠庨槦鍒椾腑鍒犻櫎)浜� 锛堣繖涓渶瑕佹牴鎹笟鍔″啀鍘诲鐞咥CK锛�
-// }
-// }
-// }
-//
-//
-// /**
-// * 鑾峰嚭闄㈡偅鑰呬俊鎭�
-// * cry 鍑哄叆闄細 0 鍏ラ櫌 1 鍑洪櫌
-// */
-// @Transactional
-// public void getInHospInfo(String cry, LocalDateTime startTime, LocalDateTime endTime) {
-// // 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡
-// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S");
-// Map<String, String> req = new HashMap<>();
-// if (cry.equals("1")) {
-// req.put("cashStartDate", startTime.format(formatter));
-// req.put("cashEndDate", endTime.format(formatter));
-// req.put("currStatus", "4");
-// } else if (cry.equals("0")) {
-// req.put("admissStartDate", startTime.format(formatter));
-// req.put("admissEndDate", endTime.format(formatter));
-// req.put("currStatus", "2");
-// }
-// Map<String, String> header = new HashMap<>();
-// header.put("x-hcsb-serviceno", "IS002347");
-// header.put("x-hcsb-version", "2.0");
-// header.put("x-hcsb-sourcesyscode", "14");
-// header.put("x-hcsb-token", "ArGE2JnHtxG/Zx5nrnGY4eOfMUJGGJokAJHigG1BrCY=");
-// header.put("x-hcsb-msgdate", startTime.format(formatter));
-// String result = HttpUtils.sendPostByHeader(hospInfoUrl, new Gson().toJson(req), header);
-// //鏁版嵁瑙ｆ瀽
-// Gson gson = new Gson();
-// JsonObject jsonObject = gson.fromJson(result, JsonObject.class);
-// JsonArray resultArray = jsonObject.getAsJsonObject("data").getAsJsonArray("result");
-// Type resultType = new TypeToken<List<ThiedInhospInfo>>() {
-// }.getType();
-// List<ThiedInhospInfo> thiedInhospInfoList = gson.fromJson(resultArray, resultType);
-//
-// // 鍒涘缓涓�涓柊鏂囦欢
-// String filename = null;
-// if (cry.equals("0")) filename = "鍏ラ櫌淇℃伅" + System.currentTimeMillis();
-// if (cry.equals("1")) filename = "鍑洪櫌淇℃伅" + System.currentTimeMillis();
-// File file = new File("D:\\public\\HIS鏁版嵁閲囬泦\\" + filename);
-// if (!file.exists()) {
-// // 濡傛灉鏂囦欢涓嶅瓨鍦紝鍒欏垱寤烘柊鏂囦欢
-// try {
-// if (file.createNewFile()) {
-// System.out.println("鎴愬姛鍒涘缓浜嗘柊鏂囦欢!");
-// } else {
-// System.out.println("澶辫触锛佹枃浠舵棤娉曞垱寤猴紒");
-// }
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// }
-// // 灏嗘暟鎹啓鍏ュ埌鏂囦欢涓�
-// try {
-// FileWriter writer = new FileWriter(file);
-// writer.write(result);
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-//
-// if (CollectionUtils.isNotEmpty(thiedInhospInfoList)) {
-// for (ThiedInhospInfo thiedInhospInfo : thiedInhospInfoList) {
-// //閫氳繃韬唤璇佸彿鏌ヨ璇ユ偅鑰呭湪鎮ｈ�呰〃鏄惁瀛樺湪
-// PatArchive patArchive = new PatArchive();
-// List<PatArchive> patArchives = null;
-// patArchive.setIdcardno(thiedInhospInfo.getPatiIdCardNo().trim());
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiIdCardNo().trim())) {
-// patArchives = patArchiveService.selectPatArchiveList(patArchive);
-// } else {
-// //鎮ｈ�呬俊鎭负绌猴紝鐩存帴 涓嬩竴涓�
-// continue;
-// }
-//
-// patArchive.setPatientno(thiedInhospInfo.getPatiMediaNo());
-// patArchive.setSourcefrom(2);
-// patArchive.setPattype("2");
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getOutWayId()) && thiedInhospInfo.getOutWayId().equals("4")) {
-// //濡傛灉涓�4灏辨槸姝讳骸
-// patArchive.setNotrequiredFlag("1");
-// patArchive.setNotrequiredreason(thiedInhospInfo.getOutWayName());
-// }
-// if (cry.equals("1") && StringUtils.isEmpty(thiedInhospInfo.getOutWayId())) {
-// //濡傛灉涓�4灏辨槸姝讳骸
-// patArchive.setNotrequiredFlag("1");
-// patArchive.setNotrequiredreason("鍑洪櫌鏂瑰紡涓虹┖");
-// }
-// patArchive.setSex(thiedInhospInfo.getPatiRecordGender().equals("鐢�") ? 1L : 2L);
-// patArchive.setNation(thiedInhospInfo.getPatiNation());
-// patArchive.setNativePlace(thiedInhospInfo.getPatiNationality());
-// patArchive.setPlaceOfResidence(StringUtils.isNotEmpty(thiedInhospInfo.getPatiHomeAddr()) ? thiedInhospInfo.getPatiHomeAddr().replace("null", "") : "");
-// try {
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiBirthday()))
-// patArchive.setBirthdate(new SimpleDateFormat("yyyy-MM-dd").parse(thiedInhospInfo.getPatiBirthday()));
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// if (thiedInhospInfo.getTreateAge() != null) {
-// patArchive.setAge(Long.valueOf(thiedInhospInfo.getTreateAge()));
-// } else {
-// patArchive.setAge(null);
-// }
-// patArchive.setAgeUnit(thiedInhospInfo.getTreatAgeunit());
-// patArchive.setTelcode(thiedInhospInfo.getCompanyTelNum());
-// patArchive.setRelativetelcode(thiedInhospInfo.getContactPersonPhone());
-// patArchive.setDelFlag("0");
-// patArchive.setCreateTime(new Date());
-// patArchive.setUpdateTime(new Date());
-// patArchive.setName(thiedInhospInfo.getPatiRecordName());
-// if (CollectionUtils.isEmpty(patArchives) || patArchives.size() == 0) {
-// patArchiveService.insertPatArchive(patArchive);
-// } else {
-// patArchive.setId(patArchives.get(0).getId());
-// patArchiveService.updateArchive(patArchive);
-// }
-//
-// log.error("鍏ュ弬鐨刾atArchive锛歿}", patArchive);
-// PatMedInhosp patMedInhosp = new PatMedInhosp();
-// patMedInhosp.setPatid(patArchive.getId());
-// patMedInhosp.setPatno(patArchive.getPatientno());
-// patMedInhosp.setPatname(patArchive.getName());
-// patMedInhosp.setNurseId(thiedInhospInfo.getNurseId());
-// patMedInhosp.setNurseName(thiedInhospInfo.getNurseName());
-// patMedInhosp.setSerialnum(thiedInhospInfo.getInpatientId());
-// patMedInhosp.setFuflag("1");
-// if (cry.equals("0")) {
-// patMedInhosp.setInhospstate("0");
-// } else if (cry.equals("1")) {
-// patMedInhosp.setInhospstate("1");
-// }
-// patMedInhosp.setHospitalcode(thiedInhospInfo.getAreaId());
-// patMedInhosp.setIcd10code(thiedInhospInfo.getDiagIcd10());
-// patMedInhosp.setDiagname(thiedInhospInfo.getDiagName());
-// try {
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getAdmissDate()))
-// patMedInhosp.setStarttime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getAdmissDate()));
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// try {
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getOutDate()))
-// patMedInhosp.setEndtime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getOutDate()));
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// patMedInhosp.setDeptcode(thiedInhospInfo.getAdmissDeptId());
-// patMedInhosp.setDeptid(thiedInhospInfo.getAdmissDeptId());
-// patMedInhosp.setDeptname(thiedInhospInfo.getAdmissDeptName());
-// patMedInhosp.setBedNo(thiedInhospInfo.getAdmissBedNo());
-// patMedInhosp.setDelFlag("0");
-//// patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrDeptCode());
-// patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrDeptId());
-// patMedInhosp.setLeaveldeptname(thiedInhospInfo.getCurrDeptName());
-// patMedInhosp.setLeavediagname(thiedInhospInfo.getDiagName());
-// patMedInhosp.setLeaveicd10code(thiedInhospInfo.getDiagIcd10());
-// patMedInhosp.setDrname(thiedInhospInfo.getDoctName());
-// patMedInhosp.setDrcode(thiedInhospInfo.getDoctId());
-// patMedInhosp.setOutWayId(thiedInhospInfo.getOutWayId());
-// patMedInhosp.setOutWayName(thiedInhospInfo.getOutWayName());
-// if (cry.equals("0")) {
-// patMedInhosp.setSchemestatus(1L);
-// } else if (cry.equals("1")) {
-// patMedInhosp.setSchemestatus(2L);
-// }
-// patMedInhosp.setLeavehospitaldistrictid(thiedInhospInfo.getCurrWardCode());
-// patMedInhosp.setLeavehospitaldistrictcode(thiedInhospInfo.getCurrWardId());
-// patMedInhosp.setLeavehospitaldistrictname(thiedInhospInfo.getCurrWardName());
-// patMedInhosp.setLeaveldeptid(thiedInhospInfo.getCurrDeptCode());
-// patMedInhosp.setOrgid("1");
-// //濡傛灉鏄嚭闄紝鍏堥�氳繃鎮ｈ�呯紪鍙峰拰娴佹按鍙峰幓鏌ヤ竴涓嬶紝鎮ｈ�呮槸鍚﹀瓨鍦紝濡傛灉瀛樺湪锛屽垯杩涜淇敼
-// PatMedInhosp inhosp = new PatMedInhosp();
-// inhosp.setPatno(patArchive.getPatientno());
-// inhosp.setSerialnum(patMedInhosp.getSerialnum());
-// List<PatMedInhosp> patMedInhosps = patMedInhospService.selectPatMedInhospList(inhosp);
-// log.error("鏄惁闇�瑕佹洿鏂帮細{}", patMedInhosps.size());
-// if (CollectionUtils.isNotEmpty(patMedInhosps)) {
-// patMedInhosp.setInhospid(patMedInhosps.get(0).getInhospid());
-// log.error("------鎮ｈ�呭嚭鍏ラ櫌淇敼淇℃伅锛歿}", patMedInhosp);
-// patMedInhospService.updatePatMedInhosp(patMedInhosp);
-// } else {
-// log.error("----鎮ｈ�呭嚭鍏ラ櫌鏂板淇℃伅锛歿}", patMedInhosp);
-// patMedInhospService.insertPatMedInhosp(patMedInhosp);
-// }
-//
-// }
-// }
-// }
-//
-//
-// private String getKey() {
-// Map<String, String> map = new HashMap<>();
-// for (int i = 0; i < 6; i++) {
-// Boolean aBoolean = redisCache.hasKey("cache-" + i);
-// if (!aBoolean) {
-// redisCache.setCacheObject("cache-" + i, "");
-// map.put("cache-" + i, "");
-// } else {
-// map.put("cache-" + i, redisCache.getCacheObject("cache-" + i));
-// }
-// }
-//
-// String key = null;
-// String value = "";
-// for (Map.Entry<String, String> entry : map.entrySet()) {
-// if (StringUtils.isEmpty(value)) {
-// value = entry.getValue();
-// key = entry.getKey();
-// } else {
-// if (entry.getValue().split(",").length < value.split(",").length) {
-// value = entry.getValue();
-// key = entry.getKey();
-// }
-// }
-// }
-// return key;
-// }
-//
-// private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap, String token) {
-// Map<String, Object> map = new LinkedHashMap<>();
-//
-// Map<String, Object> YeWuXX = new LinkedHashMap<>();
-// Map<String, Object> DuanXinXX = new LinkedHashMap<>();
-// DuanXinXX.put("ShouJiHM", ShouJiHM);
-// DuanXinXX.put("FaSongNR", FaSongNR);
-// DuanXinXX.put("FaSongRID", FaSongRID);
-// DuanXinXX.put("FaSongRXM", FaSongRXM);
-// YeWuXX.put("DuanXinXX", DuanXinXX);
-//
-// map.put("XiaoXiTou", headerMap);
-// map.put("YeWuXX", YeWuXX);
-//
-// String body = new Gson().toJson(map);
-//
-//// String result = HttpUtils.sendPost(address, body);
-// String result = null;
-// try {
-// result = OkHttpExample.sendPostRequest(address, body, token);
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// log.error("--------result鐨勫�间负锛歿}-----", result);
-//
-// JSONObject jsonObject = JSONObject.parseObject(result);
-// String code = (String) jsonObject.toString();
-// return code;
-// }
-//
-//
-// private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid, List<String> wxqqxx) {
-// XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
-// xinHuaWXReq.setIdcard(idcard);
-// xinHuaWXReq.setUrl(url);
-// xinHuaWXReq.setPatientid(setPatientid);
-// xinHuaWXReq.setPatientname(setPatientname);
-// xinHuaWXReq.setMobile(phone);
-// xinHuaWXReq.setMedcardno(null);
-// xinHuaWXReq.setTitlename(taskName);
-// xinHuaWXReq.setContent(taskDesc);
-// xinHuaWXReq.setAppid(wxqqxx.get(1));
-// log.error("----getWXCode---xinHuaWXReq鐨勫嚭鍙備负锛歿}", xinHuaWXReq);
-// String body = new Gson().toJson(xinHuaWXReq);
-// String encode = encode(wxqqxx.get(2).concat(body));
-// Map<String, String> headerMap = new HashMap<>();
-// headerMap.put("sign", encode);
-// String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
-//
-// JSONObject jsonObject = JSONObject.parseObject(result);
-// String code = (String) jsonObject.toString();
-// return code;
-// }
-//
-//
-// public String encode(String arg) {
-// if (arg == null) {
-// arg = "";
-// }
-// MessageDigest md5 = null;
-// try {
-// md5 = MessageDigest.getInstance("MD5");
-// md5.update(arg.getBytes("UTF-8"));
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return toHex(md5.digest());
-// }
-//}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveSrmVO.java b/smartor/src/main/java/com/smartor/domain/PatArchiveSrmVO.java
new file mode 100644
index 0000000..539084f
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveSrmVO.java
@@ -0,0 +1,44 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎮ｈ�呮。妗堝璞� PatArchiveVO
+ *
+ * @author ls
+ */
+@ApiModel(value = "PatArchiveVO", description = "鎮ｈ�呯煭淇℃ā鏉垮彂閫�")
+@Data
+public class PatArchiveSrmVO extends BaseEntity {
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("濮撳悕")
+ @Excel(name = " 濮撳悕 ")
+ private String name;
+
+
+ @ApiModelProperty("鐭俊妯℃澘")
+ @Excel(name = "鐭俊妯℃澘")
+ private String srmTemplate;
+
+ @ApiModelProperty("鎵嬫満鍙�")
+ @Excel(name = "鎵嬫満鍙�")
+ private String phone;
+
+
+ @ApiModelProperty("鏉ヨ鏃堕棿")
+ @Excel(name = "鏉ヨ鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private Date visitTime;
+
+}
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index 89ecadf..59af7b6 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -134,4 +134,6 @@
public List<ServiceSubtaskCount> getSfStatisticsJoydetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
public List<ServiceStatisticsResponse> getServiceStatistics(ServiceStatisticsRequest request);
+
+ public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS);
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 7e34d50..964e0b8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -51,8 +51,9 @@
@Autowired
private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
- @Value("${visitHosp}")
- private Integer visitHosp;
+ @Value("${spring.profiles.active}")
+ private String active;
+
/**
* 鏌ヨ鎮ｈ�呬綇闄㈣褰�
@@ -260,8 +261,7 @@
}
//鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
- if (visitHosp != 1) {
-
+ if (active.equals("xh")) {
PatMedInhosp pmbq = new PatMedInhosp();
//鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
pmbq.setWardcheckFlag("0");
@@ -561,6 +561,10 @@
return;
}
ServiceTask serviceTask = serviceTasks.get(0);
+
+ if (Objects.isNull(patMedInhosp1.getEndtime())) {
+ return;
+ }
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive);
if (type != 2) {
@@ -627,8 +631,22 @@
}
}
+ } else {
+ if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
+ serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setResult("error");
+ }
+ serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+ serviceSubtask.setCreateTime(new Date());
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
}
} else {
+ if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
+ serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setResult("error");
+ }
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
serviceSubtask.setCreateTime(new Date());
i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -727,7 +745,13 @@
serviceSubtask.setUpdateTime(new Date());
//璁剧疆鍙戦�佹椂闂�
if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
- Date newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
+ Date newDate = null;
+ if (!Objects.isNull(patMedInhosp1.getEndtime())) {
+ newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
+ } else {
+ //濡傛灉鍑洪櫌鏃堕棿涓虹┖锛屽垯杩斿洖涓�涓柊瀵硅薄
+ return new ServiceSubtask();
+ }
serviceSubtask.setLongSendTime(newDate);
serviceSubtask.setVisitTime(newDate);
//濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪sys_conf琛ㄤ腑锛�
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 76af007..370d592 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1,10 +1,12 @@
package com.smartor.service.impl;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.dx.MessageSend;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.smartor.common.FtpService;
@@ -25,10 +27,7 @@
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
+import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -2080,6 +2079,37 @@
return result;
}
+ @Override
+ public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS) {
+ //鐢ㄦ潵璁板綍鍙戦�佸け璐ョ殑
+ List<PatArchiveSrmVO> sendError = new ArrayList<>();
+
+ for (PatArchiveSrmVO patArchiveSrmVO : patArchiveSrmVOS) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY骞碝M鏈坉d鏃H:mm");
+ String timestamp = simpleDateFormat.format(patArchiveSrmVO.getVisitTime());
+
+ StringBuilder stringBuilder = new StringBuilder();
+ if (patArchiveSrmVO.getSrmTemplate().equals("鍏ラ櫌鍑嗗涓績-鏃犳鏌�")) {
+ stringBuilder.append(patArchiveSrmVO.getName() + ",鎮ㄥソ锛佷富绠″尰鐢熷凡涓烘偍瀹夋帓浣忛櫌锛岃浜庡綋澶�");
+ } else if (patArchiveSrmVO.getSrmTemplate().equals("鍏ラ櫌鍑嗗涓績-绌鸿吂妫�鏌�")) {
+ stringBuilder.append(patArchiveSrmVO.getName() + ",鎮ㄥソ锛佷富绠″尰鐢熷凡涓烘偍瀹夋帓浣忛櫌锛岃褰撳ぉ绌鸿吂骞朵簬");
+ } else if (patArchiveSrmVO.getSrmTemplate().equals("鏃ラ棿鐥呮埧鈥旀嫨鏈熺梾浜烘鏌�")) {
+ stringBuilder.append(patArchiveSrmVO.getName() + ",鎮ㄥソ锛佷富绠″尰鐢熷凡涓烘偍瀹夋帓浣忛櫌鍓嶆鏌ワ紝璇峰綋澶╃┖鑵瑰苟浜�");
+ }
+
+ stringBuilder.append(timestamp + ",涔嬪墠鎼哄甫鍖讳繚鍗℃垨鐢靛瓙鍖讳繚鍗¤韩浠借瘉鍑鏉＄煭淇″埌1鍙锋ゼ3妤煎崡鍏ラ櫌鍑嗗涓績鍏ラ櫌鐧昏绐楀彛锛屽姙鐞嗘寮忎綇闄㈡墜缁紝瀹屾垚鍚勯」妫�鏌ュ悗鍐嶅埌鐩稿簲鐥呭尯鎶ゅ＋绔欐姤鍒般��");
+ stringBuilder.append("鍏ラ櫌鍑嗗涓績鐢佃瘽锛�89975977銆傚叆闄㈠姙鐞嗛』鐭�:https://mp.weixin.qq.com/s/OCkotuRyQ8Ld2owFF0YErw");
+
+ JSONObject data = MessageSend.sendMsg(stringBuilder.toString(), "2", patArchiveSrmVO.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ String code = data.get("code").toString();
+ if (StringUtils.isNotEmpty(code) && !code.equals("00000")) {
+ sendError.add(patArchiveSrmVO);
+ }
+ }
+
+ return sendError;
+ }
+
/**
* 鑾峰彇闅忚缁熻姣斾緥
*
--
Gitblit v1.9.3