From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 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..20c6822 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;
@@ -18,6 +19,7 @@
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.TCity;
+import com.dsh.guns.modular.system.model.TCourse;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.model.User;
import com.dsh.guns.modular.system.service.ICityService;
@@ -33,7 +35,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -61,9 +62,6 @@
@Resource
private UserMapper userMapper;
-
- @Autowired
- private CourseClient courseClient;
/**
@@ -111,6 +109,20 @@
Page<TCityManager> competitions = cityClient.list(listQuery);
return super.packForBT(competitions);
}
+
+
+ @Resource
+ private CourseClient courseClient;
+ @RequestMapping(value = "/timeChange")
+ @ResponseBody
+ public List<Integer> timeChange(Integer oneId) {
+
+ List<Integer> integerList = courseClient.timeChange(oneId);
+ return integerList ;
+ }
+
+
+
@RequestMapping(value = "/add")
@@ -177,41 +189,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