jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2e3a291276c51de3fba666e04e48e8c3ae326ada

Authored by jiangjiazhi
2 parents 012328d45a ec775d4b64
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java View file @ 2e3a291
... ... @@ -21,8 +21,8 @@
21 21 public static boolean saveSmsCenter(MessageListRequest list)
22 22 {
23 23 String json = JsonUtil.obj2JsonString(list);
24   - //String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS",json,CENTER_TOKEN);
25   - String result = HttpRequest.sendPost("http://192.168.5.13:8080/v1/saveCreatedSMS",json,"YMer2016");
  24 + String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS",json,CENTER_TOKEN);
  25 +// String result = HttpRequest.sendPost("http://192.168.5.13:8080/v1/saveCreatedSMS",json,"YMer2016");
26 26 if (StringUtils.isNotEmpty(result))
27 27 {
28 28 Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
platform-data-api/src/main/resources/config.properties View file @ 2e3a291
  1 +#短信中心url
  2 +center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
  3 +
  4 +#区域平台访问短信中心的token
  5 +center_token=YMer2016
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ 2e3a291
... ... @@ -31,8 +31,8 @@
31 31 public static boolean serviceConfig(List<Config> configs,String hid)
32 32 {
33 33 String json = JsonUtil.array2JsonString(configs);
34   -// String result = HttpRequest.sendPost(CENTER_BASE_URL + "serviceConfig/{" + hid + "}", json, CENTER_TOKEN);
35   - String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/"+hid,json,"YMer2016");
  34 + String result = HttpRequest.sendPost(CENTER_BASE_URL + "serviceConfig/{" + hid + "}", json, CENTER_TOKEN);
  35 +// String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/"+hid,json,"YMer2016");
36 36 if (StringUtils.isNotEmpty(result))
37 37 {
38 38 Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
... ... @@ -52,16 +52,16 @@
52 52 */
53 53 public static boolean saveSmsCenter(MessageListRequest list)
54 54 {
55   -// String json = JsonUtil.obj2JsonString(list);
56   -// String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
57   -// if (StringUtils.isNotEmpty(result))
58   -// {
59   -// Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
60   -// if ("0".equals(map.get("errorcode")))
61   -// {
62   -// return true;
63   -// }
64   -// }
  55 + String json = JsonUtil.obj2JsonString(list);
  56 + String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
  57 + if (StringUtils.isNotEmpty(result))
  58 + {
  59 + Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
  60 + if ("0".equals(map.get("errorcode")))
  61 + {
  62 + return true;
  63 + }
  64 + }
65 65 return false;
66 66 }
67 67  
68 68  
... ... @@ -71,17 +71,17 @@
71 71 String param = "typeId=4&ext1="+StringUtils.emptyStr(hospitalId)+"&phone="+StringUtils.emptyStr(phone)+"&subTypeId="+StringUtils.emptyInt(smsType)+"&content="+StringUtils.emptyStr(content)+
72 72 "&planTimeStart="+planTimeStart+"&planTimeEnd="+planTimeEnd+"&actualTimeStart="+actualTimeStart+
73 73 "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&page="+page+"&limit="+limit;
74   -// String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN);
75   - SmsResult map = new SmsResult();
  74 + String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN);
  75 +// SmsResult map = new SmsResult();
76 76 // String result = HttpRequest.sendGet("http://192.168.5.6:8080/v1/messages", param, "YMer2016");
77   -// SmsResult map = JsonUtil.str2Obj(result, SmsResult.class);
78   -// JSONObject jsonObject = JsonUtil.getObj(result);
79   -// if (jsonObject != null && jsonObject.getJSONArray("list") != null)
80   -// {
81   -// JSONArray jsonArray = jsonObject.getJSONArray("list");
82   -// String list = jsonArray.toString();
83   -// map.setList(JsonUtil.toList(list,SmsObj.class));
84   -// }
  77 + SmsResult map = JsonUtil.str2Obj(result, SmsResult.class);
  78 + JSONObject jsonObject = JsonUtil.getObj(result);
  79 + if (jsonObject != null && jsonObject.getJSONArray("list") != null)
  80 + {
  81 + JSONArray jsonArray = jsonObject.getJSONArray("list");
  82 + String list = jsonArray.toString();
  83 + map.setList(JsonUtil.toList(list,SmsObj.class));
  84 + }
85 85 return map;
86 86 }
87 87  
platform-operate-api/src/main/resources/config.properties View file @ 2e3a291
1 1 #短信中心url
2   -center_base_url=http://192.168.5.3:8080/v1/
  2 +center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
3 3  
4 4 #区域平台访问短信中心的token
5 5 center_token=YMer2016