From 4405786d87e25dd61e2c7da0a527af82fa3dbd88 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 17:24:22 +0800
Subject: [PATCH] 后台代码删除
---
cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java | 30 ++++++++++
cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java | 3
/dev/null | 11 ---
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java | 2
.idea/workspace.xml | 120 ++++++++++++++++++++-------------------
6 files changed, 96 insertions(+), 72 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 61dd4ce..fb546d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -20,32 +20,15 @@
</component>
<component name="ChangeListManager">
<list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="后台代码删除">
- <change afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/ListQuery.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/page/HttpKit.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/page/Order.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/page/PageFactory.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/page/WafKit.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/page/WafRequestWrapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-account/mb-cloud-account.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/mb-cloud-account.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/CityController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-activity/mb-cloud-activity.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-activity/mb-cloud-activity.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-auth/mb-cloud-auth.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-auth/mb-cloud-auth.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/mb-cloud-competition.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/mb-cloud-competition.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/entity/Competition.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/mb-cloud-course.iml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/mb-cloud-course.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/CompetitionClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/Competition.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/ListQuery.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/core/base/tips/SuccessTip.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/core/base/tips/SuccessTip.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/core/base/tips/Tip.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/core/base/tips/Tip.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/service/impl/CityServiceImpl.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,7 +77,7 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1686656087610" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/cloud-server-account/src/main/resources/mapper" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Global Libraries" />
@@ -107,18 +90,18 @@
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
- <recent name="com.dsh.factory" />
- <recent name="com.dsh.course.feignClient.competition.model" />
- <recent name="com.dsh.competition.feignclient.model" />
- <recent name="com.dsh.course.mapper" />
- <recent name="com.dsh.guns.modular.system.mapper" />
+ <recent name="com.dsh.course.feignClient.account.model" />
+ <recent name="com.dsh.account.mapper" />
+ <recent name="com.dsh.account.service.impl" />
+ <recent name="com.dsh.account.service" />
+ <recent name="com.dsh.account.controller" />
</key>
<key name="CopyFile.RECENT_KEYS">
+ <recent name="F:\code\PlayPai\cloud-server-account\src\main\resources\mapper" />
+ <recent name="F:\code\PlayPai\cloud-server-management\src\main\webapp\WEB-INF\view\system" />
<recent name="F:\code\PlayPai\cloud-server-competition\src\main\java\com\dsh" />
<recent name="F:\code\PlayPai\cloud-server-management\src\main\resources\mapper" />
<recent name="F:\code\PlayPai\cloud-server-management\src\main\webapp\static\modular\system" />
- <recent name="F:\code\PlayPai\cloud-server-management\src\main\webapp\WEB-INF\view\system" />
- <recent name="F:\code\PlayPai\cloud-server-management\src\main\java\com\dsh\course\feignClient" />
</key>
</component>
<component name="RunDashboard">
@@ -128,11 +111,12 @@
</set>
</option>
</component>
- <component name="RunManager" selected="Spring Boot.CompetitionApplication">
+ <component name="RunManager" selected="Spring Boot.AccountApplication">
<configuration name="AccountApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-account" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
<option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -214,7 +198,7 @@
<updated>1686653431962</updated>
<workItem from="1686653433491" duration="2267000" />
<workItem from="1690190039038" duration="16883000" />
- <workItem from="1690333209172" duration="15958000" />
+ <workItem from="1690333209172" duration="23458000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -272,7 +256,21 @@
<option name="project" value="LOCAL" />
<updated>1690341067099</updated>
</task>
- <option name="localTasksCounter" value="9" />
+ <task id="LOCAL-00009" summary="后台代码">
+ <created>1690355617215</created>
+ <option name="number" value="00009" />
+ <option name="presentableId" value="LOCAL-00009" />
+ <option name="project" value="LOCAL" />
+ <updated>1690355617215</updated>
+ </task>
+ <task id="LOCAL-00010" summary="后台代码删除">
+ <created>1690362658673</created>
+ <option name="number" value="00010" />
+ <option name="presentableId" value="LOCAL-00010" />
+ <option name="project" value="LOCAL" />
+ <updated>1690362658673</updated>
+ </task>
+ <option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -291,15 +289,19 @@
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="后台代码删除" />
<MESSAGE value="后台代码" />
- <option name="LAST_COMMIT_MESSAGE" value="后台代码" />
+ <MESSAGE value="后台代码删除" />
+ <option name="LAST_COMMIT_MESSAGE" value="后台代码删除" />
</component>
<component name="WindowStateProjectService">
<state x="590" y="80" key="#<template>_of_Spring_Boot" timestamp="1690338437444">
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state x="590" y="80" key="#<template>_of_Spring_Boot/0.0.1920.1032@0.0.1920.1032" timestamp="1690338437444" />
+ <state x="590" y="0" width="753" height="1032" key="#AccountApplication" timestamp="1690363440283">
+ <screen x="0" y="0" width="1920" height="1032" />
+ </state>
+ <state x="590" y="0" width="753" height="1032" key="#AccountApplication/0.0.1920.1032@0.0.1920.1032" timestamp="1690363440283" />
<state x="590" y="0" width="753" height="1032" key="#CompetitionApplication" timestamp="1690342021698">
<screen x="0" y="0" width="1920" height="1032" />
</state>
@@ -324,10 +326,10 @@
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state x="674" y="382" width="571" height="274" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1920.1032@0.0.1920.1032" timestamp="1690338847091" />
- <state x="519" y="82" key="CommitChangelistDialog2" timestamp="1690341065602">
+ <state x="519" y="82" key="CommitChangelistDialog2" timestamp="1690362656327">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state x="519" y="82" key="CommitChangelistDialog2/0.0.1920.1032@0.0.1920.1032" timestamp="1690341065602" />
+ <state x="519" y="82" key="CommitChangelistDialog2/0.0.1920.1032@0.0.1920.1032" timestamp="1690362656327" />
<state width="464" height="466" key="DebuggerActiveHint" timestamp="1690354723383">
<screen x="0" y="0" width="1920" height="1032" />
</state>
@@ -336,38 +338,38 @@
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state x="740" y="270" key="FileChooserDialogImpl/0.0.1920.1032@0.0.1920.1032" timestamp="1690249419357" />
- <state width="1293" height="192" key="GridCell.Tab.0.bottom" timestamp="1690354845953">
+ <state width="1293" height="440" key="GridCell.Tab.0.bottom" timestamp="1690363241404">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state width="1293" height="192" key="GridCell.Tab.0.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690354845953" />
- <state width="1293" height="192" key="GridCell.Tab.0.center" timestamp="1690354845953">
+ <state width="1293" height="440" key="GridCell.Tab.0.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
+ <state width="1293" height="440" key="GridCell.Tab.0.center" timestamp="1690363241404">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state width="1293" height="192" key="GridCell.Tab.0.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690354845953" />
- <state width="1293" height="192" key="GridCell.Tab.0.left" timestamp="1690354845952">
+ <state width="1293" height="440" key="GridCell.Tab.0.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
+ <state width="1293" height="440" key="GridCell.Tab.0.left" timestamp="1690363241404">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state width="1293" height="192" key="GridCell.Tab.0.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690354845952" />
- <state width="1293" height="192" key="GridCell.Tab.0.right" timestamp="1690354845953">
+ <state width="1293" height="440" key="GridCell.Tab.0.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
+ <state width="1293" height="440" key="GridCell.Tab.0.right" timestamp="1690363241404">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state width="1293" height="192" key="GridCell.Tab.0.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690354845953" />
- <state width="1293" height="192" key="GridCell.Tab.1.bottom" timestamp="1690354960620">
+ <state width="1293" height="440" key="GridCell.Tab.0.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
+ <state width="1293" height="440" key="GridCell.Tab.1.bottom" timestamp="1690363241405">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state width="1293" height="192" key="GridCell.Tab.1.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690354960620" />
- <state width="1293" height="192" key="GridCell.Tab.1.center" timestamp="1690354960620">
+ <state width="1293" height="440" key="GridCell.Tab.1.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241405" />
+ <state width="1293" height="440" key="GridCell.Tab.1.center" timestamp="1690363241404">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state width="1293" height="192" key="GridCell.Tab.1.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690354960620" />
- <state width="1293" height="192" key="GridCell.Tab.1.left" timestamp="1690354960620">
+ <state width="1293" height="440" key="GridCell.Tab.1.center/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
+ <state width="1293" height="440" key="GridCell.Tab.1.left" timestamp="1690363241404">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state width="1293" height="192" key="GridCell.Tab.1.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690354960620" />
- <state width="1293" height="192" key="GridCell.Tab.1.right" timestamp="1690354960620">
+ <state width="1293" height="440" key="GridCell.Tab.1.left/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
+ <state width="1293" height="440" key="GridCell.Tab.1.right" timestamp="1690363241404">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state width="1293" height="192" key="GridCell.Tab.1.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690354960620" />
+ <state width="1293" height="440" key="GridCell.Tab.1.right/0.0.1920.1032@0.0.1920.1032" timestamp="1690363241404" />
<state width="1293" height="473" key="GridCell.Tab.2.bottom" timestamp="1690354799499">
<screen x="0" y="0" width="1920" height="1032" />
</state>
@@ -388,10 +390,10 @@
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state x="461" y="160" key="SettingsEditor/0.0.1920.1032@0.0.1920.1032" timestamp="1690191509088" />
- <state x="552" y="248" key="Vcs.Push.Dialog.v2" timestamp="1690341068571">
+ <state x="552" y="248" key="Vcs.Push.Dialog.v2" timestamp="1690362671126">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state x="552" y="248" key="Vcs.Push.Dialog.v2/0.0.1920.1032@0.0.1920.1032" timestamp="1690341068571" />
+ <state x="552" y="248" key="Vcs.Push.Dialog.v2/0.0.1920.1032@0.0.1920.1032" timestamp="1690362671126" />
<state x="92" y="92" width="1736" height="848" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1690340014123">
<screen x="0" y="0" width="1920" height="1032" />
</state>
@@ -400,14 +402,14 @@
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state x="92" y="92" width="1736" height="848" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1920.1032@0.0.1920.1032" timestamp="1690340014123" />
- <state x="754" y="428" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1690354512274">
+ <state x="754" y="428" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1690362660961">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state x="754" y="428" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1032@0.0.1920.1032" timestamp="1690354512274" />
- <state x="661" y="224" width="598" height="584" key="find.popup" timestamp="1690275258905">
+ <state x="754" y="428" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1032@0.0.1920.1032" timestamp="1690362660961" />
+ <state x="661" y="224" width="646" height="584" key="find.popup" timestamp="1690358747900">
<screen x="0" y="0" width="1920" height="1032" />
</state>
- <state x="661" y="224" width="598" height="584" key="find.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1690275258905" />
+ <state x="661" y="224" width="646" height="584" key="find.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1690358747900" />
<state x="623" y="223" width="672" height="678" key="search.everywhere.popup" timestamp="1690338774328">
<screen x="0" y="0" width="1920" height="1032" />
</state>
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..83e4a1e 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,31 @@
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<>();
+ 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;
+ }
+ }
+
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java
index 4c54c97..07e6d3f 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/CityClient.java
@@ -4,10 +4,12 @@
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
@FeignClient("mb-cloud-account")
public interface CityClient {
+ @PostMapping("/base/city/list")
Page<TCityManager> list(CityListQuery listQuery);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java b/cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java
index dd8e9d5..a1ec94e 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/service/ICityService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.course.entity.City;
+import com.dsh.guns.modular.system.model.TCity;
-public interface ICityService extends IService<City> {
+public interface ICityService extends IService<TCity> {
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/impl/CityServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/course/service/impl/CityServiceImpl.java
deleted file mode 100644
index 370d0f6..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/service/impl/CityServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.dsh.course.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.course.entity.City;
-import com.dsh.course.mapper.CityMapper;
-import com.dsh.course.service.ICityService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CityServiceImpl extends ServiceImpl<CityMapper, City> implements ICityService {
-}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
index bd67fac..bd85872 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java
@@ -55,7 +55,7 @@
*/
@RequestMapping("")
public String index(Model model) {
- return PREFIX + "TCompetition.html";
+ return PREFIX + "TCity.html";
}
/**
--
Gitblit v1.7.1