From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java
index c34017c..78ffb22 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java
@@ -40,26 +40,26 @@
@PostMapping("/base/city/list")
- public Page<TCityManager> list(@RequestBody CityListQuery listQuery){
+ public Page<TCityManager> list(@RequestBody CityListQuery listQuery) {
try {
Page<TCityManager> page = new Page<>(listQuery.getOffset(), listQuery.getLimit());
LambdaQueryWrapper<TCityManager> tCityManagerLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tCityManagerLambdaQueryWrapper.ne(TCityManager::getState,3);
- if(ToolUtil.isNotEmpty(listQuery.getProvinceCode())){
- tCityManagerLambdaQueryWrapper.eq(TCityManager::getProvinceCode,listQuery.getProvinceCode());
+ tCityManagerLambdaQueryWrapper.ne(TCityManager::getState, 3);
+ if (ToolUtil.isNotEmpty(listQuery.getProvinceCode())) {
+ tCityManagerLambdaQueryWrapper.eq(TCityManager::getProvinceCode, listQuery.getProvinceCode());
}
- if(ToolUtil.isNotEmpty(listQuery.getCityCode())){
- tCityManagerLambdaQueryWrapper.eq(TCityManager::getCityCode,listQuery.getCityCode());
+ if (ToolUtil.isNotEmpty(listQuery.getCityCode())) {
+ tCityManagerLambdaQueryWrapper.eq(TCityManager::getCityCode, listQuery.getCityCode());
}
- if(ToolUtil.isNotEmpty(listQuery.getName())){
- tCityManagerLambdaQueryWrapper.like(TCityManager::getName,listQuery.getName());
+ if (ToolUtil.isNotEmpty(listQuery.getName())) {
+ tCityManagerLambdaQueryWrapper.like(TCityManager::getName, listQuery.getName());
}
- if(ToolUtil.isNotEmpty(listQuery.getPhone())){
- tCityManagerLambdaQueryWrapper.like(TCityManager::getPhone,listQuery.getPhone());
+ if (ToolUtil.isNotEmpty(listQuery.getPhone())) {
+ tCityManagerLambdaQueryWrapper.like(TCityManager::getPhone, listQuery.getPhone());
}
Page<TCityManager> page1 = cityService.page(page, tCityManagerLambdaQueryWrapper);
return page1;
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -67,11 +67,11 @@
@PostMapping("/base/city/add")
- public Integer add(@RequestBody TCityManager manager){
+ public Integer add(@RequestBody TCityManager manager) {
try {
cityService.save(manager);
return manager.getId();
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -79,10 +79,10 @@
@PostMapping("/base/city/getById")
- public TCityManager getById(@RequestBody Integer id){
+ public TCityManager getById(@RequestBody Integer id) {
try {
return cityService.getById(id);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -90,32 +90,33 @@
@PostMapping("/base/city/update")
- public void update(@RequestBody TCityManager manager){
+ public void update(@RequestBody TCityManager manager) {
try {
- cityService.updateById(manager);
- }catch (Exception e){
+ cityService.updateById(manager);
+ } catch (Exception e) {
e.printStackTrace();
}
}
@PostMapping("/base/city/freeze")
- public void freeze(@RequestBody Integer id){
+ public void freeze(@RequestBody Integer id) {
try {
TCityManager byId = cityService.getById(id);
byId.setState(2);
cityService.updateById(byId);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
+
@PostMapping("/base/city/unfreeze")
- public void unfreeze(@RequestBody Integer id){
+ public void unfreeze(@RequestBody Integer id) {
try {
TCityManager byId = cityService.getById(id);
byId.setState(1);
cityService.updateById(byId);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
--
Gitblit v1.7.1