diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java index fee9ef3..7d8cb76 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java @@ -9,7 +9,7 @@ package com.lyms.platform.common.enums; public enum ProjectTypeEnums { - YNXT(1,"院内系统web版"),QYPT(2,"区域平台"); + YNXT(4,"院内系统web版"),QYPT(5,"区域平台"); ProjectTypeEnums(int id, String name) { this.id = id; diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java index 0e7912f..74f808c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java @@ -178,8 +178,8 @@ public class HttpRequest { // flush输出流的缓冲 out.flush(); // 定义BufferedReader输入流来读取URL的响应 - in = new BufferedReader( - new InputStreamReader(conn.getInputStream())); + in = new BufferedReader(new InputStreamReader( + conn.getInputStream(),"utf-8")); String line; while ((line = in.readLine()) != null) { result += line; @@ -217,7 +217,7 @@ public class HttpRequest { conn.setRequestProperty("accept", "*/*"); conn.setRequestProperty("connection", "Keep-Alive"); conn.setRequestProperty("Authorization",auth); - conn.setRequestProperty("Content-Type","application/json"); + conn.setRequestProperty("Content-Type","application/json;charset=UTF-8"); conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); // 发送POST请求必须设置如下两行 @@ -232,8 +232,8 @@ public class HttpRequest { // flush输出流的缓冲 out.flush(); // 定义BufferedReader输入流来读取URL的响应 - in = new BufferedReader( - new InputStreamReader(conn.getInputStream())); + in = new BufferedReader(new InputStreamReader( + conn.getInputStream(),"utf-8")); String line; while ((line = in.readLine()) != null) { result += line; @@ -286,8 +286,8 @@ public class HttpRequest { // flush输出流的缓冲 out.flush(); // 定义BufferedReader输入流来读取URL的响应 - in = new BufferedReader( - new InputStreamReader(conn.getInputStream())); + in = new BufferedReader(new InputStreamReader( + conn.getInputStream(),"utf-8")); String line; while ((line = in.readLine()) != null) { result += line; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index f90ecd1..b9ee489 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -540,6 +540,7 @@ public class BabyBookbuildingFacade { mr.setTypeId(ProjectTypeEnums.YNXT.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); + mr.setStatus(0); mr.setExt1(babyModel.getHospitalId()); mr.setExt2(templateModel.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessageRequest.java index cc19dda..c8fab7e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MessageRequest.java @@ -8,6 +8,7 @@ public class MessageRequest { private String content; private Integer typeId; private Integer subTypeId; + private Integer status; //计划发送时间 @@ -28,6 +29,14 @@ public class MessageRequest { private String ext3; + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public String getPhone() { return phone; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index 0d40544..b2dfcc5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -6,12 +6,14 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.MessageListRequest; +import com.lyms.platform.operate.web.request.MessageRequest; import com.lyms.platform.operate.web.result.Config; import com.lyms.platform.operate.web.result.SmsObj; import com.lyms.platform.operate.web.result.SmsResult; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -52,7 +54,7 @@ public class MessageCenterService { */ public static boolean saveSmsCenter(MessageListRequest list) { - String json = JsonUtil.obj2JsonString(list); + String json = JsonUtil.obj2Str(list); String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN); if (StringUtils.isNotEmpty(result)) { @@ -86,15 +88,40 @@ public class MessageCenterService { } public static void main(String[] args){ - String param = "phone=&page=1&limit=100&typeId=4"; +// String param = "phone=&page=1&limit=100&typeId=4"; +// + MessageListRequest list = new MessageListRequest(); + List messages = new ArrayList<>(); + MessageRequest request = new MessageRequest(); + request.setTypeId(4); + request.setStatus(0); + request.setContent("阿道夫"); + request.setObjType(1); + request.setPhone("18382670000"); + request.setPlanTime("2015-01-06 15:22:12"); + request.setServiceType(1); + request.setExt1("196"); + request.setExt2("10"); + request.setExt3("10"); + request.setSubTypeId(6); + messages.add(request); - String result = HttpRequest.sendGet("http://192.168.5.6:8080/v1/messages", param, "YMer2016"); - SmsResult map = JsonUtil.str2Obj(result, SmsResult.class); - JSONObject jsonObject = JsonUtil.getObj(result); - JSONArray jsonArray = jsonObject.getJSONArray("list"); - String list = jsonArray.toString(); - map.setList(JsonUtil.toList(list, SmsObj.class)); - System.out.print(map); + + list.setTypeId(4); + list.setMessages(messages); + + String json = JsonUtil.obj2Str(list); + + String rs = HttpRequest.sendPost("http://sms.api.stage.platform.healthbaby.com.cn/v1/saveCreatedSMS", json, "YMer2016"); + System.out.print(rs); + +// String result = HttpRequest.sendGet("http://sms.api.stage.platform.healthbaby.com.cn/v1/saveCreatedSMS", param, "YMer2016"); +// SmsResult map = JsonUtil.str2Obj(result, SmsResult.class); +// JSONObject jsonObject = JsonUtil.getObj(result); +// JSONArray jsonArray = jsonObject.getJSONArray("list"); +// String list = jsonArray.toString(); +// map.setList(JsonUtil.toList(list, SmsObj.class)); +// System.out.print(map); }