Commit a74aa7d7041893fa40664eaf63947db2ea7af14f

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java View file @ a74aa7d
... ... @@ -141,10 +141,10 @@
141 141 * 只要子节点
142 142 * @return
143 143 */
144   - public static List<Map> getSmsServiceLeaf()
  144 + public static List<Map<String,String>> getSmsServiceLeaf()
145 145 {
146 146  
147   - List<Map> list = new ArrayList<>();
  147 + List<Map<String,String>> list = new ArrayList<>();
148 148 for (SmsServiceEnums e : SmsServiceEnums.values()) {
149 149 Map rootMap = new HashMap();
150 150 rootMap.put("id",e.getId());
151 151  
... ... @@ -179,9 +179,9 @@
179 179 * @param serviceObj
180 180 * @return
181 181 */
182   - public static List<Map> getSmsServiceByServiceObj(int serviceObj)
  182 + public static List<Map<String,String>> getSmsServiceByServiceObj(int serviceObj)
183 183 {
184   - List<Map> list = new ArrayList<>();
  184 + List<Map<String,String>> list = new ArrayList<>();
185 185 for (SmsServiceEnums e : SmsServiceEnums.values()) {
186 186 if(String.valueOf(e.getServiceObj()).contains(String.valueOf(serviceObj))) {
187 187 Map rootMap = new HashMap();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java View file @ a74aa7d
... ... @@ -233,8 +233,8 @@
233 233 */
234 234 @RequestMapping(value = "/getSmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
235 235 @ResponseBody
236   - public List<Map> getSmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
237   - List<Map> list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
  236 + public List<Map<String,String>> getSmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
  237 + List<Map<String,String>> list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
238 238 return list;
239 239 }
240 240  
... ... @@ -246,8 +246,8 @@
246 246 */
247 247 @RequestMapping(value = "/getQuerySmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
248 248 @ResponseBody
249   - public List<Map> getQuerySmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
250   - List<Map> list = null;
  249 + public List<Map<String,String>> getQuerySmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
  250 + List<Map<String,String>> list = null;
251 251 if (serviceObjId == 0)
252 252 {
253 253 list = SmsServiceEnums.getSmsServiceLeaf();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ a74aa7d
... ... @@ -54,6 +54,38 @@
54 54 SmsConfigModel model = getSmsConfigModel(request);
55 55 model.setModified(new Date());
56 56  
  57 + List<Map<String, String>> resultServices = request.getSmsService();
  58 +
  59 + List<Map<String,String>> allServices = SmsServiceEnums.getSmsServiceLeaf();
  60 + List<Map<String, String>> paramServices = request.getSmsService();
  61 +
  62 + resultServices.addAll(paramServices);
  63 + for (Map<String, String> all : allServices)
  64 + {
  65 + String id = all.get("id");
  66 + boolean isExist = false;
  67 + for (Map<String, String> start : paramServices)
  68 + {
  69 + Set<String> keys = start.keySet();
  70 + for(String key : keys)
  71 + {
  72 + if (id != null && id.equals(key))
  73 + {
  74 + isExist = true;
  75 + }
  76 + }
  77 +
  78 + }
  79 + if (!isExist)
  80 + {
  81 + Map<String, String> result = new HashMap<>();
  82 + result.put(id, "false");
  83 + resultServices.add(result);
  84 + }
  85 + }
  86 +
  87 +
  88 +
57 89 smsConfigService.updateSmsConfig(model, request.getId());
58 90  
59 91 BaseResponse objectResponse = new BaseResponse();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ a74aa7d
  1 +package com.lyms.platform.operate.web.utils;
  2 +
  3 +
  4 +import com.lyms.platform.common.utils.HttpRequest;
  5 +import com.lyms.platform.common.utils.JsonUtil;
  6 +import com.lyms.platform.common.utils.StringUtils;
  7 +import com.lyms.platform.operate.web.request.MessageListRequest;
  8 +
  9 +import java.util.List;
  10 +import java.util.Map;
  11 +
  12 +/**
  13 + * Created by Administrator on 2016/7/5.
  14 + */
  15 +public class MessageCenterService {
  16 +
  17 + public static final String URL = "http://192.168.5.3:8080/v1/saveCreatedSMS";
  18 +
  19 + public static boolean serviceConfig(List<Map<String,String>> configs,String hid)
  20 + {
  21 + String json = JsonUtil.obj2JsonString(configs);
  22 + String result = HttpRequest.sendPost(URL, json, "YMer2016");
  23 + if (StringUtils.isNotEmpty(result))
  24 + {
  25 + Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
  26 + if ("0".equals(map.get("errorcode")))
  27 + {
  28 + return true;
  29 + }
  30 + }
  31 + return false;
  32 + }
  33 +
  34 +
  35 + public static boolean saveSmsCenter(MessageListRequest list)
  36 + {
  37 + String json = JsonUtil.obj2JsonString(list);
  38 + String result = HttpRequest.sendPost(URL,json,"YMer2016");
  39 + if (StringUtils.isNotEmpty(result))
  40 + {
  41 + Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
  42 + if ("0".equals(map.get("errorcode")))
  43 + {
  44 + return true;
  45 + }
  46 + }
  47 + return false;
  48 + }
  49 +
  50 +
  51 + public static void main(String[] areg)
  52 + {
  53 +
  54 + }
  55 +}