jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2fc5b7f0216d0b8c794d68ec8f73dd719765ef83

Authored by liquanyu
1 parent f28ae77af2
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

code update

Showing 5 changed files with 54 additions and 17 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java View file @ 2fc5b7f
... ... @@ -9,7 +9,7 @@
9 9 public enum ProjectTypeEnums {
10 10  
11 11  
12   - YNXT(1,"院内系统web版"),QYPT(2,"区域平台");
  12 + YNXT(4,"院内系统web版"),QYPT(5,"区域平台");
13 13  
14 14 ProjectTypeEnums(int id, String name) {
15 15 this.id = id;
platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java View file @ 2fc5b7f
... ... @@ -178,8 +178,8 @@
178 178 // flush输出流的缓冲
179 179 out.flush();
180 180 // 定义BufferedReader输入流来读取URL的响应
181   - in = new BufferedReader(
182   - new InputStreamReader(conn.getInputStream()));
  181 + in = new BufferedReader(new InputStreamReader(
  182 + conn.getInputStream(),"utf-8"));
183 183 String line;
184 184 while ((line = in.readLine()) != null) {
185 185 result += line;
... ... @@ -217,7 +217,7 @@
217 217 conn.setRequestProperty("accept", "*/*");
218 218 conn.setRequestProperty("connection", "Keep-Alive");
219 219 conn.setRequestProperty("Authorization",auth);
220   - conn.setRequestProperty("Content-Type","application/json");
  220 + conn.setRequestProperty("Content-Type","application/json;charset=UTF-8");
221 221 conn.setRequestProperty("user-agent",
222 222 "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
223 223 // 发送POST请求必须设置如下两行
... ... @@ -232,8 +232,8 @@
232 232 // flush输出流的缓冲
233 233 out.flush();
234 234 // 定义BufferedReader输入流来读取URL的响应
235   - in = new BufferedReader(
236   - new InputStreamReader(conn.getInputStream()));
  235 + in = new BufferedReader(new InputStreamReader(
  236 + conn.getInputStream(),"utf-8"));
237 237 String line;
238 238 while ((line = in.readLine()) != null) {
239 239 result += line;
... ... @@ -286,8 +286,8 @@
286 286 // flush输出流的缓冲
287 287 out.flush();
288 288 // 定义BufferedReader输入流来读取URL的响应
289   - in = new BufferedReader(
290   - new InputStreamReader(conn.getInputStream()));
  289 + in = new BufferedReader(new InputStreamReader(
  290 + conn.getInputStream(),"utf-8"));
291 291 String line;
292 292 while ((line = in.readLine()) != null) {
293 293 result += line;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 2fc5b7f
... ... @@ -540,6 +540,7 @@
540 540 mr.setTypeId(ProjectTypeEnums.YNXT.getId());
541 541 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
542 542 mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
  543 + mr.setStatus(0);
543 544  
544 545 mr.setExt1(babyModel.getHospitalId());
545 546 mr.setExt2(templateModel.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessageRequest.java View file @ 2fc5b7f
... ... @@ -8,6 +8,7 @@
8 8 private String content;
9 9 private Integer typeId;
10 10 private Integer subTypeId;
  11 + private Integer status;
11 12  
12 13  
13 14 //计划发送时间
... ... @@ -27,6 +28,14 @@
27 28 private String ext2;
28 29  
29 30 private String ext3;
  31 +
  32 + public Integer getStatus() {
  33 + return status;
  34 + }
  35 +
  36 + public void setStatus(Integer status) {
  37 + this.status = status;
  38 + }
30 39  
31 40 public String getPhone() {
32 41 return phone;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ 2fc5b7f
... ... @@ -6,12 +6,14 @@
6 6 import com.lyms.platform.common.utils.PropertiesUtils;
7 7 import com.lyms.platform.common.utils.StringUtils;
8 8 import com.lyms.platform.operate.web.request.MessageListRequest;
  9 +import com.lyms.platform.operate.web.request.MessageRequest;
9 10 import com.lyms.platform.operate.web.result.Config;
10 11 import com.lyms.platform.operate.web.result.SmsObj;
11 12 import com.lyms.platform.operate.web.result.SmsResult;
12 13 import net.sf.json.JSONArray;
13 14 import net.sf.json.JSONObject;
14 15  
  16 +import java.util.ArrayList;
15 17 import java.util.List;
16 18 import java.util.Map;
17 19  
... ... @@ -52,7 +54,7 @@
52 54 */
53 55 public static boolean saveSmsCenter(MessageListRequest list)
54 56 {
55   - String json = JsonUtil.obj2JsonString(list);
  57 + String json = JsonUtil.obj2Str(list);
56 58 String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
57 59 if (StringUtils.isNotEmpty(result))
58 60 {
59 61  
... ... @@ -86,15 +88,40 @@
86 88 }
87 89  
88 90 public static void main(String[] args){
89   - String param = "phone=&page=1&limit=100&typeId=4";
  91 +// String param = "phone=&page=1&limit=100&typeId=4";
  92 +//
  93 + MessageListRequest list = new MessageListRequest();
  94 + List<MessageRequest> messages = new ArrayList<>();
  95 + MessageRequest request = new MessageRequest();
  96 + request.setTypeId(4);
  97 + request.setStatus(0);
  98 + request.setContent("阿道夫");
  99 + request.setObjType(1);
  100 + request.setPhone("18382670000");
  101 + request.setPlanTime("2015-01-06 15:22:12");
  102 + request.setServiceType(1);
  103 + request.setExt1("196");
  104 + request.setExt2("10");
  105 + request.setExt3("10");
  106 + request.setSubTypeId(6);
  107 + messages.add(request);
90 108  
91   - String result = HttpRequest.sendGet("http://192.168.5.6:8080/v1/messages", param, "YMer2016");
92   - SmsResult map = JsonUtil.str2Obj(result, SmsResult.class);
93   - JSONObject jsonObject = JsonUtil.getObj(result);
94   - JSONArray jsonArray = jsonObject.getJSONArray("list");
95   - String list = jsonArray.toString();
96   - map.setList(JsonUtil.toList(list, SmsObj.class));
97   - System.out.print(map);
  109 +
  110 + list.setTypeId(4);
  111 + list.setMessages(messages);
  112 +
  113 + String json = JsonUtil.obj2Str(list);
  114 +
  115 + String rs = HttpRequest.sendPost("http://sms.api.stage.platform.healthbaby.com.cn/v1/saveCreatedSMS", json, "YMer2016");
  116 + System.out.print(rs);
  117 +
  118 +// String result = HttpRequest.sendGet("http://sms.api.stage.platform.healthbaby.com.cn/v1/saveCreatedSMS", param, "YMer2016");
  119 +// SmsResult map = JsonUtil.str2Obj(result, SmsResult.class);
  120 +// JSONObject jsonObject = JsonUtil.getObj(result);
  121 +// JSONArray jsonArray = jsonObject.getJSONArray("list");
  122 +// String list = jsonArray.toString();
  123 +// map.setList(JsonUtil.toList(list, SmsObj.class));
  124 +// System.out.print(map);
98 125  
99 126  
100 127 }