Commit 5c16734811b00d4be7d8690e1b0bc2fd8a13d884
1 parent
ff9129aebb
Exists in
master
and in
8 other branches
code update
Showing 2 changed files with 35 additions and 36 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ConfigTask.java
View file @
5c16734
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java
View file @
5c16734
... | ... | @@ -34,7 +34,6 @@ |
34 | 34 | { |
35 | 35 | String json = JsonUtil.array2JsonString(configs); |
36 | 36 | String result = HttpRequest.sendPost(CENTER_BASE_URL + "serviceConfig/{" + hid + "}", json, CENTER_TOKEN); |
37 | -// String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/"+hid,json,"YMer2016"); | |
38 | 37 | if (StringUtils.isNotEmpty(result)) |
39 | 38 | { |
40 | 39 | Map<String,String> map = JsonUtil.str2Obj(result, Map.class); |
... | ... | @@ -74,8 +73,7 @@ |
74 | 73 | "&planTimeStart="+planTimeStart+"&planTimeEnd="+planTimeEnd+"&actualTimeStart="+actualTimeStart+ |
75 | 74 | "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&objType="+StringUtils.emptyInt(objType)+"&page="+page+"&limit="+limit; |
76 | 75 | String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN); |
77 | -// SmsResult map = new SmsResult(); | |
78 | -// String result = HttpRequest.sendGet("http://192.168.5.6:8080/v1/messages", param, "YMer2016"); | |
76 | + | |
79 | 77 | SmsResult map = JsonUtil.str2Obj(result, SmsResult.class); |
80 | 78 | JSONObject jsonObject = JsonUtil.getObj(result); |
81 | 79 | if (jsonObject != null && jsonObject.getJSONArray("list") != null) |
82 | 80 | |
83 | 81 | |
... | ... | @@ -88,40 +86,41 @@ |
88 | 86 | } |
89 | 87 | |
90 | 88 | public static void main(String[] args){ |
91 | -// String param = "phone=&page=1&limit=100&typeId=4"; | |
89 | + String param = "phone=&page=1&limit=100&typeId=4&ext1=196"; | |
92 | 90 | // |
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); | |
91 | +// MessageListRequest list = new MessageListRequest(); | |
92 | +// List<MessageRequest> messages = new ArrayList<>(); | |
93 | +// MessageRequest request = new MessageRequest(); | |
94 | +// request.setTypeId(4); | |
95 | +// request.setStatus(0); | |
96 | +// request.setContent("阿道夫"); | |
97 | +// request.setObjType(1); | |
98 | +// request.setPhone("18382670000"); | |
99 | +// request.setPlanTime("2015-01-06 15:22:12"); | |
100 | +// request.setServiceType(1); | |
101 | +// request.setExt1("196"); | |
102 | +// request.setExt2("10"); | |
103 | +// request.setExt3("10"); | |
104 | +// request.setSubTypeId(6); | |
105 | +// messages.add(request); | |
106 | +// | |
107 | +// | |
108 | +// list.setTypeId(4); | |
109 | +// list.setMessages(messages); | |
110 | +// | |
111 | +// String json = JsonUtil.obj2Str(list); | |
112 | +// | |
113 | +// String rs = HttpRequest.sendPost("http://sms.api.stage.platform.healthbaby.com.cn/v1/saveCreatedSMS", json, "YMer2016"); | |
114 | +// System.out.print(rs); | |
108 | 115 | |
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); | |
116 | + String result = HttpRequest.sendGet("http://sms.api.stage.platform.healthbaby.com.cn/v1/messages", param, "YMer2016"); | |
117 | + SmsResult map = JsonUtil.str2Obj(result, SmsResult.class); | |
118 | + JSONObject jsonObject = JsonUtil.getObj(result); | |
119 | + JSONArray jsonArray = jsonObject.getJSONArray("list"); | |
120 | + String list = jsonArray.toString(); | |
121 | + System.out.print(list); | |
122 | + map.setList(JsonUtil.toList(list, SmsObj.class)); | |
123 | + System.out.print(map); | |
125 | 124 | |
126 | 125 | |
127 | 126 | } |