From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java | 44 ++++----------------------------------------
1 files changed, 4 insertions(+), 40 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 9d33d8f..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
@@ -11,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;
@@ -34,7 +32,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -62,9 +59,6 @@
@Resource
private UserMapper userMapper;
-
- @Autowired
- private CourseClient courseClient;
/**
@@ -178,43 +172,13 @@
@RequestMapping(value = "/onChange")
@ResponseBody
public Object onChange(Integer oneId) {
- if (oneId == null) return null;
+ if (oneId == null) {
+ return null;
+ }
try {
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, oneId));
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
QueryWrapper<TCity> query = new QueryWrapper<TCity>().eq("parent_id", one.getId());
return cityService.list(query);
- }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;
}catch (Exception e){
e.printStackTrace();
return ERROR;
--
Gitblit v1.7.1