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/TCompetitionController.java | 274 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 249 insertions(+), 25 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index 337e62d..520b575 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -1,39 +1,48 @@
package com.dsh.guns.modular.system.controller.code;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.dsh.competition.entity.Competition;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.feignClient.competition.CompetitionClient;
+import com.dsh.course.feignClient.competition.model.*;
+import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.core.common.annotion.Permission;
+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.client.competition.CompetitionClient;
-import com.dsh.guns.modular.system.client.competition.model.ListQuery;
+import com.dsh.guns.modular.system.model.TCity;
+import com.dsh.guns.modular.system.model.TOperator;
+import com.dsh.guns.modular.system.model.TOperatorCity;
import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IStoreService;
-import com.dsh.guns.modular.system.warpper.RoleWarpper;
+import com.dsh.guns.modular.system.service.TOperatorCityService;
+import com.dsh.guns.modular.system.service.TOperatorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
- * 菜单控制器
+ * 车辆管理控制器
*
* @author fengshuonan
- * @Date 2017年2月12日21:59:14
+ * @Date 2020-06-05 17:25:12
*/
@Controller
@RequestMapping("/tCompetition")
public class TCompetitionController extends BaseController {
- private static String PREFIX = "/system/tCompetition/";
+ private String PREFIX = "/system/tCompetition/";
@Autowired
private CompetitionClient competitionClient;
@@ -41,53 +50,268 @@
@Autowired
private IStoreService storeService;
+ @Autowired
+ private ICityService cityService;
+
+
+
/**
- * 跳转到菜单列表列表页面
+ * 跳转到车辆管理首页
*/
@RequestMapping("")
public String index(Model model) {
- return PREFIX + "tCompetition.html";
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ Integer objectType = UserExt.getUser().getObjectType();
+ model.addAttribute("type",objectType);
+ return PREFIX + "TCompetition.html";
}
+
+ @Autowired
+ private TOperatorService tOperatorService;
/**
- * 跳转到菜单列表列表页面
+ * 跳转到添加车辆管理
*/
- @RequestMapping(value = "/tCompetition_add")
+ @RequestMapping("/tCompetition_add")
public String tCompetitionAdd(Model model) {
- return PREFIX + "tCompetition_add.html";
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+
+ List<TOperator> list1 = tOperatorService.list();
+ model.addAttribute("yysList",list1);
+ Integer objectType = UserExt.getUser().getObjectType();
+ model.addAttribute("type",objectType);
+ return PREFIX + "TCompetition_add.html";
}
+
/**
- * 跳转到菜单详情列表页面
+ * 跳转到修改车辆管理
*/
- @RequestMapping(value = "/tCompetition_edit/{id}")
- public String tCompetitionEdit(@PathVariable Integer id, Model model) {
- Competition competition = competitionClient.queryById(id);
+ @RequestMapping("/tCompetition_update/{id}")
+ public String tCarUpdate(@PathVariable Integer id, Model model) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ model.addAttribute("objectType",objectType);
+ Competition competition = competitionClient.queryById(id);
+ System.out.println("======competition======"+competition);
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String startTime = formatter.format(competition.getStartTime());
+ model.addAttribute("startTime",startTime);
+ String endTime = formatter.format(competition.getEndTime());
+ model.addAttribute("endTime",endTime);
+ String registerEndTime = formatter.format(competition.getRegisterEndTime());
+ model.addAttribute("registerEndTime",registerEndTime);
+
+
+
model.addAttribute("item",competition);
- return PREFIX + "tCompetition_edit.html";
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
+
+ List<TStore> list2 = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getCityCode,competition.getCityCode()));
+ model.addAttribute("list",list);
+ model.addAttribute("list1",list1);
+ model.addAttribute("list2",list2);
+ model.addAttribute("type",1);
+ return PREFIX + "TCompetition_edit.html";
+ }
+ @RequestMapping("/tCompetition_info/{id}")
+ public String tCarInfo(@PathVariable Integer id, Model model) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ model.addAttribute("objectType",objectType);
+ Competition competition = competitionClient.queryById(id);
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String startTime = formatter.format(competition.getStartTime());
+ model.addAttribute("startTime",startTime);
+ String endTime = formatter.format(competition.getEndTime());
+ model.addAttribute("endTime",endTime);
+ String registerEndTime = formatter.format(competition.getRegisterEndTime());
+ model.addAttribute("registerEndTime",registerEndTime);
+ model.addAttribute("item",competition);
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
+
+ List<TStore> list2 = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getCityCode,competition.getCityCode()));
+ model.addAttribute("list",list);
+ model.addAttribute("list1",list1);
+ model.addAttribute("list2",list2);
+ model.addAttribute("type",2);
+
+ return PREFIX + "TCompetition_edit.html";
+ }
+ @RequestMapping("/tCompetition_user/{id}")
+ public String tCarUser(@PathVariable Integer id, Model model) {
+ model.addAttribute("id",id);
+ return PREFIX + "TCompetitionUser.html";
}
@RequestMapping(value = "/list")
@ResponseBody
- public Object list(String provinceCode,String cityCode,String shopName,String eventName,String time,Integer state,Integer registerCondition) {
+ public Object list(String provinceCode, String cityCode, String shopName, String eventName, String time, Integer state, Integer registerCondition) {
List<Integer> ids = new ArrayList<>();
+ List<TStore> list = null;
// 获取门店id
if(ToolUtil.isNotEmpty(shopName)){
- List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().like(TStore::getName, shopName));
+ list = storeService.list(new LambdaQueryWrapper<TStore>().like(TStore::getName, shopName));
ids = list.stream().map(TStore::getId).collect(Collectors.toList());
}else {
+ list = storeService.list();
ids = storeService.list().stream().map(TStore::getId).collect(Collectors.toList());
}
if(ids.size()==0){
ids.add(-1);
}
- ListQuery listQuery = new ListQuery();
-// List<Competition> competitions = competitionClient.list();
- return super.warpObject(null);
+ Page<Competition> page = new PageFactory<Competition>().defaultPage();
+ ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids);
+ Page<Competition> competitions = competitionClient.list(listQuery);
+ for (Competition competition : competitions.getRecords()) {
+ for (TStore tStore : list) {
+ String[] split = competition.getStoreId().split(",");
+
+ for (String s : split) {
+ if(s.equals(String.valueOf(tStore.getId()))){
+ if (competition.getStoreName()==null){
+ competition.setStoreName(tStore.getName());
+ }else {
+ competition.setStoreName(competition.getStoreName()+"，"+tStore.getName());
+ }
+ }
+ }
+ }
+ }
+ return super.packForBT(competitions);
}
+ @RequestMapping(value = "/listUser/{id}")
+ @ResponseBody
+ public Object listUser(@PathVariable Integer id,Integer state) {
+ try {
+ Page<Object> page = new PageFactory<>().defaultPage();
+ Page<CompetitionUser> data = competitionClient.getPeopleFromId(new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
+ return super.packForBT(data);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object list(Competition competition) {
+ try {
+ if(ToolUtil.isNotEmpty(competition.getProvinceCode())) {
+ System.out.println("=============="+competition);
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
+ competition.setProvince(one.getName());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getCityCode()));
+ competition.setCity(one1.getName());
+ }
+
+ if (UserExt.getUser().getObjectType() == 1){
+ competition.setAuditStatus(2);
+ }else {
+ competition.setAuditStatus(1);
+ }
+
+
+// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
+// competition.setStartTime(format1.parse(competition.getSTime()));
+// competition.setEndTime(format1.parse(competition.getETime()));
+// competition.setRegisterEndTime(format.parse(competition.getREndTime()));
+ competitionClient.add(competition);
+ return new SuccessTip<>();
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Competition competition) {
+ try {
+ Competition competition1 = competitionClient.queryById(competition.getId());
+ if(ToolUtil.isNotEmpty(competition.getProvinceCode())) {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getProvinceCode()));
+ competition.setProvince(one.getName());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, competition.getCityCode()));
+ competition.setCity(one1.getName());
+ }
+ if(ToolUtil.isEmpty(competition.getCoverDrawing())){
+ competition.setCoverDrawing(competition1.getCoverDrawing());
+ }
+ if(ToolUtil.isEmpty(competition.getRegistrationNotes())){
+ competition.setRegistrationNotes(competition1.getRegistrationNotes());
+ }
+ competitionClient.update(competition);
+ return new SuccessTip<>();
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+
+ @RequestMapping(value = "/cancel")
+ public Object cancel(Integer id) {
+ try {
+ competitionClient.cancel(id);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+ @RequestMapping(value = "/getPeopleFromId")
+ public Object getPeopleFromId(Integer id,Integer state) {
+ try {
+ Page<Object> page = new PageFactory<>().defaultPage();
+ Page<CompetitionUser> data = competitionClient.getPeopleFromId(new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
+ return super.packForBT(data);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+ @Autowired
+ private TOperatorCityService operatorCityService;
+ @RequestMapping(value = "/onChange")
+ @ResponseBody
+ public Object onChange(Integer oneId) {
+ System.out.println("======"+oneId);
+ List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, oneId).eq(TOperatorCity::getType, 2));
+ if (list.size()!=0){
+ return list;
+ }
+
+ 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 = "/oneChangeNext")
+ @ResponseBody
+ public Object oneChangeNext(Integer oneId) {
+ try {
+ return storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getCityCode, oneId));
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
}
--
Gitblit v1.7.1