From 082b7025e5654be2d38a7caccfe714937217410b Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期二, 07 十一月 2023 14:22:33 +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..d27750d 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,8 +19,10 @@ 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.model.dto.SelectDto; import com.dsh.guns.modular.system.service.ICityService; import com.dsh.guns.modular.system.service.IStoreService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +36,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** @@ -61,9 +63,6 @@ @Resource private UserMapper userMapper; - - @Autowired - private CourseClient courseClient; /** @@ -111,6 +110,19 @@ Page<TCityManager> competitions = cityClient.list(listQuery); return super.packForBT(competitions); } + + + @Resource + private CourseClient courseClient; + @RequestMapping(value = "/timeChange") + @ResponseBody + public List<SelectDto> timeChange(Integer oneId) { + List<SelectDto> 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