Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

 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,41 @@
    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;
        }
    }


    @PostMapping("/base/city/add")
    public void add(@RequestBody TCityManager manager){
        try {
            cityService.save(manager);
        }catch (Exception e){
            e.printStackTrace();
        }
    }


}