From 91a4924f00f11336405c8dc94d9184e5628032b7 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 27 Jul 2016 16:55:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/SmsConfigModel.java | 10 +++ .../web/controller/SmsConfigController.java | 15 +++- .../operate/web/facade/SmsConfigFacade.java | 86 ++++++++++++---------- 3 files changed, 72 insertions(+), 39 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java index 00dab83..3352cc8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java @@ -50,6 +50,16 @@ public class SmsConfigModel extends BaseModel { //高危配置 private String highConfig; + //备注 + private String remark; + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } public String getHighConfig() { return highConfig; 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 e3cfb8c..2d1705a 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 @@ -123,8 +123,19 @@ public class SmsConfigController extends BaseController { */ @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); + public BaseResponse addOrUpdateHospitalConfig( + @RequestParam(required = true) String hospitalName, + @RequestParam(required = false) String shortCode, + @RequestParam(required = true) String provinceId, + @RequestParam(required = true) String cityId, + @RequestParam(required = true) String areaId, + @RequestParam(required = true) String address, + @RequestParam(required = true) String remark, + @RequestParam(required = true) String hid, + @RequestParam(required = true) String highConfig, + @RequestParam(required = true) Integer status) { + return smsConfigFacade.addOrUpdateHospitalConfig(hospitalName,shortCode,provinceId,cityId,areaId,address,remark, + hid, highConfig, status); } /** 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 f6039dd..20d1cd2 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 @@ -339,47 +339,51 @@ public class SmsConfigFacade { { hospital.put("hospitalName",org.getName()); 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(); - } - } - + hospital.put("provinceId",provinceId); 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(); - } - } - + hospital.put("cityId",cityId); 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(); - } - } + hospital.put("areaId",areaId); + +// 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 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 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 address = org.getAddress(); - allAddress+=address; - hospital.put("address", allAddress); + hospital.put("address", address); hospital.put("status",org.getStatus() == null ? "" : String.valueOf(org.getStatus())); - hospital.put("remark", ""); + } SmsConfigQuery query = new SmsConfigQuery(); query.setYn(YnEnums.YES.getId()); @@ -391,7 +395,7 @@ public class SmsConfigFacade { if (model != null) { hospital.put("highConfig",model.getHighConfig()); - + hospital.put("remark", model.getRemark()); } } @@ -409,7 +413,8 @@ public class SmsConfigFacade { * @param status * @return */ - public BaseResponse addOrUpdateHospitalConfig(String hid, String highConfig, Integer status) { + public BaseResponse addOrUpdateHospitalConfig(String hospitalName,String shortCode,String provinceId,String cityId,String areaId, + String address,String remark,String hid, String highConfig, Integer status) { SmsConfigQuery query = new SmsConfigQuery(); query.setYn(YnEnums.YES.getId()); query.setHospitalId(hid); @@ -432,11 +437,18 @@ public class SmsConfigFacade { model.setHospitalId(hid); model.setYn(YnEnums.YES.getId()); model.setHighConfig(highConfig); + model.setRemark(remark); smsConfigService.addSmsConfig(model); } Organization obj = new Organization(); obj.setId(Integer.parseInt(hid)); obj.setStatus(status); + obj.setName(hospitalName); + obj.setShortCode(shortCode); + obj.setProvinceId(provinceId); + obj.setCityId(cityId); + obj.setAreaId(areaId); + obj.setAddress(address); organizationService.updateOrganization(obj); BaseResponse objectResponse = new BaseResponse(); -- 1.8.3.1