shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-04-27 02:27:40 +08:00
parent 70804fc71b
commit d46a366e7d
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/SettingAppController.java
View File

@@ -77,13 +77,13 @@ public class SettingAppController {
} }
@GetMapping("/areaCode/list") // @GetMapping("/areaCode/list")
@Operation(summary = "获取省市区编码接口") // @Operation(summary = "获取省市区编码接口")
@Log(title = "获取省市区编码接口", businessType = BusinessType.OTHER, isSaveDb = false) // @Log(title = "获取省市区编码接口", businessType = BusinessType.OTHER, isSaveDb = false)
public R<List<AreaCode>> listAreaCode(AreaCodeQuery query){ // public R<List<AreaCode>> listAreaCode(AreaCodeQuery query){
List<AreaCode> list = areaCodeService.listAreaCode(query); // List<AreaCode> list = areaCodeService.listAreaCode(query);
return R.ok(list); // return R.ok(list);
} // }
@GetMapping("/areaCode/tree") @GetMapping("/areaCode/tree")
@Operation(summary = "获取所有省市区编码") @Operation(summary = "获取所有省市区编码")

15
ruoyi-xq/src/main/java/com/ruoyi/xq/domain/AreaCode.java
View File

@@ -55,4 +55,19 @@ public class AreaCode implements Serializable {
*/ */
private BigDecimal latitude; private BigDecimal latitude;
public Integer getCityCode(){
if("city".equals(this.level)){
return this.code;
}
return pcode;
}
public String getCityName(){
if("city".equals(this.level)){
return this.name;
}
return pname;
}
} }

4
ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java
View File

@@ -71,8 +71,8 @@ public class JobManager {
if(areaCode != null){ if(areaCode != null){
updateFlag = true; updateFlag = true;
update.setResidenceName(areaCode.getFullname()); update.setResidenceName(areaCode.getFullname());
update.setResidenceCityCode(areaCode.getPcode()); update.setResidenceCityCode(areaCode.getCityCode());
update.setResidenceCityName(areaCode.getPname()); update.setResidenceCityName(areaCode.getCityName());
} }
} }
if(updateFlag){ if(updateFlag){

4
ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
View File

@@ -150,8 +150,8 @@ public class CurrentUserManager {
AreaCode areaCode = areaCodeService.getById(req.getResidenceCode()); AreaCode areaCode = areaCodeService.getById(req.getResidenceCode());
updateUser.setResidenceCode(req.getResidenceCode()); updateUser.setResidenceCode(req.getResidenceCode());
updateUser.setResidenceName(areaCode.getName()); updateUser.setResidenceName(areaCode.getName());
updateUser.setResidenceCityCode(areaCode.getPcode()); updateUser.setResidenceCityCode(areaCode.getCityCode());
updateUser.setResidenceCityName(areaCode.getPname()); updateUser.setResidenceCityName(areaCode.getCityName());
} }
if(req.getHeight() != null){ if(req.getHeight() != null){
updateUser.setHeight(req.getHeight()); updateUser.setHeight(req.getHeight());

4
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
View File

@@ -375,8 +375,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
AreaCode areaCode = areaCodeService.getById(updateUserReq.getResidenceCode()); AreaCode areaCode = areaCodeService.getById(updateUserReq.getResidenceCode());
updateUser.setResidenceCode(updateUserReq.getResidenceCode()); updateUser.setResidenceCode(updateUserReq.getResidenceCode());
updateUser.setResidenceName(areaCode.getFullname()); updateUser.setResidenceName(areaCode.getFullname());
updateUser.setResidenceCityCode(areaCode.getPcode()); updateUser.setResidenceCityCode(areaCode.getCityCode());
updateUser.setResidenceCityName(areaCode.getPname()); updateUser.setResidenceCityName(areaCode.getCityName());
} }
if(updateUserReq.getAddressCode() != null){ if(updateUserReq.getAddressCode() != null){
AreaCode areaCode = areaCodeService.getById(updateUserReq.getAddressCode()); AreaCode areaCode = areaCodeService.getById(updateUserReq.getAddressCode());