wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-28 12:41:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现微信扫码登录PC端

Browse Source
This commit is contained in:
wuyibo
2024-06-29 09:51:19 +08:00
parent 193e93f60a
commit d669f04f55
39 changed files with 708 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java
View File

@@ -16,12 +16,14 @@ import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
import com.ruoyi.system.api.domain.LoginMethodEnum;
import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.Competition;
import com.ruoyi.system.domain.CompetitionSharePermissions;
import com.ruoyi.system.domain.Sms;
import com.ruoyi.system.domain.UserRole;
import com.ruoyi.system.domain.WxUser;
import com.ruoyi.system.domain.vo.CompetitionExcleVo;
import com.ruoyi.system.domain.vo.CompetitionResponse;
import com.ruoyi.system.domain.vo.CompetitionVo;
@@ -93,12 +95,28 @@ public class CompetitionController extends BaseController
/**
* 查询比赛信息列表
*/
@RequiresPermissions("system:competition:list")
// @RequiresPermissions("system:competition:list")
@GetMapping("/list")
public TableDataInfo list(Competition competition)
public TableDataInfo list(CompetitionVo competition)
{
LoginUser user = SecurityUtils.getLoginUser();
//如果是微信扫码登录进入pc系统的且是common角色，只能操作自己创建的赛事
if(ObjectUtil.isNotNull(user.getLoginMethod()) && user.getRoles().contains("common")
&&user.getLoginMethod().equals(LoginMethodEnum.WX_SCAN.getCode())){
WxUser wxUser = wxUserService.selectWxUserByOpenId(user.getUsername());
//同时可以看到分享给自己的赛事
CompetitionSharePermissions permissions = new CompetitionSharePermissions();
permissions.setUserId(wxUser.getId());
permissions.setIsDeleted(0);
List<CompetitionSharePermissions> permissionsList = competitionSharePermissionsService.selectCompetitionSharePermissionsList(permissions);
if(ObjectUtil.isNotNull(permissionsList)&&permissionsList.size()>0){
List<Long> competitionIds = permissionsList.stream().map(CompetitionSharePermissions::getCompetitionId).collect(Collectors.toList());
competition.setCompetitionIds(competitionIds);
}
competition.setFounder(wxUser.getId());
}
startPage();
List<Competition> list = competitionService.selectCompetitionList(competition);
List<Competition> list = competitionService.getMyJoinCompetition(competition);
return getDataTable(list);
}
@@ -118,7 +136,7 @@ public class CompetitionController extends BaseController
/**
* 获取比赛信息详细信息
*/
@RequiresPermissions("system:competition:query")
// @RequiresPermissions("system:competition:query")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -180,7 +198,7 @@ public class CompetitionController extends BaseController
/**
* 新增比赛信息
*/
@RequiresPermissions("system:competition:add")
// @RequiresPermissions("system:competition:add")
@Log(title = "比赛信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult addCompetition(@RequestBody Competition competition)
@@ -188,7 +206,7 @@ public class CompetitionController extends BaseController
return toAjax(competitionService.insertCompetition(competition));
}
@RequiresPermissions("system:competition:genCompetitionCommonAqrSpread")
// @RequiresPermissions("system:competition:genCompetitionCommonAqrSpread")
@Log(title = "生成赛会普通微信推广码", businessType = BusinessType.OTHER)
@PostMapping("/genCompetitionCommonAqrSpread")
public AjaxResult genCompetitionCommonAqrSpread(@RequestBody WxAppletsCodeVo wxAppletsCodeVo)
@@ -199,7 +217,7 @@ public class CompetitionController extends BaseController
/**
* 修改比赛信息
*/
@RequiresPermissions("system:competition:edit")
// @RequiresPermissions("system:competition:edit")
@Log(title = "比赛信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult editCompetition(@RequestBody Competition competition)

10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java
View File

@@ -36,7 +36,7 @@ public class CompetitionMembersController extends BaseController
/**
* 查询比赛参与人员列表
*/
@RequiresPermissions("system:competitionMembers:list")
// @RequiresPermissions("system:competitionMembers:list")
@GetMapping("/list")
public TableDataInfo list(CompetitionMembers competitionMembers)
{
@@ -61,7 +61,7 @@ public class CompetitionMembersController extends BaseController
/**
* 获取比赛参与人员详细信息
*/
@RequiresPermissions("system:competitionMembers:query")
// @RequiresPermissions("system:competitionMembers:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -76,7 +76,7 @@ public class CompetitionMembersController extends BaseController
/**
* 新增比赛参与人员
*/
@RequiresPermissions("system:competitionMembers:add")
// @RequiresPermissions("system:competitionMembers:add")
@Log(title = "比赛参与人员", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CompetitionMembers competitionMembers)
@@ -87,7 +87,7 @@ public class CompetitionMembersController extends BaseController
/**
* 修改比赛参与人员
*/
@RequiresPermissions("system:competitionMembers:edit")
// @RequiresPermissions("system:competitionMembers:edit")
@Log(title = "比赛参与人员", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CompetitionMembers competitionMembers)
@@ -98,7 +98,7 @@ public class CompetitionMembersController extends BaseController
/**
* 删除比赛参与人员
*/
@RequiresPermissions("system:competitionMembers:remove")
// @RequiresPermissions("system:competitionMembers:remove")
@Log(title = "比赛参与人员", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersScoreController.java
View File

@@ -38,7 +38,7 @@ public class CompetitionMembersScoreController extends BaseController
/**
* 查询赛会中-赛程-人员得分列表
*/
@RequiresPermissions("system:competitionMemberScore:list")
// @RequiresPermissions("system:competitionMemberScore:list")
@GetMapping("/list")
public TableDataInfo list(CompetitionMembersScore competitionMembersScore)
{
@@ -50,7 +50,7 @@ public class CompetitionMembersScoreController extends BaseController
/**
* 导出赛会中-赛程-人员得分列表
*/
@RequiresPermissions("system:competitionMemberScore:export")
// @RequiresPermissions("system:competitionMemberScore:export")
@Log(title = "赛会中-赛程-人员得分", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CompetitionMembersScore competitionMembersScore)
@@ -63,7 +63,7 @@ public class CompetitionMembersScoreController extends BaseController
/**
* 获取赛会中-赛程-人员得分详细信息
*/
@RequiresPermissions("system:competitionMemberScore:query")
// @RequiresPermissions("system:competitionMemberScore:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -73,7 +73,7 @@ public class CompetitionMembersScoreController extends BaseController
/**
* 新增赛会中-赛程-人员得分
*/
@RequiresPermissions("system:competitionMemberScore:add")
// @RequiresPermissions("system:competitionMemberScore:add")
@Log(title = "赛会中-赛程-人员得分", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CompetitionMembersScore competitionMembersScore)
@@ -84,7 +84,7 @@ public class CompetitionMembersScoreController extends BaseController
/**
* 修改赛会中-赛程-人员得分
*/
@RequiresPermissions("system:competitionMemberScore:edit")
// @RequiresPermissions("system:competitionMemberScore:edit")
@Log(title = "赛会中-赛程-人员得分", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CompetitionMembersScore competitionMembersScore)
@@ -95,7 +95,7 @@ public class CompetitionMembersScoreController extends BaseController
/**
* 删除赛会中-赛程-人员得分
*/
@RequiresPermissions("system:competitionMemberScore:remove")
// @RequiresPermissions("system:competitionMemberScore:remove")
@Log(title = "赛会中-赛程-人员得分", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionOfTeamController.java
View File

@@ -69,7 +69,7 @@ public class CompetitionOfTeamController extends BaseController
/**
* 查询赛会中-参赛队伍列表
*/
@RequiresPermissions("system:competitionOfTeam:list")
// @RequiresPermissions("system:competitionOfTeam:list")
@GetMapping("/list")
public TableDataInfo list(CompetitionOfTeamVo competitionOfTeam)
{
@@ -94,7 +94,7 @@ public class CompetitionOfTeamController extends BaseController
/**
* 获取赛会中-参赛队伍详细信息
*/
@RequiresPermissions("system:competitionOfTeam:query")
// @RequiresPermissions("system:competitionOfTeam:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -104,7 +104,7 @@ public class CompetitionOfTeamController extends BaseController
/**
* 新增赛会中-参赛队伍
*/
@RequiresPermissions("system:competitionOfTeam:add")
// @RequiresPermissions("system:competitionOfTeam:add")
@Log(title = "赛会中-参赛队伍", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CompetitionOfTeam competitionOfTeam)
@@ -115,14 +115,14 @@ public class CompetitionOfTeamController extends BaseController
/**
* 修改赛会中-参赛队伍
*/
@RequiresPermissions("system:competitionOfTeam:edit")
// @RequiresPermissions("system:competitionOfTeam:edit")
@Log(title = "赛会中-参赛队伍", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CompetitionOfTeam competitionOfTeam)
{
return toAjax(competitionOfTeamService.updateCompetitionOfTeam(competitionOfTeam));
}
@RequiresPermissions("system:competitionOfTeam:batchEditById")
// @RequiresPermissions("system:competitionOfTeam:batchEditById")
@Log(title = "赛会中-参赛队伍批量修改", businessType = BusinessType.UPDATE)
@PutMapping("/batchEditById")
public AjaxResult batchEditById(@RequestBody List<CompetitionOfTeam> list)
@@ -130,7 +130,7 @@ public class CompetitionOfTeamController extends BaseController
return toAjax(competitionOfTeamService.batchUpdateCompetitionOfTeam(list));
}
@RequiresPermissions("system:competitionOfTeam:removeTeamGroup")
// @RequiresPermissions("system:competitionOfTeam:removeTeamGroup")
@Log(title = "赛会中-参赛队伍移除分组", businessType = BusinessType.UPDATE)
@PutMapping("/removeTeamGroup/{ids}")
public AjaxResult removeTeamGroup(@PathVariable Long[] ids)
@@ -138,7 +138,7 @@ public class CompetitionOfTeamController extends BaseController
return toAjax(competitionOfTeamService.removeTeamGroup(ids));
}
@RequiresPermissions("system:competitionOfTeam:intoTeamGroup")
// @RequiresPermissions("system:competitionOfTeam:intoTeamGroup")
@Log(title = "赛会中-参赛队伍移入分组", businessType = BusinessType.UPDATE)
@PostMapping("/intoTeamGroup/{competitionGroup}")
public AjaxResult intoTeamGroup(@PathVariable String competitionGroup,@RequestBody List<Long> ids)
@@ -148,7 +148,7 @@ public class CompetitionOfTeamController extends BaseController
/**
* 删除赛会中-参赛队伍
*/
@RequiresPermissions("system:competitionOfTeam:remove")
// @RequiresPermissions("system:competitionOfTeam:remove")
@Log(title = "赛会中-参赛队伍", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java
View File

@@ -50,7 +50,7 @@ public class CompetitionResultController extends BaseController
/**
* 查询赛会中-赛程结果记录列表
*/
@RequiresPermissions("system:competitionResult:list")
// @RequiresPermissions("system:competitionResult:list")
@GetMapping("/list")
public TableDataInfo list(CompetitionResult competitionResult)
{
@@ -62,7 +62,7 @@ public class CompetitionResultController extends BaseController
/**
* 导出赛会中-赛程结果记录列表
*/
@RequiresPermissions("system:competitionResult:export")
// @RequiresPermissions("system:competitionResult:export")
@Log(title = "赛会中赛程结果记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CompetitionResult competitionResult)
@@ -75,7 +75,7 @@ public class CompetitionResultController extends BaseController
/**
* 获取赛会中-赛程结果记录详细信息
*/
@RequiresPermissions("system:competitionResult:query")
// @RequiresPermissions("system:competitionResult:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -85,7 +85,7 @@ public class CompetitionResultController extends BaseController
/**
* 新增赛会中-赛程结果记录
*/
@RequiresPermissions("system:competitionResult:add")
// @RequiresPermissions("system:competitionResult:add")
@Log(title = "赛会中赛程结果记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CompetitionResult competitionResult)
@@ -96,21 +96,21 @@ public class CompetitionResultController extends BaseController
/**
* 修改赛会中-赛程结果记录
*/
@RequiresPermissions("system:competitionResult:edit")
// @RequiresPermissions("system:competitionResult:edit")
@Log(title = "赛会中赛程结果记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CompetitionResult competitionResult)
{
return toAjax(competitionResultService.updateCompetitionResult(competitionResult));
}
@RequiresPermissions("system:competitionResult:batchEdit")
// @RequiresPermissions("system:competitionResult:batchEdit")
@Log(title = "赛会中批量保存赛程结果记录", businessType = BusinessType.UPDATE)
@PutMapping("/batchEdit")
public AjaxResult batchEdit(@RequestBody List<CompetitionResult> list)
{
return toAjax(competitionResultService.batchUpdateCompetitionResult(list));
}
@RequiresPermissions("system:competitionResult:editData")
// @RequiresPermissions("system:competitionResult:editData")
@Log(title = "赛会中保存赛程结果记录2", businessType = BusinessType.UPDATE)
@PutMapping("/editData")
public AjaxResult editData(@RequestBody CompetitionVsRecordVo obj)
@@ -121,7 +121,7 @@ public class CompetitionResultController extends BaseController
/**
* 删除赛会中-赛程结果记录
*/
@RequiresPermissions("system:competitionResult:remove")
// @RequiresPermissions("system:competitionResult:remove")
@Log(title = "赛会中赛程结果记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamGroupController.java
View File

@@ -50,7 +50,7 @@ public class CompetitionTeamGroupController extends BaseController
/**
* 查询赛会中-分组列表
*/
@RequiresPermissions("system:competitionTeamGroup:list")
// @RequiresPermissions("system:competitionTeamGroup:list")
@GetMapping("/list")
public TableDataInfo list(CompetitionTeamGroup competitionTeamGroup)
{
@@ -75,7 +75,7 @@ public class CompetitionTeamGroupController extends BaseController
/**
* 获取赛会中-分组详细信息
*/
@RequiresPermissions("system:competitionTeamGroup:query")
// @RequiresPermissions("system:competitionTeamGroup:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -85,7 +85,7 @@ public class CompetitionTeamGroupController extends BaseController
/**
* 新增赛会中-分组
*/
@RequiresPermissions("system:competitionTeamGroup:add")
// @RequiresPermissions("system:competitionTeamGroup:add")
@Log(title = "赛会中-分组", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CompetitionTeamGroup competitionTeamGroup)
@@ -96,7 +96,7 @@ public class CompetitionTeamGroupController extends BaseController
/**
* 修改赛会中-分组
*/
@RequiresPermissions("system:competitionTeamGroup:edit")
// @RequiresPermissions("system:competitionTeamGroup:edit")
@Log(title = "赛会中-分组", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CompetitionTeamGroup competitionTeamGroup)
@@ -113,7 +113,7 @@ public class CompetitionTeamGroupController extends BaseController
/**
* 删除赛会中-分组
*/
@RequiresPermissions("system:competitionTeamGroup:remove")
// @RequiresPermissions("system:competitionTeamGroup:remove")
@Log(title = "赛会中-分组", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java
View File

@@ -42,7 +42,7 @@ public class CompetitionTeamVsTeamController extends BaseController
/**
* 查询赛会中-球队VS球队关系列表
*/
@RequiresPermissions("system:competitionTeamVsTeam:list")
// @RequiresPermissions("system:competitionTeamVsTeam:list")
@GetMapping("/list")
public TableDataInfo list(CompetitionTeamVsTeam competitionTeamVsTeam)
{
@@ -67,7 +67,7 @@ public class CompetitionTeamVsTeamController extends BaseController
/**
* 获取赛会中-球队VS球队关系详细信息
*/
@RequiresPermissions("system:competitionTeamVsTeam:query")
// @RequiresPermissions("system:competitionTeamVsTeam:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -77,7 +77,7 @@ public class CompetitionTeamVsTeamController extends BaseController
/**
* 新增赛会中-球队VS球队关系
*/
@RequiresPermissions("system:competitionTeamVsTeam:add")
// @RequiresPermissions("system:competitionTeamVsTeam:add")
@Log(title = "赛会中球队VS球队关系", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CompetitionTeamVsTeam competitionTeamVsTeam)
@@ -88,7 +88,7 @@ public class CompetitionTeamVsTeamController extends BaseController
/**
* 修改赛会中-球队VS球队关系
*/
@RequiresPermissions("system:competitionTeamVsTeam:edit")
// @RequiresPermissions("system:competitionTeamVsTeam:edit")
@Log(title = "赛会中球队VS球队关系", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CompetitionTeamVsTeam competitionTeamVsTeam)
@@ -99,7 +99,7 @@ public class CompetitionTeamVsTeamController extends BaseController
/**
* 删除赛会中-球队VS球队关系
*/
@RequiresPermissions("system:competitionTeamVsTeam:remove")
// @RequiresPermissions("system:competitionTeamVsTeam:remove")
@Log(title = "赛会中球队VS球队关系", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionVsController.java
View File

@@ -33,7 +33,7 @@ public class CompetitionVsController extends BaseController {
/**
* 查询约战列表
*/
@RequiresPermissions("system:vs:list")
// @RequiresPermissions("system:vs:list")
@GetMapping("/list")
public TableDataInfo list(Competition competition)
{
@@ -58,7 +58,7 @@ public class CompetitionVsController extends BaseController {
/**
* 获取约战详细信息
*/
@RequiresPermissions("system:vs:query")
// @RequiresPermissions("system:vs:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -68,7 +68,7 @@ public class CompetitionVsController extends BaseController {
/**
* 新增约战
*/
@RequiresPermissions("system:vs:add")
// @RequiresPermissions("system:vs:add")
@Log(title = "约战", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Competition competition)
@@ -79,7 +79,7 @@ public class CompetitionVsController extends BaseController {
/**
* 修改约战
*/
@RequiresPermissions("system:vs:edit")
// @RequiresPermissions("system:vs:edit")
@Log(title = "约战", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Competition competition)
@@ -90,7 +90,7 @@ public class CompetitionVsController extends BaseController {
/**
* 删除约战
*/
@RequiresPermissions("system:vs:remove")
// @RequiresPermissions("system:vs:remove")
@Log(title = "约战", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)

43
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
View File

@@ -5,6 +5,9 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.system.api.domain.LoginMethodEnum;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -15,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
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.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.constant.UserConstants;
@@ -158,9 +162,41 @@ public class SysUserController extends BaseController
* @return 用户信息
*/
@GetMapping("getInfo")
public AjaxResult getInfo()
public AjaxResult getInfo(@RequestParam(value = "userId", required = false) Long userId)
{
SysUser user = userService.selectUserById(SecurityUtils.getUserId());
String permission = null;
if(userId == null){
userId = SecurityUtils.getUserId();
}else {
LoginUser user = SecurityUtils.getLoginUser();
if(ObjectUtil.isNotNull(user.getLoginMethod()) && user.getRoles().contains("common")
&&user.getLoginMethod().equals(LoginMethodEnum.WX_SCAN.getCode())){
permission = "*:*:*";
}
}
SysUser user = userService.selectUserById(userId);
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
if(ObjectUtil.isNotNull(permission)){
permissions.add(permission);
}
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
return ajax;
}
/**
* 获取用户信息
*
* @return 用户信息
*/
@GetMapping("getWxScanInfo")
public AjaxResult getWxScanInfo(@RequestParam("userId") Long userId)
{
SysUser user = userService.selectUserById(userId);
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
@@ -171,13 +207,12 @@ public class SysUserController extends BaseController
ajax.put("permissions", permissions);
return ajax;
}
/**
* 根据用户编号获取详细信息
*/
@RequiresPermissions("system:user:query")
@GetMapping(value = { "/", "/{userId}" })
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
public AjaxResult getUserInfo(@PathVariable(value = "userId", required = false) Long userId)
{
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();

12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxApplesCodeController.java
View File

@@ -5,8 +5,11 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
import com.ruoyi.system.service.WxApplesCodeService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -27,6 +30,7 @@ public class WxApplesCodeController extends BaseController {
{
return AjaxResult.success(wxApplesCodeService.getWxApplesAccessToken());
}
@ApiOperation(ApiTerminal.wxMiniProgram+"生成微信小程序二维码")
@RequiresPermissions("system:wxApplesCode:genWxApplesAqrCode")
@Log(title = "生成微信小程序二维码", businessType = BusinessType.OTHER)
@PostMapping("/genWxApplesAqrCode")
@@ -34,4 +38,12 @@ public class WxApplesCodeController extends BaseController {
{
return AjaxResult.success(wxApplesCodeService.genWxApplesAqrCode(wxAppletsCodeVo));
}
@ApiOperation(ApiTerminal.pc+"生成微信扫码登录二维码")
@Log(title = ApiTerminal.pc+"生成微信扫码登录二维码", businessType = BusinessType.OTHER)
@PostMapping("/genWxApplesAqrCodeForPc")
public AjaxResult genWxApplesAqrCodeForPc(@RequestBody WxAppletsCodeVo wxAppletsCodeVo)
{
return AjaxResult.success(wxApplesCodeService.genWxApplesAqrCodeForPc(wxAppletsCodeVo));
}
}

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBuildingInfoController.java
View File

@@ -48,7 +48,7 @@ public class WxBuildingInfoController extends BaseController
/**
* 查询球场管理列表
*/
@RequiresPermissions("system:WxBuilding:list")
// @RequiresPermissions("system:WxBuilding:list")
@GetMapping("/list")
public TableDataInfo list(WxBuildingInfo wxBuildingInfo)
{

11
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxLoginController.java
View File

@@ -38,6 +38,17 @@ public class WxLoginController {
return AjaxResult.success(loginUser);
}
@ApiOperation(ApiTerminal.wxMiniProgram+"微信扫码登录")
@PostMapping("/wxScanLogin")
@ResponseBody
public AjaxResult wxScanLogin(@RequestBody WxLoginRequest entity) throws Exception {
// WxLoginUser loginUser = wxLoginService.loginInFromWx(entity);
WxLoginUser loginUser = new WxLoginUser();
loginUser.setUserId(1L);
loginUser.setLoginName("test");
loginUser.setAccessToken("sfsdfsdf");
return AjaxResult.success(loginUser);
}
@PostMapping("/user/register")
@ApiOperation(value = ApiTerminal.wxMiniProgram+"用户注册接口")

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionSharePermissions.java
View File

@@ -26,6 +26,8 @@ public class CompetitionSharePermissions extends BaseEntity
/** 赛事id(competition的ID) */
@Excel(name = "赛事id(competition的ID)")
private Long competitionId;
@Excel(name = "赛会创建人ID")
private Long competitionOwnId;
/** 用户ID */
@Excel(name = "用户ID")

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@@ -2,6 +2,8 @@ package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.WxUser;
/**
* 用户 业务层
@@ -203,4 +205,6 @@ public interface ISysUserService
* @return 结果
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
SysUser wxScanUserAdd(WxUser wxUser);
}

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java
View File

@@ -62,4 +62,6 @@ public interface IWxUserService extends IService<WxUser>
public int deleteWxUserById(Long id);
WxUser getUserInfoBy(WxUser wxUser);
WxUser selectWxUserByOpenId(String username);
}

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/WxApplesCodeService.java
View File

@@ -17,4 +17,6 @@ public interface WxApplesCodeService {
String getWxApplesAccessToken();
WxAppletsCodeVo genWxApplesAqrCode(WxAppletsCodeVo wxAppletsCodeVo);
WxAppletsCodeVo genWxApplesAqrCodeForPc(WxAppletsCodeVo wxAppletsCodeVo);
}

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,7 +37,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService
{
Set<String> roles = new HashSet<String>();
// 管理员拥有所有权限
if (user.isAdmin())
if (Objects.nonNull(user.isAdmin())&&user.isAdmin())
{
roles.add("admin");
}

32
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@@ -1,9 +1,14 @@
package com.ruoyi.system.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
import com.alibaba.fastjson.JSON;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.WxUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -538,4 +543,31 @@ public class SysUserServiceImpl implements ISysUserService
return successMsg.toString();
}
@Override
public SysUser wxScanUserAdd(WxUser wxUser) {
log.info("wxScanUserAdd wxUser: {}", JSON.toJSONString(wxUser));
String openid = wxUser.getOpenid();
SysUser sysUser = userMapper.selectUserByUserName(openid);
if (StringUtils.isNull(sysUser))
{
Date date = new Date();
sysUser = new SysUser();
sysUser.setNickName("微信用户");
sysUser.setUserName(openid);
sysUser.setStatus("0");
sysUser.setDelFlag("0");
sysUser.setLoginDate(date);
sysUser.setCreateBy("system");
sysUser.setCreateTime(date);
sysUser.setRemark("微信扫码登录用户");
//设置刚刚
Long[] postIds = {4L};
sysUser.setPostIds(postIds);
Long[] roleIds = {2L};
sysUser.setRoleIds(roleIds);
this.insertUser(sysUser);
}
return sysUser;
}
}

87
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxApplesCodeServiceImpl.java
View File

@@ -7,6 +7,7 @@ import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
import com.ruoyi.system.service.WxApplesCodeService;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -28,6 +29,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -130,6 +132,7 @@ public class WxApplesCodeServiceImpl implements WxApplesCodeService {
outputStream.write(buf, 0, len);
}
outputStream.flush();
wxAppletsCodeVo.setBytesBase64(result);
wxAppletsCodeVo.setCodeImgUrl(domainName+xdpath);
return wxAppletsCodeVo;
@@ -151,7 +154,89 @@ public class WxApplesCodeServiceImpl implements WxApplesCodeService {
}
}
}
System.out.println("获取二维码");
return wxAppletsCodeVo;
}
@Override
public WxAppletsCodeVo genWxApplesAqrCodeForPc(WxAppletsCodeVo wxAppletsCodeVo) {
if(restTemplate==null){
restTemplate = new RestTemplate();
}
InputStream inputStream = null;
OutputStream outputStream = null;
//根据APPid和密钥获取存取令牌
try {
String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + this.getWxApplesAccessToken();
//定义生产二维码所需的参数、样式
Map<String, Object> param = new HashMap<>();
param.put("scene", wxAppletsCodeVo.getScene());
param.put("page", wxAppletsCodeVo.getPage());
param.put("check_path",wxAppletsCodeVo.getCheckPath()==null?Boolean.FALSE:wxAppletsCodeVo.getCheckPath());
if(wxAppletsCodeVo.getEnvVersion()!=null&&!StringUtils.isEmpty(wxAppletsCodeVo.getEnvVersion())){
param.put("env_version",wxAppletsCodeVo.getEnvVersion());
}
param.put("width", org.apache.commons.lang3.StringUtils.isEmpty(wxAppletsCodeVo.getPage())?10:wxAppletsCodeVo.getPage());
param.put("auto_color", wxAppletsCodeVo.getAutoColor()==null?false:wxAppletsCodeVo.getAutoColor());
param.put("is_hyaline",wxAppletsCodeVo.getIsHyaline()==null?false:wxAppletsCodeVo.getIsHyaline());
Map<String, Object> line_color = new HashMap<>();
line_color.put("r", 0);
line_color.put("g", 0);
line_color.put("b", 0);
param.put("line_color", line_color);
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
HttpEntity requestEntity = new HttpEntity(param, headers);
// System.out.println("协议请求头"+headers+""+requestEntity);
ResponseEntity<byte[]> entity = restTemplate.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
// LOG.info("调用小程序生成微信永久小程序码URL接口返回结果:" + entity.getBody());
// System.out.println("返回结果"+entity.getBody()+".."+entity);
byte[] result = entity.getBody();
// inputStream = new ByteArrayInputStream(result);
//// 生成随机数命名图片
// String filename = UUID.randomUUID().toString();
// // System.out.println(filename);
// Date date = new Date();
// String time = new SimpleDateFormat("yyyy-MM-dd").format(date);
// String[] str = time.split("-");//根据‘-’进行拆分字符串 拆分出来的日期有，年，日，月，根据年日月创建文件夹
// String datePath="/"+str[0]+"/"+str[1]+"/"+str[2]+"/";
// //创建文件夹
// String xdpath = datePath+filename+".png";
// String filePath = linuxLocation+datePath+filename+".png";
//// 服务器存放位置
// File file = new File(filePath);
// //文件目录不存在需要先创建
// if(!file.getParentFile().exists()){
// file.getParentFile().mkdirs();
// }
// outputStream = new FileOutputStream(file);
// int len = 0;
// byte[] buf = new byte[1024];
// while ((len = inputStream.read(buf, 0, 1024)) != -1) {
// outputStream.write(buf, 0, len);
// }
// outputStream.flush();
wxAppletsCodeVo.setBytesBase64(result);
// wxAppletsCodeVo.setCodeImgUrl(domainName+xdpath);
wxAppletsCodeVo.setBase64(new String(Objects.requireNonNull(Base64.encodeBase64(result))));
return wxAppletsCodeVo;
} catch (Exception e) {
log.error("调用小程序生成微信永久小程序码URL接口异常", e);
} finally {
if (inputStream != null) {
try {
inputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (outputStream != null) {
try {
outputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return wxAppletsCodeVo;
}
}

45
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxLoginServiceImpl.java
View File

@@ -1,9 +1,14 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.domain.LoginMethodEnum;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.model.WxLoginUser;
@@ -13,6 +18,8 @@ import com.ruoyi.system.domain.enums.UserRoles;
import com.ruoyi.system.domain.vo.WxLoginRequest;
import com.ruoyi.system.mapper.UserRoleMapper;
import com.ruoyi.system.mapper.WxUserMapper;
import com.ruoyi.system.service.ISysPermissionService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.WxLoginService;
import com.ruoyi.system.utils.jwt.JwtUtil;
import org.apache.http.HttpEntity;
@@ -32,6 +39,7 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -45,6 +53,15 @@ public class WxLoginServiceImpl implements WxLoginService {
private WxUserMapper wxUserMapper;
@Autowired
private UserRoleMapper userRoleMapper;
@Autowired
private ISysUserService sysUserService;
@Autowired
private TokenService tokenService;
@Autowired
private RedisService redisService;
@Autowired
private ISysPermissionService permissionService;
private Long wxScanExpireTime= CacheConstants.WX_SCAN_EXPIRE_TIME;
@Override
public WxLoginUser loginInFromWx(WxLoginRequest entity) {
//获取openId
@@ -350,6 +367,34 @@ public class WxLoginServiceImpl implements WxLoginService {
loginUser.setUsername(login.getOpenid());
loginUser.setRoles(codes);
loginUser.setSysUser(sysUser);
//判断是否是微信扫码登录；如果是需要判断是否存在账号在system_user表中，如果不存在则创建账号，权限
if(!StringUtils.isEmpty(entity.getLoginMethod()) &&LoginMethodEnum.WX_SCAN.getCode().equals(entity.getLoginMethod())){
SysUser sysUser1 = sysUserService.wxScanUserAdd(login);
// 角色集合
Set<String> roles = permissionService.getRolePermission(sysUser1);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(sysUser1);
LoginUser sysUserVo = new LoginUser();
sysUserVo.setSysUser(sysUser1);
sysUserVo.setRoles(roles);
sysUserVo.setUserid(sysUser1.getUserId());
sysUserVo.setUsername(sysUser1.getUserName());
sysUserVo.setPermissions(permissions);
sysUserVo.setLoginMethod(entity.getLoginMethod());
Map<String, Object> map = tokenService.createToken(sysUserVo);
//设置到缓存里面
redisService.setCacheObject(getCacheKey(entity.getToken()), JSON.toJSONString(map), wxScanExpireTime, TimeUnit.MINUTES);
}
return loginUser;
}
/**
* 扫码登录账状态验证缓存键名
*
* @param checkCode 临时变量
* @return 缓存键key
*/
private String getCacheKey(String checkCode)
{
return CacheConstants.WX_SCAN_LOGIN_CHECK_KEY + checkCode;
}
}

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java
View File

@@ -97,4 +97,9 @@ public class WxUserServiceImpl extends ServiceImpl<WxUserMapper, WxUser> impleme
public WxUser getUserInfoBy(WxUser wxUser) {
return wxUserMapper.getUserInfoBy(wxUser);
}
@Override
public WxUser selectWxUserByOpenId(String username) {
return wxUserMapper.selectByOpenId(username);
}
}

8
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionSharePermissionsMapper.xml
View File

@@ -17,17 +17,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="isDeleted" column="is_deleted" />
<result property="remark" column="remark" />
<result property="competitionOwnId" column="competition_own_id" />
<result property="canSetType" column="can_set_type" />
</resultMap>
<sql id="selectCompetitionSharePermissionsVo">
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
select id, create_time, competition_id,competition_own_id, user_id, user_tel, user_name, status, update_time, create_by, update_by, is_deleted, remark, can_set_type from competition_share_permissions
</sql>
<select id="selectCompetitionSharePermissionsList" parameterType="com.ruoyi.system.domain.CompetitionSharePermissions" resultMap="CompetitionSharePermissionsResult">
<include refid="selectCompetitionSharePermissionsVo"/>
<where>
<if test="competitionId != null "> and competition_id = #{competitionId}</if>
<if test="competitionOwnId != null "> and competition_own_id = #{competitionOwnId}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="userTel != null and userTel != ''"> and user_tel = #{userTel}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
@@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDeleted != null">is_deleted,</if>
<if test="remark != null">remark,</if>
<if test="canSetType != null">can_set_type,</if>
<if test="competitionOwnId != null">competition_own_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="createTime != null">#{createTime},</if>
@@ -71,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDeleted != null">#{isDeleted},</if>
<if test="remark != null">#{remark},</if>
<if test="canSetType != null">#{canSetType},</if>
<if test="competitionOwnId != null">#{competitionOwnId},</if>
</trim>
</insert>
@@ -89,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDeleted != null">is_deleted = #{isDeleted},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="canSetType != null">can_set_type = #{canSetType},</if>
<if test="competitionOwnId != null">competition_own_id = #{competitionOwnId},</if>
</trim>
where id = #{id}
</update>
@@ -114,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null "> and status = #{status}</if>
<if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
<if test="canSetType != null and canSetType != ''"> and can_set_type = #{canSetType}</if>
<if test="competitionOwnId != null "> and competition_own_id = #{competitionOwnId}</if>
</where>
</select>
</mapper>

2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
View File

@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
limit 1
</select>
<insert id="insertWxUser" parameterType="com.ruoyi.system.domain.WxUser" useGeneratedKeys="true" keyProperty="id">
<insert id="insertWxUser" parameterType="com.ruoyi.system.domain.WxUser" useGeneratedKeys="true" keyProperty="id">
insert into user_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="isDeleted != null">IS_DELETED,</if>