From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java | 45 ++++++---------------------------------------
1 files changed, 6 insertions(+), 39 deletions(-)
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 fc37553..7f0e88c 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
@@ -3,6 +3,7 @@
import cn.hutool.crypto.SecureUtil;
import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.City;
import com.dsh.course.feignClient.account.CityClient;
@@ -10,8 +11,6 @@
import com.dsh.course.feignClient.account.model.TCityManager;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.*;
-import com.dsh.course.feignClient.course.CourseClient;
-import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.SuccessTip;
@@ -33,7 +32,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -61,9 +59,6 @@
@Resource
private UserMapper userMapper;
-
- @Autowired
- private CourseClient courseClient;
/**
@@ -177,41 +172,13 @@
@RequestMapping(value = "/onChange")
@ResponseBody
public Object onChange(Integer oneId) {
+ if (oneId == null) {
+ return null;
+ }
try {
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
- return cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
- }catch (Exception e){
- e.printStackTrace();
- return ERROR;
- }
- }
- @RequestMapping(value = "/storeChange")
- @ResponseBody
- public Object storeChange(Integer oneId) {
- try {
- return storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getCityCode, oneId));
- }catch (Exception e){
- e.printStackTrace();
- return ERROR;
- }
- }
- @RequestMapping(value = "/packageChange")
- @ResponseBody
- public Object packageChange(Integer oneId) {
- try {
- List<TCoursePackage> list = courseClient.queryByTypeId(oneId);
- return list;
- }catch (Exception e){
- e.printStackTrace();
- return ERROR;
- }
- }
- @RequestMapping(value = "/timeChange")
- @ResponseBody
- public Object timeChange(Integer oneId) {
- try {
- List<Map<String,Object>> list = courseClient.queryByConfigId(oneId);
- return list;
+ QueryWrapper<TCity> query = new QueryWrapper<TCity>().eq("parent_id", one.getId());
+ return cityService.list(query);
}catch (Exception e){
e.printStackTrace();
return ERROR;
--
Gitblit v1.7.1