diff --git a/logs/info.log b/logs/info.log index 095adf0..6e8e68f 100644 --- a/logs/info.log +++ b/logs/info.log @@ -1,3 +1,32 @@ -[16:51:28.500][org.quartz.core.QuartzScheduler - shutdown - 666] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED shutting down. -[16:51:28.505][org.quartz.core.QuartzScheduler - standby - 585] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED paused. -[16:51:28.506][org.quartz.core.QuartzScheduler - shutdown - 740] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED shutdown complete. +[17:17:57.122][org.springframework.boot.StartupInfoLogger - logStarting - 55] Starting AppApplication v0.0.1 on LAPTOP-RQVAK2JK with PID 36224 (D:\ProgramCode\company\WxPush\wx_push\target\push-0.0.1.jar started by banality in D:\ProgramCode\company\WxPush\wx_push\target) +[17:17:57.133][org.springframework.boot.SpringApplication - logStartupProfileInfo - 651] No active profile set, falling back to default profiles: default +[17:18:00.535][org.apache.juli.logging.DirectJDKLog - log - 173] Initializing ProtocolHandler ["http-nio-8123"] +[17:18:00.536][org.apache.juli.logging.DirectJDKLog - log - 173] Starting service [Tomcat] +[17:18:00.536][org.apache.juli.logging.DirectJDKLog - log - 173] Starting Servlet engine: [Apache Tomcat/9.0.36] +[17:18:00.668][org.apache.juli.logging.DirectJDKLog - log - 173] Initializing Spring embedded WebApplicationContext +[17:18:02.340][org.quartz.impl.StdSchedulerFactory - instantiate - 1220] Using default implementation for ThreadExecutor +[17:18:02.364][org.quartz.simpl.SimpleThreadPool - initialize - 268] Job execution threads will use class loader of thread: main +[17:18:02.403][org.quartz.core.SchedulerSignalerImpl - - 61] Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl +[17:18:02.403][org.quartz.core.QuartzScheduler - - 229] Quartz Scheduler v.2.3.2 created. +[17:18:02.405][org.quartz.simpl.RAMJobStore - initialize - 155] RAMJobStore initialized. +[17:18:02.407][org.quartz.core.QuartzScheduler - initialize - 294] Scheduler meta-data: Quartz Scheduler (v2.3.2) 'DefaultQuartzScheduler' with instanceId 'NON_CLUSTERED' + Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally. + NOT STARTED. + Currently in standby mode. + Number of jobs executed: 0 + Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads. + Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered. + +[17:18:02.407][org.quartz.impl.StdSchedulerFactory - instantiate - 1374] Quartz scheduler 'DefaultQuartzScheduler' initialized from default resource file in Quartz package: 'quartz.properties' +[17:18:02.407][org.quartz.impl.StdSchedulerFactory - instantiate - 1378] Quartz scheduler version: 2.3.2 +[17:18:03.550][org.apache.juli.logging.DirectJDKLog - log - 173] Starting ProtocolHandler ["http-nio-8123"] +[17:18:07.725][com.ynxbd.push.quartz.listener.AppStartQuartzJobListener - onApplicationEvent - 33] []Starting Quartz task ... +[17:18:07.740][org.quartz.core.QuartzScheduler - start - 547] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED started. +[17:18:08.630][com.ynxbd.push.config.IniConfig - - 40] IP:192.168.12.119 +[17:18:08.633][com.ynxbd.push.quartz.scheduler.AppQuartzScheduler - startWorkLoadJob - 172] [定时任务]：BI领导推送未设置时间，功能未开启 +[17:18:08.633][org.quartz.core.QuartzScheduler - start - 547] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED started. +[17:18:08.634][com.ynxbd.push.quartz.scheduler.AppQuartzScheduler - startTodayRegJob - 154] [定时任务]：每日预约推送未设置时间，功能未开启，todayRegTimeMom-null,todayRegTimeNoon-null +[17:18:08.634][org.quartz.core.QuartzScheduler - start - 547] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED started. +[17:18:08.639][org.springframework.boot.StartupInfoLogger - logStarted - 61] Started AppApplication in 12.403 seconds (JVM running for 13.654) +[17:18:08.641][com.ynxbd.push.AppApplication - main - 22] 启动医院为：null +[17:18:08.655][com.ynxbd.push.AppApplication - main - 23] token_url路径：http://127.0.0.1:8080/wx/api/getWxAccessToken.do diff --git a/logs/info/info-2025-02-19.log b/logs/info/info-2025-02-19.log new file mode 100644 index 0000000..095adf0 --- /dev/null +++ b/logs/info/info-2025-02-19.log @@ -0,0 +1,3 @@ +[16:51:28.500][org.quartz.core.QuartzScheduler - shutdown - 666] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED shutting down. +[16:51:28.505][org.quartz.core.QuartzScheduler - standby - 585] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED paused. +[16:51:28.506][org.quartz.core.QuartzScheduler - shutdown - 740] Scheduler DefaultQuartzScheduler_$_NON_CLUSTERED shutdown complete. diff --git a/src/main/java/com/ynxbd/push/config/IniConfig.java b/src/main/java/com/ynxbd/push/config/IniConfig.java index ca643e1..eadb3d6 100644 --- a/src/main/java/com/ynxbd/push/config/IniConfig.java +++ b/src/main/java/com/ynxbd/push/config/IniConfig.java @@ -32,6 +32,7 @@ public class IniConfig { public static final String LEADER_TIME; public static final String TODAY_REG_TIME_MOM; public static final String TODAY_REG_TIME_NOON; + public static final String NAME; // 闈欐佸唴閮ㄧ被淇濊瘉Wini鍙疄渚嬪寲涓娆 static { @@ -45,7 +46,7 @@ public class IniConfig { LEADER_TIME = getInstance("leaderTime"); TODAY_REG_TIME_MOM = getInstance("todayRegTimeMom"); TODAY_REG_TIME_NOON = getInstance("todayRegTimeNoon"); - + NAME = getInstance("name"); } /** diff --git a/src/main/java/com/ynxbd/push/controller/ApiController.java b/src/main/java/com/ynxbd/push/controller/ApiController.java index 7ae5ca8..075e7f2 100644 --- a/src/main/java/com/ynxbd/push/controller/ApiController.java +++ b/src/main/java/com/ynxbd/push/controller/ApiController.java @@ -19,6 +19,11 @@ public class ApiController { return "success"; } + /** + * 鑾峰彇redis鏁版嵁 + * @param name 鏃ユ湡锛屼緥锛20250101 + * @return + */ @PostMapping("getRedis") public JSONObject getRedis(String name) { log.info("name-{}",name); diff --git a/src/main/java/com/ynxbd/push/controller/BI/BiController.java b/src/main/java/com/ynxbd/push/controller/BI/BiController.java index 7bb3010..0958452 100644 --- a/src/main/java/com/ynxbd/push/controller/BI/BiController.java +++ b/src/main/java/com/ynxbd/push/controller/BI/BiController.java @@ -1,11 +1,20 @@ package com.ynxbd.push.controller.BI; +import com.ynxbd.push.entity.xbd.his.HIsWorkLoad; +import com.ynxbd.push.helper.HisResultFormat; +import com.ynxbd.push.helper.RedisHelper; +import com.ynxbd.push.httpRequest.xbd.his.HisRequest; import com.ynxbd.push.quartz.pushJob.BI.BiPush; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + /** * @author 鏉庤繘鎵 * @ClassName BiController @@ -19,10 +28,30 @@ public class BiController { @GetMapping("workLoadPush") public String workLoadPush(String openId) { try { +// Date date = new Date(); +// SimpleDateFormat formatter = new SimpleDateFormat(); +// formatter.applyPattern("yyyyMMdd"); +// String redisKeyDate = formatter.format(date); +// Thread.sleep(10000); +// List targetList = new ArrayList<>(); +// System.out.println("sssssssss----1"); +// if (targetList.isEmpty()) { +// System.out.println("sssssssss----2"); +// if (openId == null) { +// System.out.println("sssssssss----3"); +// if (RedisHelper.getRedis().get(redisKeyDate + "_Count") == null || Integer.parseInt(RedisHelper.getRedis().get(redisKeyDate + "_Count")) < 2) { +// int count = RedisHelper.getRedis().get(redisKeyDate + "_Count") == null ? 0 : Integer.parseInt(RedisHelper.getRedis().get(redisKeyDate + "_Count")) + 1; +// RedisHelper.getRedis().set(redisKeyDate + "_Count", String.valueOf(count), 60 * 10); +// System.out.println("sssssssss----4"); +// workLoadPush(null); +// } +// } +// } BiPush.runJob(openId); return "Success"; } catch (Exception e){ + e.printStackTrace(); log.error(e.toString()); return e.getMessage(); } diff --git a/src/main/java/com/ynxbd/push/controller/BusinessController.java b/src/main/java/com/ynxbd/push/controller/BusinessController.java index cf0aeeb..6819f42 100644 --- a/src/main/java/com/ynxbd/push/controller/BusinessController.java +++ b/src/main/java/com/ynxbd/push/controller/BusinessController.java @@ -8,6 +8,7 @@ import com.ynxbd.push.helper.BusinessHelper; import com.ynxbd.push.rabbit.send.RabbitSender; import com.ynxbd.push.service.HisUniversalService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -82,8 +83,8 @@ public class BusinessController { @PostMapping("medicalRecord") @ResponseBody - public MessageSendResult medicalRecord(String organizeName, String patientId, String applyId) { - log.info("杩涘叆鎺ュ彛-[鐥呭巻澶嶅嵃] 鐥呭巻澶嶅嵃鍙粯璐归氱煡锛堝尰闄㈤氱煡锛塷rganizeName-{}, patientId-{} , applyId-{}", organizeName, patientId, applyId); + public MessageSendResult medicalRecord(String organizeName, String patientId, String applyId, String content) { + log.info("杩涘叆鎺ュ彛-[鐥呭巻澶嶅嵃] 鐥呭巻澶嶅嵃鍙粯璐归氱煡锛堝尰闄㈤氱煡锛塷rganizeName-{}, patientId-{} , applyId-{}, content-{}", organizeName, patientId, applyId, content); MessageSendResult check = BusinessHelper.ParamsCheck(organizeName, patientId, null, null); if (!check.getErrcode().equals("0")) { return check; @@ -93,6 +94,7 @@ public class BusinessController { message.put("organizeName", organizeName); message.put("patientId", patientId); message.put("applyId", applyId); + message.put("content", content); rabbitSender.TipSend(message); return ResponseResult.JOIN_QUEUE.toMessResult(); } @@ -125,8 +127,8 @@ public class BusinessController { @PostMapping("cvms") @ResponseBody - public MessageSendResult cvms(String content, String patientId, String url, String organizeName, String IdCard, String buttonName,String deptCode){ - log.info("杩涘叆鎺ュ彛-[鍗辨満鍊兼帹閫佹帴鍙-鍖婚櫌閫氱煡/宸ュ崟鎻愰啋锛宑ontent-{},patientId-{},url-{},organizeName-{},IdCard-{},buttonName-{},deptCode-{}", content, patientId, url, organizeName, IdCard,buttonName,deptCode); + public MessageSendResult cvms(String content, String patientId, String url, String organizeName, String IdCard, String buttonName, String deptCode) { + log.info("杩涘叆鎺ュ彛-[鍗辨満鍊兼帹閫佹帴鍙-鍖婚櫌閫氱煡/宸ュ崟鎻愰啋锛宑ontent-{},patientId-{},url-{},organizeName-{},IdCard-{},buttonName-{},deptCode-{}", content, patientId, url, organizeName, IdCard, buttonName, deptCode); MessageSendResult check = BusinessHelper.ParamsCheck(organizeName, patientId, null, deptCode); if (!check.getErrcode().equals("0")) { return check; @@ -136,9 +138,9 @@ public class BusinessController { return ResponseResult.PARAMETER_IS_NULL.toMessResult(); } Map message = new HashMap<>(); - message.put("tip", IniConfig.TEMPLATE_VERSION?MessageTypeEnum.UNIVERSAL.CODE:MessageTypeEnum.CVMS.CODE); + message.put("tip", IniConfig.TEMPLATE_VERSION ? MessageTypeEnum.UNIVERSAL.CODE : MessageTypeEnum.CVMS.CODE); message.put("organizeName", organizeName); - message.put("buttonName",buttonName); + message.put("buttonName", buttonName); message.put("patientId", patientId); message.put("deptCode", deptCode); message.put("IdCard", IdCard); @@ -151,8 +153,8 @@ public class BusinessController { @PostMapping("universal") @ResponseBody - public MessageSendResult universal(String content, String patientId, String url, String organizeName, String IdCard, String doctorCode,String buttonName) { - log.info("杩涘叆鎺ュ彛-[閫氱敤鎺ㄩ佹帴鍙-缁戝畾閫氱煡锛宑ontent-{},patientId-{},url-{},organizeName-{},IdCard-{},doctorCode-{},buttonName-{}", content, patientId, url, organizeName, IdCard, doctorCode,buttonName); + public MessageSendResult universal(String content, String patientId, String url, String organizeName, String IdCard, String doctorCode, String buttonName) { + log.info("杩涘叆鎺ュ彛-[閫氱敤鎺ㄩ佹帴鍙-缁戝畾閫氱煡锛宑ontent-{},patientId-{},url-{},organizeName-{},IdCard-{},doctorCode-{},buttonName-{}", content, patientId, url, organizeName, IdCard, doctorCode, buttonName); MessageSendResult check = BusinessHelper.ParamsCheck(organizeName, patientId, null, doctorCode); if (!check.getErrcode().equals("0")) { return check; @@ -164,7 +166,7 @@ public class BusinessController { Map message = new HashMap<>(); message.put("tip", MessageTypeEnum.UNIVERSAL.CODE); message.put("organizeName", organizeName); - message.put("buttonName",buttonName); + message.put("buttonName", buttonName); message.put("patientId", patientId); message.put("doctorCode", doctorCode); message.put("IdCard", IdCard); diff --git a/src/main/java/com/ynxbd/push/controller/MiddlePlatformController.java b/src/main/java/com/ynxbd/push/controller/MiddlePlatformController.java index 41a30b4..923c70b 100644 --- a/src/main/java/com/ynxbd/push/controller/MiddlePlatformController.java +++ b/src/main/java/com/ynxbd/push/controller/MiddlePlatformController.java @@ -45,7 +45,6 @@ public class MiddlePlatformController { .pagePath(new StringBuilder().append("pages/index?id=").append(daoYiXunHospitalId) .append("&poi=").append(deptCode).append("&appKey=").append(daoYiXunSecret).toString()) .build(); - return MessageApiHelper.templateMessageSend(sendMessageTemplate); } } diff --git a/src/main/java/com/ynxbd/push/controller/SendMessageController.java b/src/main/java/com/ynxbd/push/controller/SendMessageController.java index 477d4d6..f69f4e9 100644 --- a/src/main/java/com/ynxbd/push/controller/SendMessageController.java +++ b/src/main/java/com/ynxbd/push/controller/SendMessageController.java @@ -130,7 +130,7 @@ public class SendMessageController { } /** - * 瑙ｅ瘑 + * 鍔犲瘑 * * @param openId * @return diff --git a/src/main/java/com/ynxbd/push/helper/DesEncryptHelper.java b/src/main/java/com/ynxbd/push/helper/DesEncryptHelper.java index c04c95c..8c2ae0c 100644 --- a/src/main/java/com/ynxbd/push/helper/DesEncryptHelper.java +++ b/src/main/java/com/ynxbd/push/helper/DesEncryptHelper.java @@ -73,6 +73,8 @@ public class DesEncryptHelper { public static void main(String[] args) { System.out.println(DesEncryptHelper.enCode("rui_mei", KEY)); + System.out.println(DesEncryptHelper.enCode("XBD-CRM", KEY)); System.out.println(DesEncryptHelper.deCode("3D48C80227DC4D7E8B30ED3C73F48031", KEY)); + System.out.println(DesEncryptHelper.deCode("14C8AD5516ED32E5", KEY)); } } diff --git a/src/main/java/com/ynxbd/push/helper/HisResultFormat.java b/src/main/java/com/ynxbd/push/helper/HisResultFormat.java index dd70df5..d5cd68d 100755 --- a/src/main/java/com/ynxbd/push/helper/HisResultFormat.java +++ b/src/main/java/com/ynxbd/push/helper/HisResultFormat.java @@ -717,7 +717,7 @@ public class HisResultFormat { JSONObject jsonResp = JSON.parseObject(respData); String code = jsonResp.getString("Code"); String message = jsonResp.getString("Msg"); - if ("200".equals(code) && "SUCCESS".equals(message)) { + if ("200".equals(code)) { String data = jsonResp.getString("Data"); return "".equals(data) ? null : data; } diff --git a/src/main/java/com/ynxbd/push/helper/MessageApiHelper.java b/src/main/java/com/ynxbd/push/helper/MessageApiHelper.java index b78245c..69ce6c1 100644 --- a/src/main/java/com/ynxbd/push/helper/MessageApiHelper.java +++ b/src/main/java/com/ynxbd/push/helper/MessageApiHelper.java @@ -8,6 +8,7 @@ import com.ynxbd.push.entity.*; import com.ynxbd.push.entity.enums.MsgParamEnum; import com.ynxbd.push.entity.response.ResponseResult; import com.ynxbd.push.entity.tencent.*; +import com.ynxbd.push.entity.type.MessageTypeEnum; import com.ynxbd.push.httpRequest.tencent.WeChatDataRequest; import com.ynxbd.push.httpRequest.xbd.wx.WxCacheRequest; import com.ynxbd.push.thread.ThreadConfig; @@ -65,7 +66,7 @@ public class MessageApiHelper { * @return */ public static MessageSendResult templateMessageSend(SendMessageTemplate template) { - if(template.getCode()==null){ + if (template.getCode() == null) { template.setCode(""); } MessageSendResult messageSendResult = templateMessage(template); @@ -88,7 +89,7 @@ public class MessageApiHelper { log.info("SendTenCentJson:{}", jsonMessage); return templateMessageSend(jsonMessage); } catch (Exception e) { - log.error("娑堟伅鎺ㄩ佸嚭閿欙細error-{}",e.toString()); + log.error("娑堟伅鎺ㄩ佸嚭閿欙細error-{}", e.toString()); return ResponseResult.MESSAGE_RESULT_ERROR_CODE.toMessResult(); } } @@ -186,9 +187,10 @@ public class MessageApiHelper { title = "鍖婚櫌閫氱煡"; reportTemplateId = WeChatDataRequest.getTemplateId(title); } - if(reportTemplateId==null){ - log.error("鑾峰彇妯＄増Id澶辫触锛宮essageId-{},title-{}",messageId,title); + if (reportTemplateId == null) { + log.error("鑾峰彇妯＄増Id澶辫触锛宮essageId-{},title-{}", messageId, title); } + MessageTypeEnum msgTypeEnum = MessageTypeEnum.toEnum(code); if (!IniConfig.TEMPLATE_VERSION) { // 鑰佺増鏈粯璁ゅ弬鏁扮敤keyword鍏抽敭瀛 code = ""; } @@ -230,13 +232,12 @@ public class MessageApiHelper { .addParameter(patientId != null ? "patientId" : "cardNo", patientId != null ? patientId : idCard) .addParameter("algorithm", "des") .addParameter("isEncryptComma", "false") - .addParameter("isLastBind", "true") + .addParameter("isLastBind", msgTypeEnum != null && "MedicalRecord".equals(msgTypeEnum.CODE) ? "false" : "true") .build(); WeChatResponse weChatResponse = LocalHttpClient.executeJsonResult(httpUriRequest, WeChatResponse.class); if (weChatResponse.getData() == null) { return ResponseResult.NOT_FIND_DATA.toMessResult(); } - String openId = DesEncryptHelper.deCode(weChatResponse.getData().get(0)); SendMessageTemplate sendMessageTemplate = SendMessageTemplate.builder() .template_id(reportTemplateId) .first(first) @@ -248,9 +249,21 @@ public class MessageApiHelper { .keyword4(keyword4) .keyword5(keyword5) .remark(remark) - .openId(openId) .url(url) .build(); + if (msgTypeEnum != null && "MedicalRecord".equals(msgTypeEnum.CODE)) { + for (String enOpenId : weChatResponse.getData().get(0).split(",")) { + String openId = DesEncryptHelper.deCode(enOpenId); + sendMessageTemplate.setOpenId(""); + sendMessageTemplate.setOpenId(openId); + MessageSendResult messageSendResult = templateMessageSend(sendMessageTemplate); + log.info("[{}]{}鎮ｈ呮秷鎭帹閫侊紝鎺ㄩ佺粨鏋滀唬鐮-{}锛屾帹閫佺粨鏋-{}", title, DesEncryptHelper.deCode(organizeName), messageSendResult.getErrcode(), messageSendResult.getErrmsg()); + } + return ResponseResult.JOIN_QUEUE.toMessResult(); + } + String openId = DesEncryptHelper.deCode(weChatResponse.getData().get(0)); + sendMessageTemplate.setOpenId(""); + sendMessageTemplate.setOpenId(openId); MessageSendResult messageSendResult = templateMessageSend(sendMessageTemplate); log.info("[{}]{}鎮ｈ呮秷鎭帹閫侊紝鎺ㄩ佺粨鏋滀唬鐮-{}锛屾帹閫佺粨鏋-{}", title, DesEncryptHelper.deCode(organizeName), messageSendResult.getErrcode(), messageSendResult.getErrmsg()); return ResponseResult.JOIN_QUEUE.toMessResult(); @@ -274,8 +287,8 @@ public class MessageApiHelper { code = ""; } List allDoctorOpenIdList = WeChatDataRequest.getAllOpenIdForDeptCode(deptCode); - if(allDoctorOpenIdList.isEmpty()){ - log.error("鑾峰彇绉戝浜哄憳openId鍑洪敊锛宒eptCode-{}",deptCode); + if (allDoctorOpenIdList.isEmpty()) { + log.error("鑾峰彇绉戝浜哄憳openId鍑洪敊锛宒eptCode-{}", deptCode); return ResponseResult.NOT_FIND_DATA.toMessResult(); } for (String interfaceOpenId : allDoctorOpenIdList) { @@ -632,7 +645,7 @@ public class MessageApiHelper { return ResponseResult.JOIN_QUEUE.toMessResult(); } try { - String openId =strTemp.get("openId")==null?reqWxOpenId(title, patientId, cardNo):strTemp.get("openId"); + String openId = strTemp.get("openId") == null ? reqWxOpenId(title, patientId, cardNo) : strTemp.get("openId"); SendTemplate sendTemplate = SendTemplate.builder() .template_id(templateId) .message_id(messageId) @@ -645,6 +658,7 @@ public class MessageApiHelper { return templateMessageSend(JSONObject.toJSONString(sendTemplate)); } catch (Exception e) { + log.error("澶辫触锛歿}", e.getMessage()); return ResponseResult.NOT_FIND_DATA.toMessResult(); } } diff --git a/src/main/java/com/ynxbd/push/helper/RequestHelper.java b/src/main/java/com/ynxbd/push/helper/RequestHelper.java index 8fcff95..921ab51 100644 --- a/src/main/java/com/ynxbd/push/helper/RequestHelper.java +++ b/src/main/java/com/ynxbd/push/helper/RequestHelper.java @@ -113,6 +113,10 @@ public class RequestHelper extends SimpleClientHttpRequestFactory { * @return ResultVO */ public static String get(String url, Map params) { +// SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); +// factory.setConnectTimeout(5000); // 杩炴帴瓒呮椂锛5绉 +// factory.setReadTimeout(60000); // 璇诲彇瓒呮椂锛60绉 +// RestTemplate client = new RestTemplate(factory); RestTemplate client = new RestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.add("Content-Type", "application/x-www-form-urlencoded"); diff --git a/src/main/java/com/ynxbd/push/helper/TemplateJsonStringHelper.java b/src/main/java/com/ynxbd/push/helper/TemplateJsonStringHelper.java index d4e4eee..f161b90 100644 --- a/src/main/java/com/ynxbd/push/helper/TemplateJsonStringHelper.java +++ b/src/main/java/com/ynxbd/push/helper/TemplateJsonStringHelper.java @@ -371,6 +371,9 @@ public class TemplateJsonStringHelper { public static String getUniversal(SendMessageTemplate key) { return "{\"data\":{\"time13\":{\"color\":\"#173177\",\"value\":\"" + key.getKeyword1() + "\"},\"thing16\":{\"color\":\"#173177\",\"value\":\"" + key.getKeyword2() + "\"},\"first\":{\"color\":\"#173177\",\"value\":\"" + key.getFirst() + "\"},\"remark\":{\"color\":\"#173177\",\"value\":\"" + key.getRemark() + "\"}},\"template_id\":\"" + key.getTemplate_id() + "\",\"touser\":\"" + key.getOpenId() + "\",\"url\":\"" + key.getUrl() + "\"}"; } + public static String get17(SendMessageTemplate key) { + return "{\"data\":{\"time5\":{\"color\":\"#173177\",\"value\":\"" + key.getKeyword1() + "\"},\"thing3\":{\"color\":\"#173177\",\"value\":\"" + key.getKeyword2() + "\"}},\"template_id\":\"" + key.getTemplate_id() + "\",\"touser\":\"" + key.getOpenId() + "\",\"url\":\"" + key.getUrl() + "\"}"; + } diff --git a/src/main/java/com/ynxbd/push/helper/TemplateSelectHelper.java b/src/main/java/com/ynxbd/push/helper/TemplateSelectHelper.java index 059ef60..4de6960 100644 --- a/src/main/java/com/ynxbd/push/helper/TemplateSelectHelper.java +++ b/src/main/java/com/ynxbd/push/helper/TemplateSelectHelper.java @@ -67,6 +67,9 @@ public class TemplateSelectHelper { case "Universal": jsonString = TemplateJsonStringHelper.getUniversal(sendMessageTemplate); break; + case "17": + jsonString = TemplateJsonStringHelper.get17(sendMessageTemplate); + break; default: jsonString = TemplateJsonStringHelper.get(sendMessageTemplate); } diff --git a/src/main/java/com/ynxbd/push/httpRequest/tencent/WeChatDataRequest.java b/src/main/java/com/ynxbd/push/httpRequest/tencent/WeChatDataRequest.java index b07a9f6..f6a842a 100644 --- a/src/main/java/com/ynxbd/push/httpRequest/tencent/WeChatDataRequest.java +++ b/src/main/java/com/ynxbd/push/httpRequest/tencent/WeChatDataRequest.java @@ -41,15 +41,15 @@ public class WeChatDataRequest { } public static List getOpenIdForDoctorCode(String doctorCode) { - return RequestHelper.get("http://127.0.0.1:9090/micro/msg_push/doctor?doctCode="+doctorCode, null, WeChatResponse.class).getData(); + return RequestHelper.get("http://127.0.0.1:9090/micro/msg_push/doctor?doctCode=" + doctorCode, null, WeChatResponse.class).getData(); } public static List getAllOpenIdForDoctorCode(String doctorCode) { - return RequestHelper.get("http://127.0.0.1:9090/micro/msg_push/doctorOpenIds?doctCode="+doctorCode, null, WeChatResponse.class).getData(); + return RequestHelper.get("http://127.0.0.1:9090/micro/msg_push/doctorOpenIds?doctCode=" + doctorCode, null, WeChatResponse.class).getData(); } - public static List getAllOpenIdForDeptCode(String deptCode){ - return RequestHelper.get("http://127.0.0.1:9090/micro/msg_push/deptOpenIds?deptCode="+deptCode, null, WeChatResponse.class).getData(); + public static List getAllOpenIdForDeptCode(String deptCode) { + return RequestHelper.get("http://127.0.0.1:9090/micro/msg_push/deptOpenIds?deptCode=" + deptCode, null, WeChatResponse.class).getData(); } public static WeChatAllDoctorResponse getAllOpenIdForDoctorCode() { @@ -60,48 +60,48 @@ public class WeChatDataRequest { return RequestHelper.get("http://127.0.0.1:9090/micro/doctor/getDocModuleLink?code=xsjc", null, WorkLoadResponse.class); } - public static List getTodayRegOpenId(){ - return JSONObject.parseArray(RequestHelper.getJsonObj(IniConfig.getInstance("today_reg_url")==null?"http://127.0.0.1/wx/register/getTodayRegOpenId":IniConfig.getInstance("today_reg_url"),null).get("data").toString(),Register.class); + public static List getTodayRegOpenId() { + return JSONObject.parseArray(RequestHelper.getJsonObj(IniConfig.getInstance("today_reg_url") == null ? "http://127.0.0.1/wx/register/getTodayRegOpenId" : IniConfig.getInstance("today_reg_url"), null).get("data").toString(), Register.class); } - public static List getTodayRegRecord(String startTime, String endTime){ - return JSONObject.parseArray(RequestHelper.getJsonObj("http://127.0.0.1/wx/register/getTodayRegRecord?startTime="+startTime+"&endTime="+endTime,null).get("data").toString(),Register.class); + public static List getTodayRegRecord(String startTime, String endTime) { + return JSONObject.parseArray(RequestHelper.getJsonObj("http://127.0.0.1/wx/register/getTodayRegRecord?startTime=" + startTime + "&endTime=" + endTime, null).get("data").toString(), Register.class); } - public static String todayRegSmS(String startTime, String endTime){ - return RequestHelper.getJsonObj("http://127.0.0.1/wx/api/sms/todayRegSmS?startTime="+startTime+"&endTime="+endTime,null).toString(); + public static String todayRegSmS(String startTime, String endTime) { + return RequestHelper.getJsonObj("http://127.0.0.1/wx/api/sms/todayRegSmS?startTime=" + startTime + "&endTime=" + endTime, null).toString(); } - public static String GetOpenIdForPatientId(String patientId){ + public static String GetOpenIdForPatientId(String patientId) { String wx_openId_url = "http://wx.mzsrmyy.net/wx/patient/getOpenIdsByPatientId.do"; Map params = new HashMap<>(); - params.put("patientId",patientId); - params.put("algorithm","des"); - params.put("isEncryptComma","false"); - return DesEncryptHelper.deCode(RequestHelper.get(wx_openId_url,params,WeChatResponse.class).getData().get(0)); + params.put("patientId", patientId); + params.put("algorithm", "des"); + params.put("isEncryptComma", "false"); + return DesEncryptHelper.deCode(RequestHelper.get(wx_openId_url, params, WeChatResponse.class).getData().get(0)); } private static TemplateList getTemplateList() { - if(RedisHelper.getRedis().get("Template")!=null){ + if (RedisHelper.getRedis().get("Template") != null) { return JSONObject.parseObject(RedisHelper.getRedis().get("Template"), TemplateList.class); } - String tenCentTemplateListUrl = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token="+API.accessToken(WxCacheRequest.getAccessToken()); - Map params = new HashMap<>(); - params.put("lang","zh_CN"); - TemplateList templateList = RequestHelper.get(tenCentTemplateListUrl,params,TemplateList.class); - RedisHelper.getRedis().set("Template", JSONObject.toJSONString(templateList),86400); + String tenCentTemplateListUrl = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token=" + API.accessToken(WxCacheRequest.getAccessToken()); + Map params = new HashMap<>(); + params.put("lang", "zh_CN"); + TemplateList templateList = RequestHelper.get(tenCentTemplateListUrl, params, TemplateList.class); + RedisHelper.getRedis().set("Template", JSONObject.toJSONString(templateList), 86400); return templateList; } public static String getTemplateId(String title) { - List