From ae690f85907d1c41d3456f73b3597aa5f171f87f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 13 Sep 2016 10:51:01 +0800 Subject: [PATCH] code update --- .../src/main/java/com/lyms/platform/common/utils/DateUtil.java | 8 ++++++-- .../java/com/lyms/platform/data/service/impl/SmsServiceImpl.java | 8 ++++---- .../main/java/com/lyms/platform/data/util/AmsMessageService.java | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 40a196e..f4e586c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -742,8 +742,12 @@ public class DateUtil { // System.out.println(s); // Date s = addDay(parseYMD("2016-02-26"), 168); - Date startDate = DateUtil.getNewDate(-0,"周",0); - Date endDate = DateUtil.getNewDate(-1-1,"周",0); + int start = 0; + int end = 1; + + + Date startDate = DateUtil.getNewDate(-end-1,"周",0); + Date endDate = DateUtil.getNewDate(-start,"周",0); System.out.println(startDate + "==="+ endDate); } catch (Exception e) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index e0c0054..96e2aa6 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -1116,8 +1116,8 @@ public class SmsServiceImpl implements SmsService{ if (start != null && end != null) { - Date startDate = DateUtil.getNewDate(-end, "月", sendTimeType); - Date endDate = DateUtil.getNewDate(-start-1,"月",sendTimeType); + Date startDate = DateUtil.getNewDate(-end-1, "月", sendTimeType); + Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType); babyModelQuery.setBirthStart(startDate); babyModelQuery.setBirthEnd(endDate); @@ -1250,8 +1250,8 @@ public class SmsServiceImpl implements SmsService{ Integer end = template.getEnd(); if (start != null && end != null) { - Date startDate = DateUtil.getNewDate(-end,"月",sendTimeType); - Date endDate = DateUtil.getNewDate(-start-1,"月",sendTimeType); + Date startDate = DateUtil.getNewDate(-end-1,"月",sendTimeType); + Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType); babyModelQuery.setBirthStart(startDate); babyModelQuery.setBirthEnd(endDate); messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template)); 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 ddb8df2..cd6b0bd 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 @@ -27,6 +27,7 @@ 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"; private static final String AUTHORIZATION = "healthbaby2015"; @@ -181,7 +182,7 @@ public class AmsMessageService { public static void main(String[] args) { - getMessageTemplateMap("241", + getMessageTemplateMap("245", AmsServiceTypeEnum.CHILD_GUIDE); } -- 1.8.3.1