From 48f8fffb3df2d8fd77c0a52df0e56e04eb5931ae Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 三月 2024 10:03:22 +0800
Subject: [PATCH] 合并代码
---
/dev/null | 34 ------
cloud-server-management/src/main/webapp/WEB-INF/view/system/referee/referee.html | 2
cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js | 140 ++++++++++++++++++++++++----
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java | 9 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java | 31 +++++-
cloud-server-account/src/main/java/com/dsh/account/controller/RefereeController.java | 11 ++
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/Referee.java | 2
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/RefereeList.java | 2
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/RefereeClient.java | 42 ++++++++
9 files changed, 209 insertions(+), 64 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/RefereeController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/RefereeController.java
index 3c3967a..1ce34c0 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/RefereeController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/RefereeController.java
@@ -49,4 +49,15 @@
referee.setCreateTime(new Date());
refereeService.save(referee);
}
+
+
+ /**
+ * 根据id获取数据
+ * @param id
+ * @return
+ */
+ @PostMapping("/referee/getRefereeById")
+ public Referee getRefereeById(@RequestBody Integer id){
+ return refereeService.getById(id);
+ }
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/RefereeClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/RefereeClient.java
new file mode 100644
index 0000000..c531b18
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/RefereeClient.java
@@ -0,0 +1,42 @@
+package com.dsh.course.feignClient.account;
+
+import com.dsh.course.feignClient.account.model.Referee;
+import com.dsh.course.feignClient.account.model.RefereeList;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.Map;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/3/1 14:24
+ */
+@FeignClient("mb-cloud-account")
+public interface RefereeClient {
+
+
+ /**
+ * 获取裁判管理列表
+ * @param refereeList
+ * @return
+ */
+ @PostMapping("/referee/getRefereeList")
+ Map<String, Object> getRefereeList(RefereeList refereeList);
+
+
+ /**
+ * 添加裁判
+ * @param referee
+ */
+ @PostMapping("/referee/addReferee")
+ void addReferee(Referee referee);
+
+
+ /**
+ * 根据id获取数据
+ * @param id
+ * @return
+ */
+ @PostMapping("/referee/getRefereeById")
+ Referee getRefereeById(Integer id);
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/Referee.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/Referee.java
similarity index 94%
rename from cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/Referee.java
rename to cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/Referee.java
index 88b79cc..7143d7e 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/Referee.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/Referee.java
@@ -1,4 +1,4 @@
-package com.dsh.course.feignClient.communityWorldCup.Model;
+package com.dsh.course.feignClient.account.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/RefereeList.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/RefereeList.java
similarity index 88%
rename from cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/RefereeList.java
rename to cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/RefereeList.java
index 6c6fbaa..6466284 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/RefereeList.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/model/RefereeList.java
@@ -1,4 +1,4 @@
-package com.dsh.course.feignClient.communityWorldCup.Model;
+package com.dsh.course.feignClient.account.model;
import lombok.Data;
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/RefereeClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/RefereeClient.java
deleted file mode 100644
index 12e7fb5..0000000
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/RefereeClient.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.dsh.course.feignClient.communityWorldCup;
-
-import com.dsh.course.feignClient.communityWorldCup.Model.Referee;
-import com.dsh.course.feignClient.communityWorldCup.Model.RefereeList;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author zhibing.pu
- * @Date 2024/3/1 14:24
- */
-@FeignClient("mb-cloud-communityWorldCup")
-public interface RefereeClient {
-
-
- /**
- * 获取裁判管理列表
- * @param refereeList
- * @return
- */
- @PostMapping("/referee/getRefereeList")
- List<Map<String, Object>> getRefereeList(RefereeList refereeList);
-
-
- /**
- * 添加裁判
- * @param referee
- */
- @PostMapping("/referee/addReferee")
- void addReferee(Referee referee);
-}
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;
+ }
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java
index 64f8bf0..ecf396b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.system;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.Region;
import com.dsh.guns.modular.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +31,12 @@
@ResponseBody
@PostMapping("/getRegion")
public List<Region> getRegion(String pcode){
- Region code = regionService.getOne(new QueryWrapper<Region>().eq("code", pcode));
- return regionService.list(new QueryWrapper<Region>().eq("parent_id", code.getId()));
+ Integer pid = 0;
+ if(ToolUtil.isNotEmpty(pcode)){
+ Region code = regionService.getOne(new QueryWrapper<Region>().eq("code", pcode));
+ pid = code.getId();
+ }
+ return regionService.list(new QueryWrapper<Region>().eq("parent_id", pid));
}
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/referee/referee.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/referee/referee.html
index a79ee6d..8f7adf7 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/referee/referee.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/referee/referee.html
@@ -44,7 +44,7 @@
<#button name="重置" icon="fa-trash" clickFun="Referee.resetSearch()" space="true"/>
</div>
</div>
- <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
+ <div class="hidden-xs" id="RefereeTableToolbar" role="group">
@if(shiro.hasPermission("/referee/openAddReferee")){
<#button name="添加" icon="fa-plus" clickFun="Referee.openAddReferee()"/>
@}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js b/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js
index 9876c80..26de31b 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js
@@ -80,7 +80,7 @@
layer.open({
type: 1
,title: '添加裁判'
- ,area: ['390px', '260px']
+ ,area: ['500px', '350px']
,shade: 0
,content: div
,btn: ['保存', '关闭'] //只是为了演示
@@ -138,19 +138,124 @@
};
/**
- * 商户号认证页面
+ * 编辑
*/
Referee.openEditReferee = function () {
- if (this.check()) {
- var index = layer.open({
- type: 2,
- title: "编辑裁判",
- area: ['100%', '100%'], //宽高
- fix: false, //不固定
- maxmin: true,
- content: Feng.ctxPath + '/referee/proportionAuth/' + Referee.seItem.id
+ if(this.check()){
+ let div = '<div class="ibox-content">\n' +
+ ' <div class="form-horizontal" id="carInfoForm1">\n' +
+ ' <input id="editId" type="hidden">' +
+ ' <div class="form-group" >\n' +
+ ' <label class="col-sm-3 control-label">*裁判姓名：</label>\n' +
+ ' <div class="col-sm-9" style="display: flex;">\n' +
+ ' <input class="form-control" id="addName" placeholder="请输入">\n' +
+ ' </div>\n' +
+ ' </div>\n' +
+ ' <div class="form-group" >\n' +
+ ' <label class="col-sm-3 control-label">*手机号：</label>\n' +
+ ' <div class="col-sm-9">\n' +
+ ' <input class="form-control" id="addPhone" placeholder="请输入">' +
+ ' </div>\n' +
+ ' </div>\n' +
+ ' <div class="form-group" >\n' +
+ ' <label class="col-sm-3 control-label">*所在省：</label>\n' +
+ ' <div class="col-sm-9">\n' +
+ ' <select class="form-control" id="addProvince" onchange="Referee.region(\'addCity\', this)"></select>' +
+ ' </div>\n' +
+ ' </div>\n' +
+ ' <div class="form-group" >\n' +
+ ' <label class="col-sm-3 control-label">*所在市：</label>\n' +
+ ' <div class="col-sm-9">\n' +
+ ' <select class="form-control" id="addCity"></select>' +
+ ' </div>\n' +
+ ' </div>\n' +
+ ' </div>\n' +
+ ' </div>';
+ layer.open({
+ type: 1
+ , title: '编辑裁判'
+ , area: ['500px', '350px']
+ , shade: 0
+ , content: div
+ , btn: ['保存', '关闭'] //只是为了演示
+ , yes: function () {
+ let editId = $('#editId').val();
+ let addName = $('#addName').val();
+ let addPhone = $('#addPhone').val();
+ let addProvince = $('#addProvince').val();
+ let addCity = $('#addCity').val();
+ if (null == addName || '' == addName) {
+ Feng.info("裁判姓名不能为空");
+ return
+ }
+ if (null == addPhone || '' == addPhone) {
+ Feng.info("手机号不能为空");
+ return
+ }
+ if (null == addProvince || '' == addProvince) {
+ Feng.info("请选择所在省");
+ return
+ }
+ if (null == addCity || '' == addCity) {
+ Feng.info("请选择所在市");
+ return
+ }
+ var ajax = new $ax(Feng.ctxPath + "/referee/editReferee", function (res) {
+ if (res.code == 200) {
+ Feng.success("添加成功");
+ layer.closeAll();
+ } else {
+ Feng.error(res.msg);
+ }
+ MgrUser.table.refresh();
+ }, function (data) {
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
+ });
+ ajax.setData({
+ 'id': editId,
+ 'name': addName,
+ 'phone': addPhone,
+ 'provinceCode': addProvince,
+ 'cityCode': addCity
+ });
+ ajax.start();
+ }
+ , btn2: function () {
+ layer.closeAll();
+ }
+ , success: function () {
+ var ajax = new $ax(Feng.ctxPath + "/referee/getReferee", function (res) {
+ let referee = res.referee;
+ let province = res.province;
+ let city = res.city;
+ let html1 = '<option value="">请选择</option>';
+ for (let i = 0; i < province.length; i++) {
+ html1 += '<option value="' + province[i].code + '">' + province[i].name + '</option>'
+ }
+ $('#addProvince').html(html1);
+ let html2 = '<option value="">请选择</option>';
+ for (let i = 0; i < city.length; i++) {
+ html2 += '<option value="' + city[i].code + '">' + city[i].name + '</option>'
+ }
+ $('#addCity').html(html2);
+
+ $('#editId').val(referee.id);
+ $('#addName').val(referee.name);
+ $('#addPhone').val(referee.phone);
+ $('#addProvince').val(referee.provinceCode);
+ $('#addCity').val(referee.cityCode);
+ }, function (data) {
+ Feng.error("获取失败!" + data.responseJSON.message + "!");
+ });
+ ajax.setData({
+ 'id': Referee.seItem.id
+ });
+ ajax.start();
+ }
+ , end: function () {
+
+ }
});
- this.layerIndex = index;
}
};
@@ -261,16 +366,11 @@
pcode = $(e).val();
}
var ajax = new $ax(Feng.ctxPath + "/region/getRegion", function (res) {
- if(res.code == 200){
- let html = '<option value="">请选择</option>';
- for (let i = 0; i < res.data.length; i++) {
- html += '<option value="' + res.data.code + '">' + res.data.name + '</option>';
- }
- $('#' + node).html(html)
- }else{
- Feng.error(res.msg);
+ let html = '<option value="">请选择</option>';
+ for (let i = 0; i < res.length; i++) {
+ html += '<option value="' + res[i].code + '">' + res[i].name + '</option>';
}
- MgrUser.table.refresh();
+ $('#' + node).html(html)
}, function (data) {
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
--
Gitblit v1.7.1