From bcfb2229c83e08172c778bd3cebf288160fcadfa Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 21 Jul 2016 10:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/common/enums/SmsServiceEnums.java | 4 ++-- .../platform/operate/web/controller/EnumsController.java | 2 +- .../platform/operate/web/controller/SmsConfigController.java | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java index 9a95010..09c9040 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java @@ -30,7 +30,7 @@ public enum SmsServiceEnums { EBYYTX(16,"儿保预约提醒",14,"2"), YSGXHZD(17,"医生个性化指导",0,"0,1,2,3"), GSFWTZ(18,"公司服务通知",0,""), - FWKT(19,"服务开通",18,"0,1,2,3"), + FWKT(19,"服务提醒",18,"0,1,2,3"), YWTG(20,"业务推广",18,"0,1,2,3"), QT(21,"其他",0,""), JRWH(22,"节日问候",21,"0,1,2,3"), @@ -96,7 +96,7 @@ public enum SmsServiceEnums { rootMap.put("pid",e.getPid()); if (isLeaf(e.getId())) { - rootMap.put("child",getSmsServiceTree(e.getId())); + rootMap.put("children",getSmsServiceTree(e.getId())); rootMap.put("isLeaf",false); } else diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java index f0183ad..4ca5afc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java @@ -337,7 +337,7 @@ public class EnumsController { public static void main(String a[]) { - List list = SmsServiceEnums.getSmsServiceLeaf(); + List list = SmsServiceEnums.getSmsServiceTree(-1); System.out.println(list); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java index 3467a52..13e7403 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.enums.SendTimeEnums; import com.lyms.platform.common.enums.SmsServiceEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.JsonUtil; @@ -79,4 +80,15 @@ public class SmsConfigController extends BaseController { return smsConfigFacade.querySmsConfigByHid(hid); } + /** + * 获取服务树结构 + * @return + */ + @RequestMapping(value = "/getServiceTreeData", method = RequestMethod.GET) + @ResponseBody + public List getServiceTreeData() { + List list = SmsServiceEnums.getSmsServiceTree(-1); + return list; + } + } -- 1.8.3.1