jiangjiazhi / regional-platform

Commit efb48f42489ad9ee16585bf216cfd005d330a133

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 5 changed files with 73 additions and 47 deletions

platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java
platform-data-api/src/main/resources/config.properties
platform-operate-api/pom.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java
pom.xml

1	1	package com.lyms.platform.data.util;
2	2
3	3	import com.lyms.platform.common.enums.AmsServiceTypeEnum;
	4	+import com.lyms.platform.common.utils.HttpClientUtil;
4	5	import com.lyms.platform.common.utils.HttpRequest;
	6	+import com.lyms.platform.common.utils.PropertiesUtils;
5	7	import com.lyms.platform.common.utils.StringUtils;
6	8	import com.lyms.platform.data.pojo.MessageContent;
7	9	import com.lyms.platform.data.pojo.MessageResponseEntity;
...	...	@@ -26,8 +28,9 @@
26	28	*/
27	29	public class AmsMessageService {
28	30	private static final Logger logger = Logger.getLogger(AmsMessageService.class);
29		- private static final String AMS_URL = "http://data.api.healthbaby.com.cn/v1/messages";
30		-//private static final String AMS_URL = "http://data.api.stage.healthbaby.com.cn/v1/messages";
	31	+ public static final String AMS_URL= PropertiesUtils.getPropertyValue("ams_sms");
	32	+ // private static final String AMS_URL = "http://data.api.healthbaby.com.cn/v1/messages";
	33	+ //private static final String AMS_URL = "http://data.api.stage.healthbaby.com.cn/v1/messages";
31	34	private static final String AUTHORIZATION = "healthbaby2015";
32	35
33	36
...	...	@@ -82,6 +85,8 @@
82	85	params.put("limit", "9999");
83	86	String str = HttpRequest.sendGet(AMS_URL,
84	87	params, headers);
	88	+
	89	+ //String str = HttpClientUtil.doGet(AMS_URL,params,"utf-8",AUTHORIZATION);
85	90	// System.out.println(str);
86	91	ObjectMapper om = new ObjectMapper();
87	92	MessageResponseEntity mre = null;

...	...	@@ -5,6 +5,10 @@
5	5	#区域平台访问短信中心的token
6	6	center_token=e0c56363-00d6-42ee-bbe0-23c553583062
7	7
	8	+#AMS地址线上：http://data.api.healthbaby.com.cn/v1/messages 测试：http://data.api.stage.healthbaby.com.cn/v1/messages
	9	+#演示地址 https://stage-rp-ams-api.healthbaby.com.cn/v1/messages
	10	+ams_sms=http://data.api.healthbaby.com.cn/v1/messages
	11	+
8	12	#短信当天发送时间如16:00
9	13	send_time=16:00

...	...	@@ -11,16 +11,16 @@
11	11	<artifactId>platform-operate-api</artifactId>
12	12
13	13	<dependencies>
14		- <dependency>
15		- <groupId>org.apache.httpcomponents</groupId>
16		- <artifactId>httpclient</artifactId>
17		- <version>4.5.2</version>
18		- </dependency>
	14	+ <!--<dependency>-->
	15	+ <!--<groupId>org.apache.httpcomponents</groupId>-->
	16	+ <!--<artifactId>httpclient</artifactId>-->
	17	+ <!--<version>4.5.2</version>-->
	18	+ <!--</dependency>-->
19	19
20		- <dependency>
21		- <groupId>commons-httpclient</groupId>
22		- <artifactId>commons-httpclient</artifactId>
23		- </dependency>
	20	+ <!--<dependency>-->
	21	+ <!--<groupId>commons-httpclient</groupId>-->
	22	+ <!--<artifactId>commons-httpclient</artifactId>-->
	23	+ <!--</dependency>-->
24	24	<dependency>
25	25	<groupId>com.lyms.core</groupId>
26	26	<artifactId>platform-common</artifactId>

...	...	@@ -2,6 +2,7 @@
2	2
3	3
4	4	import com.lyms.platform.common.enums.ProjectTypeEnums;
	5	+import com.lyms.platform.common.enums.SmsStatusEnums;
5	6	import com.lyms.platform.common.utils.*;
6	7	import com.lyms.platform.operate.web.request.MessageListRequest;
7	8	import com.lyms.platform.operate.web.request.MessageRequest;
...	...	@@ -10,6 +11,7 @@
10	11	import com.lyms.platform.operate.web.result.SmsResult;
11	12	import net.sf.json.JSONArray;
12	13	import net.sf.json.JSONObject;
	14	+import org.apache.commons.collections.CollectionUtils;
13	15
14	16	import java.util.ArrayList;
15	17	import java.util.List;
16	18
17	19
...	...	@@ -54,14 +56,23 @@
54	56	String json = "";
55	57	try{
56	58	json = JsonUtil.obj2Str(list);
57		- String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
58		- ExceptionUtils.catchException("儿童建档4---------->"+ json);
59		- ExceptionUtils.catchException("儿童建档5---------->result"+ result);
	59	+ String result = HttpRequest.sendPost("http://sms.healthbaby.com.cn/v1/saveCreatedSMS", json, CENTER_TOKEN);
60	60	if (StringUtils.isNotEmpty(result))
61	61	{
	62	+ System.out.println("=====================" + result);
62	63	Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
63	64	if ("0".equals(map.get("errorcode")))
64	65	{
	66	+// List<MessageRequest> msgs = list.getMessages();
	67	+// if (CollectionUtils.isNotEmpty(msgs))
	68	+// {
	69	+// for(MessageRequest messageRequest : msgs)
	70	+// {
	71	+// messageRequest.setStatus(SmsStatusEnums.YFS.getId());
	72	+// }
	73	+// }
	74	+// json = JsonUtil.obj2Str(list);
	75	+// HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
65	76	return true;
66	77	}
67	78	}
68	79
69	80
...	...	@@ -93,41 +104,41 @@
93	104	}
94	105
95	106	public static void main(String[] args){
96		- String param = "phone=&page=1&limit=100&typeId=4&ext1=196";
	107	+// String param = "phone=&page=1&limit=100&typeId=4&ext1=196";
97	108	//
98		-// MessageListRequest list = new MessageListRequest();
99		-// List<MessageRequest> messages = new ArrayList<>();
100		-// MessageRequest request = new MessageRequest();
101		-// request.setTypeId(4);
102		-// request.setStatus(0);
103		-// request.setContent("阿道夫");
104		-// request.setObjType(1);
105		-// request.setPhone("18382670000");
106		-// request.setPlanTime("2015-01-06 15:22:12");
107		-// request.setServiceType(1);
108		-// request.setExt1("196");
109		-// request.setExt2("10");
110		-// request.setExt3("10");
111		-// request.setSubTypeId(6);
112		-// messages.add(request);
113		-//
114		-//
115		-// list.setTypeId(4);
116		-// list.setMessages(messages);
117		-//
118		-// String json = JsonUtil.obj2Str(list);
119		-//
120		-// String rs = HttpRequest.sendPost("http://sms.api.stage.platform.healthbaby.com.cn/v1/saveCreatedSMS", json, "YMer2016");
121		-// System.out.print(rs);
	109	+ MessageListRequest list = new MessageListRequest();
	110	+ List<MessageRequest> messages = new ArrayList<>();
	111	+ MessageRequest request = new MessageRequest();
	112	+ request.setTypeId(4);
	113	+ request.setStatus(0);
	114	+ request.setContent("阿道夫");
	115	+ request.setObjType(1);
	116	+ request.setPhone("18382670001");
	117	+ request.setPlanTime("2015-01-06 15:22:12");
	118	+ request.setServiceType(1);
	119	+ request.setExt1("196");
	120	+ request.setExt2("1230");
	121	+ request.setExt3("120");
	122	+ request.setSubTypeId(6);
	123	+ messages.add(request);
122	124
123		- String result = HttpRequest.sendGet("http://sms.api.stage.platform.healthbaby.com.cn/v1/messages", param, "YMer2016");
124		- SmsResult map = JsonUtil.str2Obj(result, SmsResult.class);
125		- JSONObject jsonObject = JsonUtil.getObj(result);
126		- JSONArray jsonArray = jsonObject.getJSONArray("list");
127		- String list = jsonArray.toString();
128		- System.out.print(list);
129		- map.setList(JsonUtil.toList(list, SmsObj.class));
130		- System.out.print(map);
	125	+
	126	+ list.setTypeId(5);
	127	+ list.setMessages(messages);
	128	+
	129	+ String json = JsonUtil.obj2Str(list);
	130	+
	131	+ String rs = HttpRequest.sendPost("http://sms.api.stage.platform.healthbaby.com.cn/v1/saveCreatedSMS", json, "e0c56363-00d6-42ee-bbe0-23c553583062");
	132	+ System.out.print(rs);
	133	+
	134	+// String result = HttpRequest.sendGet("http://sms.api.stage.platform.healthbaby.com.cn/v1/messages", param, "YMer2016");
	135	+// SmsResult map = JsonUtil.str2Obj(result, SmsResult.class);
	136	+// JSONObject jsonObject = JsonUtil.getObj(result);
	137	+// JSONArray jsonArray = jsonObject.getJSONArray("list");
	138	+// String list = jsonArray.toString();
	139	+// System.out.print(list);
	140	+// map.setList(JsonUtil.toList(list, SmsObj.class));
	141	+// System.out.print(map);
131	142
132	143
133	144	}

...	...	@@ -198,6 +198,12 @@
198	198	</dependencyManagement>
199	199	<dependencies>
200	200	<dependency>
	201	+ <groupId>org.apache.httpcomponents</groupId>
	202	+ <artifactId>httpclient</artifactId>
	203	+ <version>4.5.2</version>
	204	+ </dependency>
	205	+
	206	+ <dependency>
201	207	<groupId>commons-httpclient</groupId>
202	208	<artifactId>commons-httpclient</artifactId>
203	209	</dependency>