fix terminal name

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -202,7 +202,7 @@ public class UserService {
         deviceUserVo.setUid(userVo.getId());
         deviceUserVo.setEid(userVo.getCode());
         deviceUserVo.setPassword(userVo.getPassword());
-        deviceUserVo.setName(userVo.getCampusName() + userVo.getName());
+        deviceUserVo.setName(userVo.getCityName() + userVo.getZoneName() + userVo.getName());
         deviceUserVo.setDeviceCode(deviceVo.getDeviceCode());
         deviceUserVo.setMerchantId(userVo.getMerchantId());
         deviceUserVo.setMerchantName(userVo.getMerchantName());

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/Campus.java

@@ -76,7 +76,7 @@ public class Campus implements Serializable {
     public String getName() {
         String pName = ProvinceUtil.get(provinceCode);
         if (pName != null) {
-            return String.format("%s%s%s", pName, cityName, zoneName);
+            return String.format("%s-%s-%s", pName, cityName, zoneName);
         }
         return null;
     }

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalUser.java

@@ -69,6 +69,16 @@ public class TerminalUser implements Serializable {
     private String address;
 
     @Transient
-    private String campusName;
+    private String cityName;
+
+    @Transient
+    private String zoneName;
+
+    @Transient
+    private String provinceName;
+
+    public String getCampusName() {
+        return this.provinceName + this.cityName + this.zoneName;
+    }
 
 }

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/TerminalUserVo.java

@@ -43,5 +43,13 @@ public class TerminalUserVo implements Serializable {
 
     private String address;
 
-    private String campusName;
+    private String cityName;
+
+    private String zoneName;
+
+    private String provinceName;
+
+    public String getCampusName() {
+        return this.provinceName + this.cityName + this.zoneName;
+    }
 }

rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalUserController.java

@@ -3,6 +3,7 @@ package cn.rankin.userservice.controller;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.enums.BaseStatusEnum;
+import cn.rankin.common.utils.util.ProvinceUtil;
 import cn.rankin.data.api.user.dto.TerminalUserDTO;
 import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
 import cn.rankin.common.utils.enums.BaseOrderEnum;
@@ -20,7 +21,6 @@ import cn.rankin.userservice.utils.StudentNumberUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.EnumUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -249,7 +249,9 @@ public class TerminalUserController {
         if (campus != null) {
             terminalUser.setContactName(campus.getContactName());
             terminalUser.setMobile(campus.getMobile());
-            terminalUser.setCampusName(campus.getName());
+            terminalUser.setCityName(campus.getCityName());
+            terminalUser.setZoneName(campus.getZoneName());
+            terminalUser.setProvinceName(ProvinceUtil.get(campus.getProvinceCode()));
         }
 
         if (merchant != null) {
@@ -268,7 +270,9 @@ public class TerminalUserController {
         if (campus != null) {
             terminalUser.setContactName(campus.getContactName());
             terminalUser.setMobile(campus.getMobile());
-            terminalUser.setCampusName(campus.getName());
+            terminalUser.setCityName(campus.getCityName());
+            terminalUser.setZoneName(campus.getZoneName());
+            terminalUser.setProvinceName(ProvinceUtil.get(campus.getProvinceCode()));
         }
 
         Merchant merchant = merchantService.findOne(campus.getMerchantId());
@@ -300,8 +304,10 @@ public class TerminalUserController {
             if (campus != null) {
                 terminalUser.setContactName(campus.getContactName());
                 terminalUser.setMobile(campus.getMobile());
-                terminalUser.setCampusName(campus.getName());
+                terminalUser.setCityName(campus.getCityName());
+                terminalUser.setZoneName(campus.getZoneName());
                 terminalUser.setAddress(campus.getAddress());
+                terminalUser.setProvinceName(ProvinceUtil.get(campus.getProvinceCode()));
             }
 
             Merchant merchant = merchantMap.get(terminalUser.getMerchantId());