|
|
@@ -1,32 +1,21 @@
|
|
|
package com.fs.his.controller;
|
|
|
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.fs.common.core.domain.R;
|
|
|
-import com.fs.common.utils.ParseUtils;
|
|
|
-import com.fs.common.utils.SecurityUtils;
|
|
|
-import com.fs.his.dto.AddressInfoDTO;
|
|
|
-import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.PutMapping;
|
|
|
-import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
import com.fs.common.annotation.Log;
|
|
|
import com.fs.common.core.controller.BaseController;
|
|
|
import com.fs.common.core.domain.AjaxResult;
|
|
|
+import com.fs.common.core.page.TableDataInfo;
|
|
|
import com.fs.common.enums.BusinessType;
|
|
|
+import com.fs.common.utils.SecurityUtils;
|
|
|
+import com.fs.common.utils.poi.ExcelUtil;
|
|
|
import com.fs.his.domain.FsUserAddress;
|
|
|
+import com.fs.his.dto.AddressInfoDTO;
|
|
|
import com.fs.his.service.IFsUserAddressService;
|
|
|
-import com.fs.common.utils.poi.ExcelUtil;
|
|
|
-import com.fs.common.core.page.TableDataInfo;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* 用户地址Controller
|
|
|
@@ -51,8 +40,10 @@ public class FsUserAddressController extends BaseController
|
|
|
startPage();
|
|
|
List<FsUserAddress> list = fsUserAddressService.selectFsUserAddressList(fsUserAddress);
|
|
|
for (FsUserAddress userAddress : list) {
|
|
|
- userAddress.setPhone(decryptAutoPhoneMk(userAddress.getPhone()));
|
|
|
- userAddress.setDetail(ParseUtils.parseAddress(userAddress.getDetail()));
|
|
|
+// userAddress.setPhone(decryptAutoPhoneMk(userAddress.getPhone()));
|
|
|
+ userAddress.setPhone(userAddress.getPhone());
|
|
|
+// userAddress.setDetail(ParseUtils.parseAddress(userAddress.getDetail()));
|
|
|
+ userAddress.setDetail(userAddress.getDetail());
|
|
|
}
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
@@ -87,8 +78,10 @@ public class FsUserAddressController extends BaseController
|
|
|
public AjaxResult getInfo(@PathVariable("addressId") Long addressId)
|
|
|
{
|
|
|
FsUserAddress fsUserAddress = fsUserAddressService.selectFsUserAddressByAddressId(addressId);
|
|
|
- fsUserAddress.setPhone(ParseUtils.parsePhone(fsUserAddress.getPhone()));
|
|
|
- fsUserAddress.setDetail(ParseUtils.parseAddress(fsUserAddress.getDetail()));
|
|
|
+// fsUserAddress.setPhone(ParseUtils.parsePhone(fsUserAddress.getPhone()));
|
|
|
+ fsUserAddress.setPhone(fsUserAddress.getPhone());
|
|
|
+// fsUserAddress.setDetail(ParseUtils.parseAddress(fsUserAddress.getDetail()));
|
|
|
+ fsUserAddress.setDetail(fsUserAddress.getDetail());
|
|
|
return AjaxResult.success(fsUserAddress);
|
|
|
}
|
|
|
|