diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java index 5e8ba41..30e8914 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java @@ -154,7 +154,7 @@ public class AmsMessageService { } public static void main(String[] args) { - Map> list = getMessageTemplateMap("202", + Map> list = getMessageTemplateMap("216", AmsServiceTypeEnum.YUN_GUIDE); List msgs = list.get("年龄≥35岁"); System.out.println(msgs); diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java index 749f753..2584bf4 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java @@ -245,4 +245,29 @@ public class DateUtils { return 0; } + + /** + * 获取两个日期相差几个月 + * @param start + * @param end + * @return + */ + public static int getBetweenMonths(Date start, Date end) { + int result = 0; + try { + Calendar c1 = Calendar.getInstance(); + Calendar c2 = Calendar.getInstance(); + c1.setTime(start); + c2.setTime(end); + result = c2.get(Calendar.MONTH) - c1.get(Calendar.MONTH); + result += 12 * (c2.get(Calendar.YEAR) - c1.get(Calendar.YEAR)); + if(c2.get(Calendar.DAY_OF_MONTH) - c1.get(Calendar.DAY_OF_MONTH) < 0 && result > 0) { + result -= 1; + } + } catch (Exception e) { + e.printStackTrace(); + } + return Math.abs(result); + } + } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java index 552c0ca..9fdd6e3 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java @@ -15,6 +15,7 @@ import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; @@ -336,7 +337,10 @@ public class HelperUtils { * @return */ public static String getMonthYear(Date birth, Date currentDate) { - int month = DateUtils.daysBetween(birth,currentDate); + int month = DateUtils.getBetweenMonths(birth, currentDate); return month+"月龄"; } + + + } diff --git a/platform-msg-generate/src/main/resources/config.properties b/platform-msg-generate/src/main/resources/config.properties index 7e6bc7e..22fd6b6 100644 --- a/platform-msg-generate/src/main/resources/config.properties +++ b/platform-msg-generate/src/main/resources/config.properties @@ -7,7 +7,7 @@ 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-data-api.healthbaby.com.cn/v1/messages -ams_sms=http://data.api.stage.healthbaby.com.cn/v1/messages +ams_sms=http://data.api.healthbaby.com.cn/v1/messages #短信当天发送时间 如16:00 send_time=16:00