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 a8f5eef..e5cfcef 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 @@ -141,10 +141,10 @@ public enum SmsServiceEnums { * 只要子节点 * @return */ - public static List getSmsServiceLeaf() + public static List> getSmsServiceLeaf() { - List list = new ArrayList<>(); + List> list = new ArrayList<>(); for (SmsServiceEnums e : SmsServiceEnums.values()) { Map rootMap = new HashMap(); rootMap.put("id",e.getId()); @@ -179,9 +179,9 @@ public enum SmsServiceEnums { * @param serviceObj * @return */ - public static List getSmsServiceByServiceObj(int serviceObj) + public static List> getSmsServiceByServiceObj(int serviceObj) { - List list = new ArrayList<>(); + List> list = new ArrayList<>(); for (SmsServiceEnums e : SmsServiceEnums.values()) { if(String.valueOf(e.getServiceObj()).contains(String.valueOf(serviceObj))) { Map rootMap = new HashMap(); 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 b1e385b..fc32286 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 @@ -233,8 +233,8 @@ public class EnumsController { */ @RequestMapping(value = "/getSmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET) @ResponseBody - public List getSmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) { - List list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId); + public List> getSmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) { + List> list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId); return list; } @@ -246,8 +246,8 @@ public class EnumsController { */ @RequestMapping(value = "/getQuerySmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET) @ResponseBody - public List getQuerySmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) { - List list = null; + public List> getQuerySmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) { + List> list = null; if (serviceObjId == 0) { list = SmsServiceEnums.getSmsServiceLeaf(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index ee8ac16..a0974f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -54,6 +54,38 @@ public class SmsConfigFacade { SmsConfigModel model = getSmsConfigModel(request); model.setModified(new Date()); + List> resultServices = request.getSmsService(); + + List> allServices = SmsServiceEnums.getSmsServiceLeaf(); + List> paramServices = request.getSmsService(); + + resultServices.addAll(paramServices); + for (Map all : allServices) + { + String id = all.get("id"); + boolean isExist = false; + for (Map start : paramServices) + { + Set keys = start.keySet(); + for(String key : keys) + { + if (id != null && id.equals(key)) + { + isExist = true; + } + } + + } + if (!isExist) + { + Map result = new HashMap<>(); + result.put(id, "false"); + resultServices.add(result); + } + } + + + smsConfigService.updateSmsConfig(model, request.getId()); BaseResponse objectResponse = new BaseResponse(); 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 new file mode 100644 index 0000000..69cf6ec --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -0,0 +1,55 @@ +package com.lyms.platform.operate.web.utils; + + +import com.lyms.platform.common.utils.HttpRequest; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.request.MessageListRequest; + +import java.util.List; +import java.util.Map; + +/** + * Created by Administrator on 2016/7/5. + */ +public class MessageCenterService { + + public static final String URL = "http://192.168.5.3:8080/v1/saveCreatedSMS"; + + public static boolean serviceConfig(List> configs,String hid) + { + String json = JsonUtil.obj2JsonString(configs); + String result = HttpRequest.sendPost(URL, json, "YMer2016"); + if (StringUtils.isNotEmpty(result)) + { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode"))) + { + return true; + } + } + return false; + } + + + public static boolean saveSmsCenter(MessageListRequest list) + { + String json = JsonUtil.obj2JsonString(list); + String result = HttpRequest.sendPost(URL,json,"YMer2016"); + if (StringUtils.isNotEmpty(result)) + { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode"))) + { + return true; + } + } + return false; + } + + + public static void main(String[] areg) + { + + } +}