From ec775d4b64afed2fd4c833ecbfbd6c69057bff8b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 29 Aug 2016 14:28:37 +0800 Subject: [PATCH] code update --- .../platform/data/util/SaveMessageService.java | 4 +- .../src/main/resources/config.properties | 5 +++ .../operate/web/utils/MessageCenterService.java | 44 +++++++++++----------- .../src/main/resources/config.properties | 2 +- 4 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 platform-data-api/src/main/resources/config.properties diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java index 5423ec1..5ffb451 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java @@ -21,8 +21,8 @@ public class SaveMessageService { public static boolean saveSmsCenter(MessageListRequest list) { String json = JsonUtil.obj2JsonString(list); - //String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS",json,CENTER_TOKEN); - String result = HttpRequest.sendPost("http://192.168.5.13:8080/v1/saveCreatedSMS",json,"YMer2016"); + String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS",json,CENTER_TOKEN); +// String result = HttpRequest.sendPost("http://192.168.5.13:8080/v1/saveCreatedSMS",json,"YMer2016"); if (StringUtils.isNotEmpty(result)) { Map map = JsonUtil.str2Obj(result, Map.class); diff --git a/platform-data-api/src/main/resources/config.properties b/platform-data-api/src/main/resources/config.properties new file mode 100644 index 0000000..6225809 --- /dev/null +++ b/platform-data-api/src/main/resources/config.properties @@ -0,0 +1,5 @@ +#短信中心url +center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/ + +#区域平台访问短信中心的token +center_token=YMer2016 \ No newline at end of file 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 4b6ab0f..0d40544 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 @@ -31,8 +31,8 @@ public class MessageCenterService { public static boolean serviceConfig(List configs,String hid) { String json = JsonUtil.array2JsonString(configs); -// String result = HttpRequest.sendPost(CENTER_BASE_URL + "serviceConfig/{" + hid + "}", json, CENTER_TOKEN); - String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/"+hid,json,"YMer2016"); + String result = HttpRequest.sendPost(CENTER_BASE_URL + "serviceConfig/{" + hid + "}", json, CENTER_TOKEN); +// String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/"+hid,json,"YMer2016"); if (StringUtils.isNotEmpty(result)) { Map map = JsonUtil.str2Obj(result, Map.class); @@ -52,16 +52,16 @@ public class MessageCenterService { */ public static boolean saveSmsCenter(MessageListRequest list) { -// String json = JsonUtil.obj2JsonString(list); -// String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN); -// if (StringUtils.isNotEmpty(result)) -// { -// Map map = JsonUtil.str2Obj(result, Map.class); -// if ("0".equals(map.get("errorcode"))) -// { -// return true; -// } -// } + String json = JsonUtil.obj2JsonString(list); + String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN); + if (StringUtils.isNotEmpty(result)) + { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode"))) + { + return true; + } + } return false; } @@ -71,17 +71,17 @@ public class MessageCenterService { String param = "typeId=4&ext1="+StringUtils.emptyStr(hospitalId)+"&phone="+StringUtils.emptyStr(phone)+"&subTypeId="+StringUtils.emptyInt(smsType)+"&content="+StringUtils.emptyStr(content)+ "&planTimeStart="+planTimeStart+"&planTimeEnd="+planTimeEnd+"&actualTimeStart="+actualTimeStart+ "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&page="+page+"&limit="+limit; -// String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN); - SmsResult map = new SmsResult(); + String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN); +// SmsResult map = new SmsResult(); // 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); -// if (jsonObject != null && jsonObject.getJSONArray("list") != null) -// { -// JSONArray jsonArray = jsonObject.getJSONArray("list"); -// String list = jsonArray.toString(); -// map.setList(JsonUtil.toList(list,SmsObj.class)); -// } + SmsResult map = JsonUtil.str2Obj(result, SmsResult.class); + JSONObject jsonObject = JsonUtil.getObj(result); + if (jsonObject != null && jsonObject.getJSONArray("list") != null) + { + JSONArray jsonArray = jsonObject.getJSONArray("list"); + String list = jsonArray.toString(); + map.setList(JsonUtil.toList(list,SmsObj.class)); + } return map; } diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 2456c18..6225809 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -1,5 +1,5 @@ #短信中心url -center_base_url=http://192.168.5.3:8080/v1/ +center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/ #区域平台访问短信中心的token center_token=YMer2016 \ No newline at end of file -- 1.8.3.1