优化

src/main/java/thyyxxk/wxservice_server/controller/InspectionsController.java

@@ -51,15 +51,11 @@ public class InspectionsController {
 
     @PostMapping("/checkPathologyIndex")
     public ResultVo<List<PathologyIndex>> checkPathologyIndex(@RequestBody ReportIndexInquiry request) {
-        request.setReqStartTime(request.getReqStartTime().replaceAll("-", ""));
-        request.setReqEndTime(request.getReqEndTime().replaceAll("-", ""));
         return ResultVoUtil.success(service.checkPathologyIndex(request));
     }
 
     @PostMapping("/checkElectroIndex")
     public ResultVo<List<ElectroIndex>> checkElectroIndex(@RequestBody ReportIndexInquiry inquiry) {
-        inquiry.setReqStartTime(inquiry.getReqStartTime().replaceAll("-", ""));
-        inquiry.setReqEndTime(inquiry.getReqEndTime().replaceAll("-", ""));
         return ResultVoUtil.success(service.checkElectroIndex(inquiry));
     }
 

src/main/java/thyyxxk/wxservice_server/factory/pathology/PathologyService.java

@@ -16,9 +16,9 @@ public class PathologyService {
     private static final String URL = "http://172.16.32.160:9205/thyy/api/public/bl_report?beginTime={}&endTime={}&patientId={}";
 
     public List<PathologyIndex> queryOutpatientPathologyIndex(ReportIndexInquiry request) {
+        expandTimeRange(request);
         String url = StrUtil.format(URL, request.getReqStartTime(),
                 request.getReqEndTime(), request.getSocialNo());
-
         List<PathologyIndex> pathologyIndexList = new ArrayList<>();
         JSONObject response = new RestTemplate().getForObject(url, JSONObject.class);
         if (null == response) {
@@ -39,4 +39,9 @@ public class PathologyService {
         return pathologyIndexList;
     }
 
+    private void expandTimeRange(ReportIndexInquiry inquiry) {
+        inquiry.setReqStartTime(inquiry.getReqStartTime() + " 00:00:00");
+        inquiry.setReqEndTime(inquiry.getReqEndTime() + " 23:59:59");
+    }
+
 }

src/main/java/thyyxxk/wxservice_server/scheduled/GetWeChatAccessTokenTask.java

@@ -98,12 +98,12 @@ public class GetWeChatAccessTokenTask {
             log.info("获取企业微信ACCESS_TOKEN: {}", token);
             PropertiesUtil.writeAccessToken("qywxToken",token);
         }  else {
-            String url = "http://192.168.200.3/wxserver/tokenSchedule/getToken?key=access_token";
+            String url = "https://staticweb.hnthyy.cn/wxserver/tokenSchedule/getToken?key=access_token";
             ResultVo<String> res = new RestTemplate().getForObject(url, ResultVo.class);
             log.info("从服务器获取公众号ACCESS_TOKEN：{}", res.getData());
             PropertiesUtil.writeAccessToken("access_token", res.getData());
 
-            url = "http://192.168.200.3/wxserver/tokenSchedule/getToken?key=qywxToken";
+            url = "https://staticweb.hnthyy.cn/wxserver/tokenSchedule/getToken?key=qywxToken";
             res = new RestTemplate().getForObject(url, ResultVo.class);
             log.info("从服务器获取企业微信ACCESS_TOKEN：{}", res.getData());
             PropertiesUtil.writeAccessToken("qywxToken", res.getData());
@@ -133,7 +133,7 @@ public class GetWeChatAccessTokenTask {
                 }
             }
         } else {
-            String url = "http://192.168.200.3/wxserver/tokenSchedule/getToken?key=appToken";
+            String url = "https://staticweb.hnthyy.cn/wxserver/tokenSchedule/getToken?key=appToken";
             ResultVo<String> res = new RestTemplate().getForObject(url, ResultVo.class);
             log.info("从服务器获取电子健康卡appToken：{}", res.getData());
             PropertiesUtil.writeAccessToken("appToken", res.getData());

src/main/java/thyyxxk/wxservice_server/service/PushWxMessageService.java

@@ -3,6 +3,8 @@ package thyyxxk.wxservice_server.service;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.wxservice_server.config.exception.BizException;
@@ -22,6 +24,7 @@ import java.util.List;
 @Service
 public class PushWxMessageService {
     private final WxApiDao dao;
+    private static final String API = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
 
     @Autowired
     public PushWxMessageService(WxApiDao dao) {
@@ -36,24 +39,32 @@ public class PushWxMessageService {
         if (null == openidList || openidList.isEmpty()) {
             return "ERROR:未找到卡号【" + param.getCardNo() + "】的openid";
         }
-        RestTemplate template = new RestTemplate();
+
+        String wxUrl = API + PropertiesUtil.getLocalProperty("access_token");
         JSONObject content = param.getMsgContext();
-        String wxUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" +
-                PropertiesUtil.getLocalProperty("access_token");
-        String res = "ERROR:推送失败，网络异常";
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("content-type", "application/json;charset=UTF-8");
+        RestTemplate template = new RestTemplate();
+
+        String res = "";
         for (String openid : openidList) {
             content.replace("touser", openid);
-            res = template.postForObject(wxUrl, content, String.class);
+            HttpEntity<JSONObject> entity = new HttpEntity<>(content, headers);
+            res = template.postForObject(wxUrl, entity, String.class);
             log.info("推送消息1：内容：{}，结果：{}", content, res);
         }
         return res;
     }
 
     public String pushMessage2(JSONObject msgContent) {
-        RestTemplate template = new RestTemplate();
-        String wxUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" +
-                PropertiesUtil.getLocalProperty("access_token");
-        String res = template.postForObject(wxUrl, msgContent, String.class);
+        String wxUrl = API + PropertiesUtil.getLocalProperty("access_token");
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("content-type", "application/json;charset=UTF-8");
+        HttpEntity<JSONObject> entity = new HttpEntity<>(msgContent, headers);
+        String res = new RestTemplate().postForObject(wxUrl, entity, String.class);
+
         log.info("推送消息2：内容：{}，结果：{}", msgContent, res);
         if (StringUtil.isBlank(res)) {
             return "推送失败，未知的异常。";
@@ -71,4 +82,5 @@ public class PushWxMessageService {
         }
         return resobj.getString("errmsg");
     }
+
 }