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 dde0016..1477bab 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.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.SendTimeEnums; import com.lyms.platform.common.enums.SmsServiceEnums; import com.lyms.platform.common.result.BaseObjectResponse; @@ -14,6 +15,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -113,4 +116,33 @@ public class SmsConfigController extends BaseController { public BaseResponse queryHospitalConfig(@PathVariable("hid") String hid) { return smsConfigFacade.queryHospitalConfig(hid); } + + /** + * 更新医院基础配置查询医院 + * @return + */ + @RequestMapping(value = "/addOrUpdateHospitalConfig", method = RequestMethod.PUT) + @ResponseBody + public BaseResponse addOrUpdateHospitalConfig(@RequestParam(required = true) String hid,@RequestParam(required = true) String highConfig,@RequestParam(required = true) Integer status) { + return smsConfigFacade.addOrUpdateHospitalConfig(hid, highConfig, status); + } + + /** + * 查询出高危配置库 + * @return + */ + @RequestMapping(value = "/queryHighConfigLib", method = RequestMethod.GET) + @ResponseBody + public BaseResponse updateHospitalConfig() { + List highLibs = new ArrayList(); + + Map map = new HashMap(); + map.put("1","测试高危版"); + highLibs.add(map); + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(highLibs); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } 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 dba8a72..c101b1f 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 @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.JsonUtil; 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.permission.model.Departments; @@ -40,6 +41,9 @@ public class SmsConfigFacade { @Autowired private OrganizationService organizationService; + @Autowired + private BasicConfigService basicConfigService; + /** * 更新短信服务配置 * @param request @@ -223,7 +227,7 @@ public class SmsConfigFacade { public BaseResponse getDeptPrefix(String hid) { BaseObjectResponse objectResponse = new BaseObjectResponse(); - objectResponse.setData(querDeptPrefixByHid( hid)); + objectResponse.setData(querDeptPrefixByHid(hid)); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); @@ -337,25 +341,42 @@ public class SmsConfigFacade { hospital.put("shortCode",org.getShortCode()); String allAddress = ""; String provinceId = org.getProvinceId(); + BasicConfigQuery query = new BasicConfigQuery(); + query.setYn(YnEnums.YES.getId()); if (StringUtils.isNotEmpty(provinceId)) { - + query.setId(provinceId); + List configList = basicConfigService.queryBasicConfig(query); + if (CollectionUtils.isNotEmpty(configList)) + { + allAddress+=configList.get(0).getName(); + } } String areaId = org.getAreaId(); if (StringUtils.isNotEmpty(provinceId)) { - + query.setId(areaId); + List configList = basicConfigService.queryBasicConfig(query); + if (CollectionUtils.isNotEmpty(configList)) + { + allAddress+=configList.get(0).getName(); + } } String cityId = org.getCityId(); if (StringUtils.isNotEmpty(provinceId)) { - + query.setId(cityId); + List configList = basicConfigService.queryBasicConfig(query); + if (CollectionUtils.isNotEmpty(configList)) + { + allAddress+=configList.get(0).getName(); + } } String address = org.getAddress(); allAddress+=address; - hospital.put("address",allAddress); + hospital.put("address", allAddress); - hospital.put("remark",""); + hospital.put("remark", ""); } SmsConfigQuery query = new SmsConfigQuery(); query.setYn(YnEnums.YES.getId()); @@ -377,4 +398,44 @@ public class SmsConfigFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + /** + * 更新医院基础配置 + * @param hid + * @param highConfig + * @param status + * @return + */ + public BaseResponse addOrUpdateHospitalConfig(String hid, String highConfig, Integer status) { + SmsConfigQuery query = new SmsConfigQuery(); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(hid); + List smsmodels = smsConfigService.querySmsConfigByHid(query); + boolean isExist = false; + if (CollectionUtils.isNotEmpty(smsmodels)) + { + SmsConfigModel model = smsmodels.get(0); + if (model != null && StringUtils.isNotEmpty(model.getId())) + { + model.setHighConfig(highConfig); + model.setStatus(status); + smsConfigService.updateSmsConfig(model, model.getId()); + isExist = true; + } + + } + if (!isExist) + { + SmsConfigModel model = new SmsConfigModel(); + model.setHospitalId(hid); + model.setYn(YnEnums.YES.getId()); + model.setHighConfig(highConfig); + model.setStatus(status); + smsConfigService.addSmsConfig(model); + } + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("保存成功"); + return objectResponse; + } } \ No newline at end of file