Browse Source

feat:郑多燕需求

caoliqin 1 week ago
parent
commit
2ff2811faa

+ 4 - 1
fs-admin/src/main/java/com/fs/his/controller/FsUserAddressController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysRole;
 import com.fs.common.core.domain.entity.SysUser;
+import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.SecurityUtils;
 import com.fs.his.dto.AddressInfoDTO;
@@ -118,7 +119,9 @@ public class FsUserAddressController extends BaseController
     public AjaxResult getInfo(@PathVariable("addressId") Long addressId)
     {
         FsUserAddress fsUserAddress = fsUserAddressService.selectFsUserAddressByAddressId(addressId);
-        fsUserAddress.setPhone(ParseUtils.parsePhone(fsUserAddress.getPhone()));
+        if(!CloudHostUtils.hasCloudHostName("广州郑多燕")) {
+            fsUserAddress.setPhone(ParseUtils.parsePhone(fsUserAddress.getPhone()));
+        }
         fsUserAddress.setDetail(ParseUtils.parseAddress(fsUserAddress.getDetail()));
         return AjaxResult.success(fsUserAddress);
     }

+ 12 - 8
fs-admin/src/main/java/com/fs/his/controller/FsUserController.java

@@ -10,6 +10,7 @@ import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.core.domain.entity.SysRole;
 import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.exception.CustomException;
+import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.SecurityUtils;
 import com.fs.common.utils.StringUtils;
@@ -253,7 +254,9 @@ public class FsUserController extends BaseController
     public AjaxResult getInfo(@PathVariable("userId") Long userId)
     {
         FsUser fsUser = fsUserService.selectFsUserByUserId(userId);
-        fsUser.setPhone(decryptAutoPhoneMk(fsUser.getPhone()));
+        if(!CloudHostUtils.hasCloudHostName("广州郑多燕")) {
+            fsUser.setPhone(decryptAutoPhoneMk(fsUser.getPhone()));
+        }
         return AjaxResult.success(fsUser);
     }
 
@@ -262,16 +265,17 @@ public class FsUserController extends BaseController
     {
 
         List<FsUserAddress> fsUserAddresses = fsUserService.selectFsUserAddressByUserId(userId);
-        for (FsUserAddress fsUserAddress : fsUserAddresses) {
-            if (fsUserAddress.getPhone()!=null&&fsUserAddress.getPhone()!=""){
-                if (fsUserAddress.getPhone().length()>11){
-                    fsUserAddress.setPhone(decryptPhoneMk(fsUserAddress.getPhone()));
-                }else {
-                    fsUserAddress.setPhone(fsUserAddress.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+        if(!CloudHostUtils.hasCloudHostName("广州郑多燕")) {
+            for (FsUserAddress fsUserAddress : fsUserAddresses) {
+                if (fsUserAddress.getPhone() != null && fsUserAddress.getPhone() != "") {
+                    if (fsUserAddress.getPhone().length() > 11) {
+                        fsUserAddress.setPhone(decryptPhoneMk(fsUserAddress.getPhone()));
+                    } else {
+                        fsUserAddress.setPhone(fsUserAddress.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                    }
                 }
             }
         }
-
         return AjaxResult.success(fsUserAddresses);
     }
 

+ 4 - 1
fs-company/src/main/java/com/fs/company/controller/store/FsUserController.java

@@ -8,6 +8,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
@@ -187,7 +188,9 @@ public class FsUserController extends BaseController
     public AjaxResult getInfo(@PathVariable("userId") Long userId)
     {
         FsUser fsUser = fsUserService.selectFsUserByUserId(userId);
-        fsUser.setPhone(decryptAutoPhoneMk(fsUser.getPhone()));
+        if(!CloudHostUtils.hasCloudHostName("广州郑多燕")) {
+            fsUser.setPhone(decryptAutoPhoneMk(fsUser.getPhone()));
+        }
         return AjaxResult.success(fsUser);
     }
 

+ 7 - 4
fs-service/src/main/java/com/fs/his/service/impl/FsUserAddressServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.Map;
 
 import cn.hutool.http.HttpUtil;
 import com.fs.common.exception.CustomException;
+import com.fs.common.utils.CloudHostUtils;
 import com.fs.common.utils.DateUtils;
 import com.fs.his.config.FsSysConfig;
 import com.fs.his.param.FsStoreOrderParam;
@@ -84,10 +85,12 @@ public class FsUserAddressServiceImpl implements IFsUserAddressService
     public int updateFsUserAddress(FsUserAddress fsUserAddress)
     {
         fsUserAddress.setUpdateTime(DateUtils.getNowDate());
-        if (fsUserAddress.getPhone()!=null&&fsUserAddress.getPhone().length()==11&&fsUserAddress.getPhone().matches("\\d+")){
-            fsUserAddress.setPhone(encryptPhone(fsUserAddress.getPhone()));
-        }else {
-            fsUserAddress.setPhone(null);
+        if(!CloudHostUtils.hasCloudHostName("广州郑多燕")) {
+            if (fsUserAddress.getPhone() != null && fsUserAddress.getPhone().length() == 11 && fsUserAddress.getPhone().matches("\\d+")) {
+                fsUserAddress.setPhone(encryptPhone(fsUserAddress.getPhone()));
+            } else {
+                fsUserAddress.setPhone(null);
+            }
         }
         return fsUserAddressMapper.updateFsUserAddress(fsUserAddress);
     }