From 372cc31846c4a058e7ae443ebae4b0a706747728 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Wed, 12 Jul 2023 09:31:11 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/controller/SysUserController.java | 2 +
.../resources/mapper/system/WxUserMapper.xml | 2 +-
ruoyi-ui/src/api/system/WxBuilding.js | 8 +--
ruoyi-ui/src/api/system/competition.js | 2 +-
.../src/views/system/competition/index.vue | 6 +-
ruoyi-ui/src/views/system/wxUser/index.vue | 72 ++++++++++---------
6 files changed, 48 insertions(+), 44 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index b7b400de..de6409ec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -127,6 +127,8 @@ public class SysUserController extends BaseController
LoginUser sysUserVo = new LoginUser();
sysUserVo.setSysUser(sysUser);
sysUserVo.setRoles(roles);
+ sysUserVo.setUserid(sysUser.getUserId());
+ sysUserVo.setUsername(sysUser.getUserName());
sysUserVo.setPermissions(permissions);
return R.ok(sysUserVo);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
index 5822ee0b..1c02a08c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, LOGIN_NAME, PASS_WORD, ROLE, OPENID, AVATAR, GENDER, USER_NAME, TELEPHONE, BIRTHDAY, HEIGHT, WEIGHT, TEAM_POSITION, TAG, ENABLED, UNIONID, OFFICIAL_ACCOUNT_OPENID, real_name from user_info
+ select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, LOGIN_NAME, PASS_WORD, ROLE, OPENID, AVATAR, GENDER, USER_NAME, TELEPHONE, BIRTHDAY, HEIGHT, WEIGHT, TEAM_POSITION, TAG, ENABLED, UNIONID, OFFICIAL_ACCOUNT_OPENID,REAL_NAME from user_info
+
insert into competition_team_vs_team
@@ -348,6 +442,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and batch_number = #{batchNumber}
+
+ update competition_team_vs_team set status = 2 where status <> 2 and competition_time now()
+
delete from competition_team_vs_team where id = #{id}
From 994d44b8a4ea8354cc0966fd29a98c6887987290 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Sun, 16 Jul 2023 16:46:43 +0800
Subject: [PATCH 06/14] =?UTF-8?q?token=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E5=8A=A0=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ruoyi/common/core/constant/CacheConstants.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
index 94912243..6fb8cc11 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
@@ -10,12 +10,12 @@ public class CacheConstants
/**
* 缓存有效期，默认720（分钟）
*/
- public final static long EXPIRATION = 720;
+ public final static long EXPIRATION = 7200;
/**
* 缓存刷新时间，默认120（分钟）
*/
- public final static long REFRESH_TIME = 120;
+ public final static long REFRESH_TIME = 1200;
/**
* 密码最大错误次数
From 07dc1a3b5682df904d6ec19531c1b12e6519ba82 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Mon, 17 Jul 2023 15:52:06 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/CompetitionResultController.java | 4 ++--
.../service/impl/CompetitionResultServiceImpl.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java
index 12b442ef..12a09cc7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java
@@ -138,7 +138,7 @@ public class CompetitionResultController extends BaseController
//新增
if(request.getId()==null){
- request.setCreatedBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+ //request.setCreatedBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
request.setCreatedTime(new Date());
competitionMembersScoreService.insertCompetitionMembersScore(request);
} else {//编辑、
@@ -146,7 +146,7 @@ public class CompetitionResultController extends BaseController
throw new ServiceException("id为空");
}
request.setLastUpdatedTime(new Date());
- request.setModifiedBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+ //request.setModifiedBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
competitionMembersScoreService.updateCompetitionMembersScore(request);
}
return AjaxResult.success();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
index d89f582c..54dfe087 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
@@ -156,9 +156,9 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(CompetitionResult entity) {
- LoginUser user = SecurityUtils.getLoginUser();
+ LoginUser user = new LoginUser();//SecurityUtils.getLoginUser();
// entity.fillOperationInfo(user.getUserId().toString());
- entity.setCreatedBy(String.valueOf(user.getUserid()));
+ // entity.setCreatedBy(String.valueOf(user.getUserid()));
entity.setCreatedTime(new Date());
competitionResultMapper.insertCompetitionResult(entity);
this.calculateScore(entity,user);
@@ -219,7 +219,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
}
//设置更新人
- teamVsTeam.setModifiedBy(String.valueOf(user.getUserid()));
+ //teamVsTeam.setModifiedBy(String.valueOf(user.getUserid()));
teamVsTeam.setLastUpdatedTime(new Date());
competitionTeamVsTeamMapper.updateCompetitionTeamVsTeam(teamVsTeam);
}
@@ -266,7 +266,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
}
}
}
- entity.setModifiedBy(String.valueOf(user.getUserid()));
+ //entity.setModifiedBy(String.valueOf(user.getUserid()));
entity.setLastUpdatedTime(new Date());
competitionResultMapper.updateCompetitionResult(entity);
}
@@ -274,8 +274,8 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean edit(CompetitionResult entity) {
- LoginUser user = SecurityUtils.getLoginUser();
- entity.setModifiedBy(String.valueOf(user.getUserid()));
+ LoginUser user = new LoginUser();
+ // entity.setModifiedBy(String.valueOf(user.getUserid()));
entity.setLastUpdatedTime(new Date());
competitionResultMapper.updateCompetitionResult(entity);
this.calculateScore(entity,user);
From 5335cd70c46ea6ae22316f2cee946e3055ebe390 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Wed, 19 Jul 2023 18:41:48 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=A7=AF=E5=88=86?=
=?UTF-8?q?=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompetitionOfTeamController.java | 17 +----
.../CompetitionResultController.java | 62 ++++++++++++++-----
.../CompetitionTeamVsTeamController.java | 47 ++++++++++++--
.../system/domain/CompetitionResult.java | 6 +-
.../system/domain/enums/VsResultEnums.java | 1 +
.../domain/vo/CompetitionTeamIntegralVo.java | 3 +
.../vo/competitionTeamIntegralRankingVo.java | 16 +++++
.../mapper/CompetitionTeamVsTeamMapper.java | 2 +-
.../ICompetitionTeamVsTeamService.java | 2 +-
.../impl/CompetitionResultServiceImpl.java | 4 +-
.../CompetitionTeamVsTeamServiceImpl.java | 8 +--
.../mapper/system/CompetitionResultMapper.xml | 24 ++++++-
.../system/CompetitionTeamVsTeamMapper.xml | 9 ++-
13 files changed, 149 insertions(+), 52 deletions(-)
create mode 100644 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/competitionTeamIntegralRankingVo.java
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionOfTeamController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionOfTeamController.java
index 8ec9a3b4..91b0fb16 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionOfTeamController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionOfTeamController.java
@@ -222,23 +222,8 @@ public class CompetitionOfTeamController extends BaseController
}
@PostMapping("/getJoinCompetitionGroupTeam")
@ResponseBody
- @ApiOperation(value = ApiTerminal.wxMiniProgram+"获取赛事中参与的球队的分组数据")
+ @ApiOperation(value = ApiTerminal.wxMiniProgram+"获取赛事中参与的球队的分组的积分情况")
public AjaxResult getJoinCompetitionGroupTeam(@RequestBody CompetitionOfTeamVo entity){
- //关键字word包含：球队名称、地点名称、球馆名称，支持模糊搜索；
-// List competitionOfTeamVos = competitionOfTeamFeign.getJoinCompetitionGroupTeam(entity);
-// List isNotGroupList = list.stream().filter(a -> StringUtils.isEmpty(a.getCompetitionGroup())).collect(Collectors.toList());
-// List list1 = list.stream().filter(a -> !StringUtils.isEmpty(a.getCompetitionGroup())).collect(Collectors.toList());
-// //1.根据字符串类型日期分组，并按照日期升序排序，返回TreeMap，map的key为字符串日期，value为list
-// TreeMap> dataGroupMap = list1.stream().collect(Collectors.groupingBy(a->a.getCompetitionGroup(), TreeMap::new,Collectors.toList()));
-// List
@@ -153,6 +168,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
five_node_score = #{fiveNodeScore},
six_node_score = #{sixNodeScore},
integral = #{integral},
+ vs_result = #{vsResult},
+ vs_type = #{vsType},
+ competition_of_team_id = #{competitionOfTeamId},
where id = #{id}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml
index bdb2ff6a..e86eb5fc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml
@@ -241,13 +241,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
ANY_VALUE ( t.team_name ) as teamName,
any_value (team.team_logo) as teamLogo,
+ any_value (team.competition_group) as competition_group,
t.competition_of_team_id,
sum(IF( t.vs_result = 'win', 1, 0 )) AS win,
sum(IF( t.vs_result = 'fail', 1, 0 )) AS fail,
sum(IFNULL( t.one_node_score, 0 )+ IFNULL( t.two_node_score, 0 )+ IFNULL( t.three_node_score, 0 )+ IFNULL( t.four_node_score, 0 )+ IFNULL( t.five_node_score, 0 )+ IFNULL( t.six_node_score, 0 )) AS totalScore,
sum(t.integral) AS integral
FROM competition_result t left join competition_of_team team on team.id = t.competition_of_team_id
- WHERE t.is_deleted = 0 AND t.competition_id = #{id}
+ WHERE t.is_deleted = 0 AND t.competition_id = #{competitionId}
+
+ AND t.vs_type =#{vsType}
+
+
+ AND t.competition_group =#{competitionGroup}
+
GROUP BY t.competition_of_team_id
ORDER BY sum(t.integral) desc
From 794aa8c361ce070d71946e97b0fb7670144f1d10 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Thu, 20 Jul 2023 10:04:16 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/domain/CompetitionOfTeam.java | 8 +++++--
.../mapper/system/CompetitionOfTeamMapper.xml | 22 +++++++++++++++++--
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
index 2164f9b1..9542fc5a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java
@@ -65,11 +65,11 @@ public class CompetitionOfTeam extends BaseEntity
private Long isDeleted;
/** 联系人 */
- @Excel(name = "联系人")
+ @Excel(name = "领队人")
private String contacts;
/** 联系人电话 */
- @Excel(name = "联系人电话")
+ @Excel(name = "领队人电话")
private String contactsTel;
/** 联系人电话区号 */
@@ -79,5 +79,9 @@ public class CompetitionOfTeam extends BaseEntity
/** 组内的序号 */
@Excel(name = "组内的序号")
private Integer serialNumber;
+ @Excel(name = "球队logo")
+ private String teamLogo;
+ @Excel(name = "球队队长")
+ private String captain;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
index 41ed6edd..336c8941 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
@@ -21,10 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
- select id, competition_id, team_id, team_name, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, contacts, contacts_tel, contacts_area_code, serial_number from competition_of_team
+ select id, competition_id, team_id, team_name, competition_group, created_time, status, last_updated_time, created_by, modified_by, is_deleted, remark, contacts, contacts_tel, contacts_area_code, serial_number,team_logo,captain from competition_of_team
@@ -159,6 +168,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND t.contacts_area_code like CONCAT('%',#{contactsAreaCode},'%')
+
+ and t.captain like concat('%',#{captain}, '%')
+
order by t.created_time desc
@@ -180,6 +192,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
contacts_tel,
contacts_area_code,
serial_number,
+ team_logo,
+ captain,
#{competitionId},
@@ -197,6 +211,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{contactsTel},
#{contactsAreaCode},
#{serialNumber},
+ #{teamLogo},
+ #{captain},
@@ -218,6 +234,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
contacts_tel = #{contactsTel},
contacts_area_code = #{contactsAreaCode},
serial_number = #{serialNumber},
+ team_logo = #{teamLogo},
+ captain = #{captain},
where id = #{id}
From 8b4345df6bfba772ac7f7e79d28a5e04e4f891ba Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Thu, 20 Jul 2023 10:18:38 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/CompetitionServiceImpl.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java
index 83450fe5..cabebf9e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java
@@ -9,6 +9,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.digest.DigestUtil;
import com.alibaba.fastjson.JSON;
@@ -480,7 +481,7 @@ public class CompetitionServiceImpl implements ICompetitionService
if (StringUtils.isEmpty(competitionCode)) {
throw new CheckedException("赛事编码不能为空");
}
- System.out.println("赛事编码" + competitionCode);
+ log.info("开始导入-->赛事编码:" + competitionCode);
Row row5 = sheet.getRow(5);
Cell cell5_1 = row5.getCell(0);
if (cell5_1 == null) {
@@ -539,6 +540,10 @@ public class CompetitionServiceImpl implements ICompetitionService
if (StringUtils.isEmpty(teamUserNum)) {
throw new CheckedException("球队人数不能为空");
}
+ //todo 校验是否是整数
+ if(!NumberUtil.isInteger(teamUserNum)){
+ throw new CheckedException("球队人数必须是正整数");
+ }
//todo 获取到数据后，开始保存数据
LoginUser user = SecurityUtils.getLoginUser();
String userId = null;
@@ -622,12 +627,20 @@ public class CompetitionServiceImpl implements ICompetitionService
cell = row.getCell(4);
if (cell != null) {
cell.setCellType(CellType.STRING);
+ //todo 校验是否是整数
+ if(!NumberUtil.isInteger(cell.getStringCellValue())){
+ throw new CheckedException(membersVo.getRealName()+" 的身高必须是正整数");
+ }
membersVo.setHeight(new BigDecimal(cell.getStringCellValue()));
}
//体重
cell = row.getCell(5);
if (cell != null) {
cell.setCellType(CellType.STRING);
+ //todo 校验是否是整数
+ if(!NumberUtil.isInteger(cell.getStringCellValue())){
+ throw new CheckedException(membersVo.getRealName()+" 的体重必须是正整数");
+ }
membersVo.setWeight(new BigDecimal(cell.getStringCellValue()));
}
//证件号码
From ca6512e483f171cec0145028db56ac864af5d35e Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Thu, 20 Jul 2023 14:57:23 +0800
Subject: [PATCH 11/14] =?UTF-8?q?pc=E7=AB=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/service/impl/CompetitionResultServiceImpl.java | 4 ++--
.../service/impl/CompetitionTeamVsTeamServiceImpl.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
index 3a598d0b..8316d24e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
@@ -129,7 +129,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
CompetitionResultVo team = obj.getMainTeam();
team.setCompetitionId(obj.getTeamVsTeamVo().getCompetitionId());
team.setCompetitionVsId(obj.getTeamVsTeamVo().getId());
- team.setTeamId(obj.getTeamVsTeamVo().getMainTeamId());
+ team.setCompetitionOfTeamId(obj.getTeamVsTeamVo().getMainTeamId());
team.setTeamName(obj.getTeamVsTeamVo().getMainTeamName());
competitionResultMapper.insertCompetitionResult(team);
}else {
@@ -139,7 +139,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
CompetitionResultVo team = obj.getGuestTeam();
team.setCompetitionId(obj.getTeamVsTeamVo().getCompetitionId());
team.setCompetitionVsId(obj.getTeamVsTeamVo().getId());
- team.setTeamId(obj.getTeamVsTeamVo().getGuestTeamId());
+ team.setCompetitionOfTeamId(obj.getTeamVsTeamVo().getGuestTeamId());
team.setTeamName(obj.getTeamVsTeamVo().getGuestTeamName());
competitionResultMapper.insertCompetitionResult(team);
}else {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
index a56076ab..e2e736ca 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
@@ -174,18 +174,18 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
}
//获取主队每节数据
List competitionResultList = competitionResultService.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
- Optional main = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst();
- Optional guest = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst();
+ Optional main = competitionResultList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst();
+ Optional guest = competitionResultList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst();
List membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
if(main.isPresent()){
CompetitionResultVo resultVo = main.get();
- List membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList());
+ List membersScores = membersScoreList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList());
resultVo.setMembersScoreList(membersScores);
recordVo.setMainTeam(resultVo);
}
if(guest.isPresent()){
CompetitionResultVo resultVo = guest.get();
- List membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList());
+ List membersScores = membersScoreList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList());
resultVo.setMembersScoreList(membersScores);
recordVo.setGuestTeam(resultVo);
}
From 55c8cbd33ea20e9889c2d68fc61c161b96613b89 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Thu, 20 Jul 2023 15:28:10 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/WxBuildingInfoServiceImpl.java | 8 ++--
.../mapper/system/WxBuildingInfoMapper.xml | 37 +++++++++++++++----
2 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
index c09b5a22..273788ae 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxBuildingInfoServiceImpl.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
@@ -161,12 +162,11 @@ public class WxBuildingInfoServiceImpl implements IWxBuildingInfoService
@Override
public List getAuditPage(WxBuildingInfo buildingInfo) {
LoginUser user = SecurityUtils.getLoginUser();
- System.out.println("user="+ JSON.toJSONString(user));
+ // System.out.println("user="+ JSON.toJSONString(user));
// 查询当前登录的用户的系统角色
- List userRoles = userRoleMapper.selectUserRoleList(UserRole.builder().userId(user.getUserid()).build());
+ Set userRoles = user.getRoles();//userRoleMapper.selectUserRoleList(UserRole.builder().userId(user.getUserid()).build());
if(!StringUtils.isEmpty(userRoles)&&userRoles.size()>0){
- List roleCodes = userRoles.stream().map(UserRole::getRoleCode).collect(Collectors.toList());
- if(roleCodes.contains("admin")){
+ if(userRoles.contains("admin")){
//查询所有
buildingInfo.setCreatedId(null);
}else {
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
index 67684ad9..10700320 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxBuildingInfoMapper.xml
@@ -77,7 +77,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY distance LIMIT 20
-
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
index 336c8941..1fd75233 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionOfTeamMapper.xml
@@ -173,6 +173,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by t.created_time desc
+
insert into competition_of_team
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml
new file mode 100644
index 00000000..1dbd9cc7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, create_time, competition_id, user_id, user_tel, user_name, status, update_time, create_by, update_by, is_deleted, remark, can_set_type from competition_share_permissions
+
+
+
+
+
+
+
+ insert into competition_share_permissions
+
+ create_time,
+ competition_id,
+ user_id,
+ user_tel,
+ user_name,
+ status,
+ update_time,
+ create_by,
+ update_by,
+ is_deleted,
+ remark,
+ can_set_type,
+
+
+ #{createTime},
+ #{competitionId},
+ #{userId},
+ #{userTel},
+ #{userName},
+ #{status},
+ #{updateTime},
+ #{createBy},
+ #{updateBy},
+ #{isDeleted},
+ #{remark},
+ #{canSetType},
+
+
+
+
+ update competition_share_permissions
+
+ create_time = #{createTime},
+ competition_id = #{competitionId},
+ user_id = #{userId},
+ user_tel = #{userTel},
+ user_name = #{userName},
+ status = #{status},
+ update_time = #{updateTime},
+ create_by = #{createBy},
+ update_by = #{updateBy},
+ is_deleted = #{isDeleted},
+ remark = #{remark},
+ can_set_type = #{canSetType},
+
+ where id = #{id}
+
+
+
+ delete from competition_share_permissions where id = #{id}
+
+
+
+ delete from competition_share_permissions where id in
+
+ #{id}
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml
index b3fe3647..656f3bbb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserRoleMapper.xml
@@ -41,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
insert into user_role
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
index 1c02a08c..726c1a8a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
@@ -75,6 +75,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
+
insert into user_info
diff --git a/ruoyi-ui/src/api/system/competitionPermissions.js b/ruoyi-ui/src/api/system/competitionPermissions.js
new file mode 100644
index 00000000..79168127
--- /dev/null
+++ b/ruoyi-ui/src/api/system/competitionPermissions.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询赛会-权限分享列表
+export function listCompetitionPermissions(query) {
+ return request({
+ url: '/system/competitionPermissions/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询赛会-权限分享详细
+export function getCompetitionPermissions(id) {
+ return request({
+ url: '/system/competitionPermissions/' + id,
+ method: 'get'
+ })
+}
+
+// 新增赛会-权限分享
+export function addCompetitionPermissions(data) {
+ return request({
+ url: '/system/competitionPermissions',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改赛会-权限分享
+export function updateCompetitionPermissions(data) {
+ return request({
+ url: '/system/competitionPermissions',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除赛会-权限分享
+export function delCompetitionPermissions(id) {
+ return request({
+ url: '/system/competitionPermissions/' + id,
+ method: 'delete'
+ })
+}
diff --git a/ruoyi-ui/src/views/system/competitionPermissions/index.vue b/ruoyi-ui/src/views/system/competitionPermissions/index.vue
new file mode 100644
index 00000000..ccfa23aa
--- /dev/null
+++ b/ruoyi-ui/src/views/system/competitionPermissions/index.vue
@@ -0,0 +1,374 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+