From 3266f906f0fae12900e778cdb16dac8ae9a5b9c2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 9 Aug 2016 11:38:12 +0800 Subject: [PATCH] config --- .../resources/spring/applicationContext-quartz.xml | 36 +++++++++++ .../operate/web/facade/BabyCheckFacade.java | 2 +- .../operate/web/facade/SmsConfigFacade.java | 33 +--------- .../lyms/platform/operate/web/result/Config.java | 26 ++++++++ .../platform/operate/web/utils/ConfigTask.java | 72 ++++++++++++++++++++++ .../operate/web/utils/MessageCenterService.java | 3 +- 6 files changed, 139 insertions(+), 33 deletions(-) create mode 100644 platform-data-api/src/main/resources/spring/applicationContext-quartz.xml create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Config.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ConfigTask.java diff --git a/platform-data-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-data-api/src/main/resources/spring/applicationContext-quartz.xml new file mode 100644 index 0000000..619c9e9 --- /dev/null +++ b/platform-data-api/src/main/resources/spring/applicationContext-quartz.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index f18d28b..c5c3022 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -347,7 +347,7 @@ public class BabyCheckFacade { } else { - base.setHighRisk("正常"); + base.setHighRisk("健康"); } } } 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 0758da8..aa9b218 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.SmsConfigRequest; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.utils.ConfigTask; import com.lyms.platform.permission.model.Departments; import com.lyms.platform.permission.model.DepartmentsQuery; import com.lyms.platform.permission.model.Organization; @@ -54,37 +55,7 @@ public class SmsConfigFacade { SmsConfigModel model = getSmsConfigModel(request); model.setModified(new Date()); - List> resultServices = new ArrayList<>(); - - List> allServices = SmsServiceEnums.getSmsServiceLeaf(); - List> paramServices = request.getSmsService(); - - resultServices.addAll(paramServices); - for (Map all : allServices) - { - String id = String.valueOf(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); - } - } - - + new Thread(new ConfigTask(request.getSmsService(),request.getHospitalId())).start(); smsConfigService.updateSmsConfig(model, request.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Config.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Config.java new file mode 100644 index 0000000..01af066 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Config.java @@ -0,0 +1,26 @@ +package com.lyms.platform.operate.web.result; + +/** + * Created by Administrator on 2016/8/9. + */ +public class Config { + + private String key; + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ConfigTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ConfigTask.java new file mode 100644 index 0000000..26f5cb1 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ConfigTask.java @@ -0,0 +1,72 @@ +package com.lyms.platform.operate.web.utils; + +import com.lyms.platform.common.enums.SmsServiceEnums; +import com.lyms.platform.operate.web.result.Config; +import org.apache.commons.collections.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Created by Administrator on 2016/8/9. + */ +public class ConfigTask implements Runnable { + private List> paramServices; + private String hid; + public ConfigTask(List> paramServices,String hid) + { + this.paramServices = paramServices; + this.hid = hid; + } + + @Override + public void run() { + List resultServices = new ArrayList<>(); + + List> allServices = SmsServiceEnums.getSmsServiceLeaf(); + + if (CollectionUtils.isNotEmpty(paramServices)) + { + for (Map start : paramServices) + { + Config config = new Config(); + Set keys = start.keySet(); + for(String key : keys) + { + config.setKey(key); + config.setValue(start.get(key)); + } + resultServices.add(config); + } + } + + for (Map all : allServices) + { + String id = String.valueOf(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) + { + Config config = new Config(); + config.setKey(id); + config.setValue("false"); + resultServices.add(config); + } + } + + MessageCenterService.serviceConfig(resultServices,hid); + } +} 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 index bd8cbc3..1b807b4 100644 --- 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 @@ -6,6 +6,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.MessageListRequest; +import com.lyms.platform.operate.web.result.Config; import java.util.List; import java.util.Map; @@ -23,7 +24,7 @@ public class MessageCenterService { * @param hid * @return */ - public static boolean serviceConfig(List> configs,String hid) + public static boolean serviceConfig(List configs,String hid) { String json = JsonUtil.obj2JsonString(configs); String result = HttpRequest.sendPost(CENTER_BASE_URL+"serviceConfig/{"+hid+"}", json, CENTER_TOKEN); -- 1.8.3.1