From 3c30fbe42c95bfc5a48768b26c3a3f8e38a7cfdc Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 26 七月 2023 17:42:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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 95a0d21..0208ed9 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
@@ -1,6 +1,10 @@
package com.dsh.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.account.entity.TAppUser;
+import com.dsh.account.entity.TCityManager;
+import com.dsh.account.feignclient.model.CityListQuery;
import com.dsh.account.model.AddAppUserVo;
import com.dsh.account.model.JoinPlayPaiVo;
import com.dsh.account.model.LoginSMSCodeVo;
@@ -35,5 +39,32 @@
private CityService cityService;
+ @PostMapping("/base/city/list")
+ 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());
+ }
+ 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.getPhone())){
+ tCityManagerLambdaQueryWrapper.like(TCityManager::getPhone,listQuery.getPhone());
+ }
+ Page<TCityManager> page1 = cityService.page(page, tCityManagerLambdaQueryWrapper);
+ return page1;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
}
--
Gitblit v1.7.1