From 48f8fffb3df2d8fd77c0a52df0e56e04eb5931ae Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 三月 2024 10:03:22 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java
index a31f8d7..735b8f4 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java
@@ -1,14 +1,12 @@
package com.dsh.guns.modular.system.controller.code;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.feignClient.communityWorldCup.Model.Referee;
-import com.dsh.course.feignClient.communityWorldCup.Model.RefereeList;
-import com.dsh.course.feignClient.communityWorldCup.RefereeClient;
-import com.dsh.guns.core.base.controller.BaseController;
+import com.dsh.course.feignClient.account.RefereeClient;
+import com.dsh.course.feignClient.account.model.Referee;
+import com.dsh.course.feignClient.account.model.RefereeList;
import com.dsh.guns.modular.system.model.Region;
import com.dsh.guns.modular.system.service.IRegionService;
import com.dsh.guns.modular.system.util.ResultUtil;
-import groovy.transform.AutoImplement;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@@ -16,6 +14,9 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 裁判管理
@@ -70,4 +71,24 @@
refereeClient.addReferee(referee);
return ResultUtil.success();
}
+
+
+ /**
+ * 根据id获取数据
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getReferee")
+ public Object getReferee(Integer id){
+ Map<String, Object> map = new HashMap<>();
+ Referee referee = refereeClient.getRefereeById(id);
+ map.put("referee", referee);
+ List<Region> parent = regionService.list(new QueryWrapper<Region>().eq("parent_id", 0));
+ map.put("province", parent);
+ Region region = regionService.getOne(new QueryWrapper<Region>().eq("code", referee.getProvinceCode()));
+ List<Region> citys = regionService.list(new QueryWrapper<Region>().eq("parent_id", region.getId()));
+ map.put("city", citys);
+ return map;
+ }
}
--
Gitblit v1.7.1