From 12e9108e6a410ca31b3706726c121840a62e5dff Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 02 八月 2023 18:37:41 +0800
Subject: [PATCH] 修复了开始上课的首页的课程列表中的数据bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 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 5aea2e2..aa1e0db 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
@@ -13,12 +13,14 @@
import com.dsh.course.feignClient.competition.model.GetPeopleQuery;
import com.dsh.course.feignClient.competition.model.ListQuery;
import com.dsh.course.feignClient.competition.model.Participant;
+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.TStore;
+import com.dsh.guns.modular.system.model.User;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +30,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -55,6 +59,9 @@
@Autowired
private ICityService cityService;
+ @Resource
+ private UserMapper userMapper;
+
/**
* 跳转到车辆管理首页
@@ -80,11 +87,16 @@
/**
* 跳转到修改车辆管理
*/
- @RequestMapping("/tCompetition_update/{id}")
- public String tCarUpdate(@PathVariable Integer id, Model model) {
- Competition competition = competitionClient.queryById(id);
- model.addAttribute("item",competition);
- return PREFIX + "tCompetition_edit.html";
+ @RequestMapping("/tCity_update/{id}")
+ public String tCityUpdate(@PathVariable Integer id, Model model) {
+ TCityManager byId = cityClient.getById(id);
+ model.addAttribute("item",byId);
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getProvinceCode()));
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId() ));
+ model.addAttribute("list1",list1);
+ return PREFIX + "tCity_edit.html";
}
@@ -109,7 +121,23 @@
manager.setProvince(one.getName());
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, manager.getCityCode()));
manager.setCity(one1.getName());
- cityClient.add(manager);
+ List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getAccount, manager.getPhone()));
+ if(users.size()>0){
+ return "5001";
+ }
+ Integer add = cityClient.add(manager);
+ User user = new User();
+ user.setPhone(manager.getPhone());
+ user.setAccount(manager.getPhone());
+ user.setRoleid(manager.getPhone());
+ user.setRoleid("3");
+ user.setName(manager.getName());
+ user.setPassword(SecureUtil.md5("a123456"));
+ user.setCreatetime(new Date());
+ user.setObjectId(add);
+ user.setObjectType(2);
+ userMapper.insert(user);
+
return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
@@ -118,10 +146,26 @@
}
@RequestMapping(value = "/update")
- public Object update(Competition competition) {
+ @ResponseBody
+ public Object update(TCityManager manager) {
try {
- competitionClient.update(competition);
- return SUCCESS_TIP;
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, manager.getProvinceCode()));
+ manager.setProvince(one.getName());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, manager.getCityCode()));
+ manager.setCity(one1.getName());
+ List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getAccount, manager.getPhone()).ne(User::getObjectId,manager.getId()));
+ if(users.size()>0){
+ return "5001";
+ }
+
+ User user = userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getObjectType, 2).eq(User::getObjectId, manager.getId()));
+ user.setAccount(manager.getPhone());
+ user.setName(manager.getName());
+ user.setPhone(manager.getPhone());
+ userMapper.updateById(user);
+
+ cityClient.update(manager);
+ return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
return ERROR;
@@ -151,6 +195,41 @@
}
}
+ @RequestMapping(value = "/freeze")
+ @ResponseBody
+ public Object freeze(Integer id) {
+ try {
+ cityClient.freeze(id);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+ @RequestMapping(value = "/unfreeze")
+ @ResponseBody
+ public Object unfreeze(Integer id) {
+ try {
+ cityClient.unfreeze(id);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+ @RequestMapping(value = "/pwd")
+ @ResponseBody
+ public Object pwd(Integer id) {
+ try {
+ userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getObjectId,id).eq(User::getObjectType,2));
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
@RequestMapping(value = "/getPeopleFromId")
public Object getPeopleFromId(Integer id,Integer state) {
try {
--
Gitblit v1.7.1