diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java
index 17d6de1..18151f2 100644
--- a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java
+++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java
@@ -1,7 +1,9 @@
package com.lyms.platform.data.util;
import com.lyms.platform.common.enums.AmsServiceTypeEnum;
+import com.lyms.platform.common.utils.HttpClientUtil;
import com.lyms.platform.common.utils.HttpRequest;
+import com.lyms.platform.common.utils.PropertiesUtils;
import com.lyms.platform.common.utils.StringUtils;
import com.lyms.platform.data.pojo.MessageContent;
import com.lyms.platform.data.pojo.MessageResponseEntity;
@@ -26,8 +28,9 @@ import java.util.Map;
*/
public class AmsMessageService {
private static final Logger logger = Logger.getLogger(AmsMessageService.class);
- private static final String AMS_URL = "http://data.api.healthbaby.com.cn/v1/messages";
-//private static final String AMS_URL = "http://data.api.stage.healthbaby.com.cn/v1/messages";
+ public static final String AMS_URL= PropertiesUtils.getPropertyValue("ams_sms");
+ // private static final String AMS_URL = "http://data.api.healthbaby.com.cn/v1/messages";
+ //private static final String AMS_URL = "http://data.api.stage.healthbaby.com.cn/v1/messages";
private static final String AUTHORIZATION = "healthbaby2015";
@@ -82,6 +85,8 @@ public class AmsMessageService {
params.put("limit", "9999");
String str = HttpRequest.sendGet(AMS_URL,
params, headers);
+
+ //String str = HttpClientUtil.doGet(AMS_URL,params,"utf-8",AUTHORIZATION);
// System.out.println(str);
ObjectMapper om = new ObjectMapper();
MessageResponseEntity mre = null;
diff --git a/platform-data-api/src/main/resources/config.properties b/platform-data-api/src/main/resources/config.properties
index d00dc37..2fc47e8 100644
--- a/platform-data-api/src/main/resources/config.properties
+++ b/platform-data-api/src/main/resources/config.properties
@@ -5,5 +5,9 @@ center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
#区域平台访问短信中心的token
center_token=e0c56363-00d6-42ee-bbe0-23c553583062
+#AMS地址 线上:http://data.api.healthbaby.com.cn/v1/messages 测试:http://data.api.stage.healthbaby.com.cn/v1/messages
+#演示地址 https://stage-rp-ams-api.healthbaby.com.cn/v1/messages
+ams_sms=http://data.api.healthbaby.com.cn/v1/messages
+
#短信当天发送时间 如16:00
send_time=16:00
diff --git a/platform-operate-api/pom.xml b/platform-operate-api/pom.xml
index f27949e..5b299ee 100644
--- a/platform-operate-api/pom.xml
+++ b/platform-operate-api/pom.xml
@@ -11,16 +11,16 @@
platform-operate-api
-
- org.apache.httpcomponents
- httpclient
- 4.5.2
-
+
+
+
+
+
-
- commons-httpclient
- commons-httpclient
-
+
+
+
+
com.lyms.core
platform-common
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 9603e9c..eb02dec 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
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.utils;
import com.lyms.platform.common.enums.ProjectTypeEnums;
+import com.lyms.platform.common.enums.SmsStatusEnums;
import com.lyms.platform.common.utils.*;
import com.lyms.platform.operate.web.request.MessageListRequest;
import com.lyms.platform.operate.web.request.MessageRequest;
@@ -10,6 +11,7 @@ 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 org.apache.commons.collections.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
@@ -54,14 +56,23 @@ public class MessageCenterService {
String json = "";
try{
json = JsonUtil.obj2Str(list);
- String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
- ExceptionUtils.catchException("儿童建档4---------->"+ json);
- ExceptionUtils.catchException("儿童建档5---------->result"+ result);
+ String result = HttpRequest.sendPost("http://sms.healthbaby.com.cn/v1/saveCreatedSMS", json, CENTER_TOKEN);
if (StringUtils.isNotEmpty(result))
{
+ System.out.println("=====================" + result);
Map map = JsonUtil.str2Obj(result, Map.class);
if ("0".equals(map.get("errorcode")))
{
+// List msgs = list.getMessages();
+// if (CollectionUtils.isNotEmpty(msgs))
+// {
+// for(MessageRequest messageRequest : msgs)
+// {
+// messageRequest.setStatus(SmsStatusEnums.YFS.getId());
+// }
+// }
+// json = JsonUtil.obj2Str(list);
+// HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN);
return true;
}
}
@@ -93,41 +104,41 @@ public class MessageCenterService {
}
public static void main(String[] args){
- String param = "phone=&page=1&limit=100&typeId=4&ext1=196";
+// String param = "phone=&page=1&limit=100&typeId=4&ext1=196";
//
-// 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);
-//
-//
-// 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);
+ 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("18382670001");
+ request.setPlanTime("2015-01-06 15:22:12");
+ request.setServiceType(1);
+ request.setExt1("196");
+ request.setExt2("1230");
+ request.setExt3("120");
+ request.setSubTypeId(6);
+ messages.add(request);
- String result = HttpRequest.sendGet("http://sms.api.stage.platform.healthbaby.com.cn/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();
- System.out.print(list);
- map.setList(JsonUtil.toList(list, SmsObj.class));
- System.out.print(map);
+
+ list.setTypeId(5);
+ list.setMessages(messages);
+
+ String json = JsonUtil.obj2Str(list);
+
+ String rs = HttpRequest.sendPost("http://sms.api.stage.platform.healthbaby.com.cn/v1/saveCreatedSMS", json, "e0c56363-00d6-42ee-bbe0-23c553583062");
+ System.out.print(rs);
+
+// String result = HttpRequest.sendGet("http://sms.api.stage.platform.healthbaby.com.cn/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();
+// System.out.print(list);
+// map.setList(JsonUtil.toList(list, SmsObj.class));
+// System.out.print(map);
}
diff --git a/pom.xml b/pom.xml
index a699143..771a44b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,6 +198,12 @@
+ org.apache.httpcomponents
+ httpclient
+ 4.5.2
+
+
+
commons-httpclient
commons-httpclient