shiyang / regional-platform

Download as
Browse Code »

Commit 44745da82c6e890b2f5afa76d12946c7b21e4c2d

Authored by jiangjiazhi
1 parent 01e5029350
Exists in master and in 1 other branch nobuildprocess

增加退出登录接口

Showing 1 changed file with 40 additions and 31 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java View file @ 44745da
... ... @@ -14,64 +14,73 @@
14 14 /**
15 15 * Created by Administrator on 2016/5/1 0001.
16 16 */
17   -public final class CommonsHelper {
  17 +public final class CommonsHelper {
18 18  
19 19  
20   -
21   -
22   - public static Object convterToMap(BasicConfig basicConfig,boolean sample){
23   - if(sample&&null!=basicConfig){
24   - Map<String,Object> map = new HashMap<>();
25   - map.put("id",basicConfig.getId());
26   - map.put("name",basicConfig.getName());
27   - map.put("code",basicConfig.getCode());
  20 + public static Object convterToMap(BasicConfig basicConfig, boolean sample) {
  21 + if (sample && null != basicConfig) {
  22 + Map<String, Object> map = new HashMap<>();
  23 + map.put("id", basicConfig.getId());
  24 + map.put("name", basicConfig.getName());
  25 + map.put("code", basicConfig.getCode());
28 26 return map;
29 27 }
30   - return basicConfig;
  28 + return basicConfig;
31 29 }
32 30  
33   - public static String getFullAddress(String provinceId,
34   - String cityId,
35   - String areaId,
36   - String address,BasicConfigService basicConfigService){
37   - StringBuilder sb= new StringBuilder();
38   - if(StringUtils.isNotEmpty(provinceId)){
39   - sb.append(basicConfigService.getOneBasicConfigById(provinceId).getName());
  31 + public static String getFullAddress(String provinceId,
  32 + String cityId,
  33 + String areaId,
  34 + String address, BasicConfigService basicConfigService) {
  35 + StringBuilder sb = new StringBuilder();
  36 + if (StringUtils.isNotEmpty(provinceId)) {
  37 + sb.append(getName1(provinceId,basicConfigService));
40 38 }
41   - if(StringUtils.isNotEmpty(cityId)){
42   - sb.append(basicConfigService.getOneBasicConfigById(cityId).getName());
  39 + if (StringUtils.isNotEmpty(cityId)) {
  40 + sb.append(getName1(cityId,basicConfigService));
43 41 }
44   - if(StringUtils.isNotEmpty(areaId)){
45   - sb.append(basicConfigService.getOneBasicConfigById(areaId).getName());
  42 + if (StringUtils.isNotEmpty(areaId)) {
  43 + sb.append(getName1(areaId,basicConfigService));
46 44 }
47   - sb.append(address);
  45 + if (StringUtils.isNotEmpty(address)) {
  46 + sb.append(address);
  47 + }
48 48 return sb.toString();
49 49 }
50 50  
  51 + private static String getName1(String id, BasicConfigService basicConfigService) {
  52 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
  53 + if (basicConfig != null) {
  54 + return basicConfig.getName();
  55 + }
  56 + return "";
  57 + }
  58 +
51 59 /**
52 60 * 填充地址信息
53 61 *
54 62 * @param puerperaModel
55 63 * @return
56 64 */
57   - public static Address fullAddress(Patients puerperaModel,BasicConfigService basicConfigService) {
  65 + public static Address fullAddress(Patients puerperaModel, BasicConfigService basicConfigService) {
58 66 Address address = new Address();
59   - address.setArea(getName(puerperaModel.getAreaId(),basicConfigService));
60   - address.setCity(getName(puerperaModel.getCityId(),basicConfigService));
61   - address.setProvince(getName(puerperaModel.getProvinceId(),basicConfigService));
  67 + address.setArea(getName(puerperaModel.getAreaId(), basicConfigService));
  68 + address.setCity(getName(puerperaModel.getCityId(), basicConfigService));
  69 + address.setProvince(getName(puerperaModel.getProvinceId(), basicConfigService));
62 70 address.setAddress(puerperaModel.getAddress());
63 71 return address;
64 72 }
65 73  
66   - public static Address fullAddress(BabyModel puerperaModel,BasicConfigService basicConfigService) {
  74 + public static Address fullAddress(BabyModel puerperaModel, BasicConfigService basicConfigService) {
67 75 Address address = new Address();
68   - address.setArea(getName(puerperaModel.getAreaId(),basicConfigService));
69   - address.setCity(getName(puerperaModel.getCityId(),basicConfigService));
70   - address.setProvince(getName(puerperaModel.getProvinceId(),basicConfigService));
  76 + address.setArea(getName(puerperaModel.getAreaId(), basicConfigService));
  77 + address.setCity(getName(puerperaModel.getCityId(), basicConfigService));
  78 + address.setProvince(getName(puerperaModel.getProvinceId(), basicConfigService));
71 79 address.setAddress(puerperaModel.getAddress());
72 80 return address;
73 81 }
74   - private static AddressInner getName(String id,BasicConfigService basicConfigService) {
  82 +
  83 + private static AddressInner getName(String id, BasicConfigService basicConfigService) {
75 84 AddressInner addressInner = new AddressInner();
76 85 addressInner.setId(id);
77 86 BasicConfig config = basicConfigService.getOneBasicConfigById(id);