From a1557f3f07287c86e8a4a408f03ba19993e5a48c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 09:41:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 963fbd3..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
@@ -11,12 +11,15 @@
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;
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;
@@ -108,6 +111,20 @@
}
+ @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")
@ResponseBody
public Object list(TCityManager manager) {
@@ -172,7 +189,9 @@
@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::getCode, oneId));
QueryWrapper<TCity> query = new QueryWrapper<TCity>().eq("parent_id", one.getId());
--
Gitblit v1.7.1