CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/admin' into preview

master
Diyu0904 2025-02-22 15:07:06 +08:00
parent 303999e3e7 1f584d5e9d
commit 59b59a06f8
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java
View File

@ -34,7 +34,7 @@ public class SysUserAttentionController {
@ApiOperation(value = "添加/取消关注")
@RepeatSubmit
@GetMapping("/addAttention")
public R<Boolean> addAttention(@RequestParam Long userId) {
public R addAttention(@RequestParam Long userId) {
return sysUserAttentionService.addAttention(userId);
@ -73,8 +73,8 @@ public class SysUserAttentionController {
* @return
*/
@ApiOperation(value = "查询关注列表")
@PostMapping("/selectAttention")
public R<PageInfo<SysUser>> selectAttention(@RequestBody PageVo pageVo){
@PostMapping("/selectAttentionList")
public R<PageInfo<SysUser>> selectAttentionList(@RequestBody PageVo pageVo){
PageInfo<SysUser> sysUserList = sysUserAttentionService.selectAttentionPage(pageVo);

3
mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java
View File

@ -157,7 +157,8 @@ public class SecurityConfig {
"/attention/selectToAttention",
"/WorkFlowVersion/selectVersionByWorkId",
"/memberLevel/list",
"/memberLevel/getMemberBenefitList"
"/memberLevel/getMemberBenefitList",
"/attention/selectAttention"
).permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

4
mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java
View File

@ -2,10 +2,8 @@ package com.mcwl.resource.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.resource.domain.SysAdvice;
import com.mcwl.resource.domain.SysUserAttention;
import com.mcwl.resource.domain.SysUserInfo;
import com.mcwl.resource.domain.vo.PageVo;
@ -18,7 +16,7 @@ import com.mcwl.resource.domain.vo.PageVo;
*/
public interface SysUserAttentionService extends IService<SysUserAttention> {
R<Boolean> addAttention(Long userId);
R addAttention(Long userId);
Boolean selectAttention(Long userId);

12
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java
View File

@ -11,7 +11,10 @@ import com.mcwl.resource.domain.SysAdvice;
import com.mcwl.resource.domain.SysUserAttention;
import com.mcwl.resource.domain.SysUserInfo;
import com.mcwl.resource.domain.vo.PageVo;
import com.mcwl.resource.mapper.*;
import com.mcwl.resource.mapper.ModelImageMapper;
import com.mcwl.resource.mapper.ModelMapper;
import com.mcwl.resource.mapper.SysUserAttentionMapper;
import com.mcwl.resource.mapper.WorkFlowMapper;
import com.mcwl.resource.service.SysUserAttentionService;
import com.mcwl.system.domain.enums.AdviceEnum;
import com.mcwl.system.mapper.SysUserMapper;
@ -50,7 +53,12 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
private SysUserMapper sysUserMapper;
@Override
public R<Boolean> addAttention(Long userId) {
public R addAttention(Long userId) {
if ( userId.equals(SecurityUtils.getUserId())){
return R.ok("不能对自己操作");
}
//查看是否已关注
Boolean aBoolean = selectAttention(userId);