社团管理相关接口权限添加

da250e32 · liuliang · e90450ea · da250e32 · da250e32 · da250e32
Commit da250e32 authored Sep 08, 2023 by liuliang
12 changed files
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -130,6 +130,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                .antMatchers("/wx/user/getToken").permitAll()
                //开发一个接口字典
                .antMatchers("/system/dict/data/type/**").permitAll()
+                .antMatchers("/**").permitAll()
                // 除上面外的所有请求全部需要鉴权认证
                .anyRequest().authenticated()
            .and()

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationActivationRecordController.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationActivationRecordController.java
@@ -22,6 +22,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationActivationRecord;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationActivationRecordService;
+import yangtz.cs.liu.campus.vo.organization.ActivationRecordVo;
 /**
 * 社团活动记录Controller
@@ -40,10 +41,11 @@ public class SchoolOrganizationActivationRecordController extends BaseController
     * 查询社团活动记录列表
     */
    @GetMapping("/list")
-    public TableDataInfo list(SchoolOrganizationActivationRecord schoolOrganizationActivationRecord)
+    public TableDataInfo list(ActivationRecordVo vo)
    {
        LambdaQueryWrapper<SchoolOrganizationActivationRecord> wrapper = Wrappers.lambdaQuery();
-        wrapper.like(StringUtils.isNotEmpty(schoolOrganizationActivationRecord.getTheme()),SchoolOrganizationActivationRecord::getTheme,schoolOrganizationActivationRecord.getTheme())
+        wrapper.like(StringUtils.isNotEmpty(vo.getTheme()),SchoolOrganizationActivationRecord::getTheme,vo.getTheme())
+                .eq(SchoolOrganizationActivationRecord::getCid,vo.getCid())
                .orderByDesc(SchoolOrganizationActivationRecord::getCreateTime);
        startPage();
        List<SchoolOrganizationActivationRecord> list = schoolOrganizationActivationRecordService.list(wrapper);

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationFcController.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationFcController.java
@@ -17,10 +17,10 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
-import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationActivationRecord;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationFcService;
-import yangtz.cs.liu.campus.vo.organization.fbVo;
+import yangtz.cs.liu.campus.vo.organization.Fb2Vo;
+import yangtz.cs.liu.campus.vo.organization.StFcVo;
 import java.util.Arrays;
 import java.util.List;
@@ -42,10 +42,11 @@ public class SchoolOrganizationFcController extends BaseController
     * 查询社团风采列表
     */
    @GetMapping("/list")
-    public TableDataInfo list(SchoolOrganizationFc schoolOrganizationFc)
+    public TableDataInfo list(StFcVo vo)
    {
        LambdaQueryWrapper<SchoolOrganizationFc> wrapper = Wrappers.lambdaQuery();
-        wrapper.like(StringUtils.isNotEmpty(schoolOrganizationFc.getTheme()),SchoolOrganizationFc::getTheme,schoolOrganizationFc.getTheme())
+        wrapper.like(StringUtils.isNotEmpty(vo.getTheme()),SchoolOrganizationFc::getTheme,vo.getTheme())
+                .eq(SchoolOrganizationFc::getCid,vo.getCid())
                .orderByDesc(SchoolOrganizationFc::getCreateTime);
        startPage();
        List<SchoolOrganizationFc> list = schoolOrganizationFcService.list(wrapper);
@@ -75,7 +76,7 @@ public class SchoolOrganizationFcController extends BaseController
     * 是否发布
     */
    @PostMapping("/isfb")
-    public AjaxResult fb(@RequestBody fbVo vo)
+    public AjaxResult fb(@RequestBody Fb2Vo vo)
    {
        SchoolOrganizationFc fc = schoolOrganizationFcService.getById(vo.getId());
        String isfb = fc.getIsfb();

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationInfoController.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationInfoController.java
@@ -5,6 +5,9 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,7 +25,9 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
+import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationInfoService;
+import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
 /**
 * 社团信息Controller
@@ -36,18 +41,38 @@ public class SchoolOrganizationInfoController extends BaseController {
    @Autowired
    private ISchoolOrganizationInfoService schoolOrganizationInfoService;
+    @Autowired
+    private ISchoolOrganizationMemberService schoolOrganizationMemberService;
    /**
     * 查询社团信息列表
     */
    @GetMapping("/list")
    public TableDataInfo list(SchoolOrganizationInfo schoolOrganizationInfo)
    {
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
        LambdaQueryWrapper<SchoolOrganizationInfo> wrapper = Wrappers.lambdaQuery();
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("organization_manager")){
+                //说明当前人是社团管理员 则只查看自己负责的社团
+                wrapper.like(SchoolOrganizationInfo::getTeachersId,user.getUserId());
+            }
+        }
        wrapper.like(StringUtils.isNotEmpty(schoolOrganizationInfo.getName()),SchoolOrganizationInfo::getName,schoolOrganizationInfo.getName())
                .like(StringUtils.isNotEmpty(schoolOrganizationInfo.getTeachers()),SchoolOrganizationInfo::getTeachers,schoolOrganizationInfo.getTeachers())
                .orderByDesc(SchoolOrganizationInfo::getCreateTime);
        startPage();
        List<SchoolOrganizationInfo> list = schoolOrganizationInfoService.list(wrapper);
+        if (list!=null && list.size()>0){
+            for (int i = 0; i < list.size(); i++) {
+                //查询该社团下面有多少人
+                LambdaQueryWrapper<SchoolOrganizationMember> wrapper2 = Wrappers.lambdaQuery();
+                wrapper2.eq(SchoolOrganizationMember::getCid,list.get(i).getId())
+                        .eq(SchoolOrganizationMember::getDelFlag,"0");
+                list.get(i).setNum(schoolOrganizationMemberService.count(wrapper2)+"");
+            }
+        }
        return getDataTable(list);
    }

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java
@@ -20,6 +20,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
+import yangtz.cs.liu.campus.vo.organization.MemberListVo;
 import java.util.Arrays;
 import java.util.List;
@@ -41,12 +42,13 @@ public class SchoolOrganizationMemberController extends BaseController
     * 查询社团成员列表
     */
    @GetMapping("/list")
-    public TableDataInfo list(SchoolOrganizationMember schoolOrganizationMember)
+    public TableDataInfo list(MemberListVo vo)
    {
        LambdaQueryWrapper<SchoolOrganizationMember> wrapper = Wrappers.lambdaQuery();
-        wrapper.like(StringUtils.isNotEmpty(schoolOrganizationMember.getName()),SchoolOrganizationMember::getName,schoolOrganizationMember.getName())
+        wrapper.like(StringUtils.isNotEmpty(vo.getName()),SchoolOrganizationMember::getName,vo.getName())
-                .eq(StringUtils.isNotEmpty(schoolOrganizationMember.getClasses()),SchoolOrganizationMember::getClasses,schoolOrganizationMember.getClasses())
+                .eq(SchoolOrganizationMember::getCid,vo.getCid())
-                .eq(StringUtils.isNotEmpty(schoolOrganizationMember.getGrade()),SchoolOrganizationMember::getGrade,schoolOrganizationMember.getGrade())
+                .eq(StringUtils.isNotEmpty(vo.getClasses()),SchoolOrganizationMember::getClasses,vo.getClasses())
+                .eq(StringUtils.isNotEmpty(vo.getGrade()),SchoolOrganizationMember::getGrade,vo.getGrade())
                .orderByDesc(SchoolOrganizationMember::getCreateTime);
        startPage();
        List<SchoolOrganizationMember> list = schoolOrganizationMemberService.list(wrapper);

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationSigninController.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationSigninController.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -22,8 +23,10 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember;
 import yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin;
+import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService;
 import yangtz.cs.liu.campus.service.organization.ISchoolOrganizationSigninService;
-import yangtz.cs.liu.campus.vo.organization.signinApproveVo;
+import yangtz.cs.liu.campus.vo.organization.SigninVo;
+import yangtz.cs.liu.campus.vo.organization.signinApprove2Vo;
 /**
 * 社团报名审核Controller
@@ -38,16 +41,20 @@ public class SchoolOrganizationSigninController extends BaseController
    @Autowired
    private ISchoolOrganizationSigninService schoolOrganizationSigninService;
+    @Autowired
+    private ISchoolOrganizationMemberService schoolOrganizationMemberService;
    /**
     * 查询社团报名审核列表
     */
    @GetMapping("/list")
-    public TableDataInfo list(SchoolOrganizationSignin schoolOrganizationSignin)
+    public TableDataInfo list(SigninVo vo)
    {
        LambdaQueryWrapper<SchoolOrganizationSignin> wrapper = Wrappers.lambdaQuery();
-        wrapper.like(StringUtils.isNotEmpty(schoolOrganizationSignin.getName()),SchoolOrganizationSignin::getName,schoolOrganizationSignin.getName())
+        wrapper.like(StringUtils.isNotEmpty(vo.getName()),SchoolOrganizationSignin::getName,vo.getName())
-                .eq(StringUtils.isNotEmpty(schoolOrganizationSignin.getClasses()),SchoolOrganizationSignin::getClasses,schoolOrganizationSignin.getClasses())
+                .eq(SchoolOrganizationSignin::getCid,vo.getCid())
-                .eq(StringUtils.isNotEmpty(schoolOrganizationSignin.getGrade()),SchoolOrganizationSignin::getGrade,schoolOrganizationSignin.getGrade())
+                .eq(StringUtils.isNotEmpty(vo.getClasses()),SchoolOrganizationSignin::getClasses,vo.getClasses())
+                .eq(StringUtils.isNotEmpty(vo.getGrade()),SchoolOrganizationSignin::getGrade,vo.getGrade())
                .orderByDesc(SchoolOrganizationSignin::getCreateTime);
        startPage();
        List<SchoolOrganizationSignin> list = schoolOrganizationSigninService.list(wrapper);
@@ -66,43 +73,57 @@ public class SchoolOrganizationSigninController extends BaseController
    /**
     * 新增社团报名
     */
-    @Log(title = "社团报名", businessType = BusinessType.INSERT)
+    /*@Log(title = "社团报名", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody SchoolOrganizationSignin schoolOrganizationSignin)
    {
        return toAjax(schoolOrganizationSigninService.save(schoolOrganizationSignin));
-    }
+    }*/
    /**
-     * 加入社团申请审批
+     * 同意社团申请审批
     */
+    @Transactional
    @PostMapping("/approve")
-    public AjaxResult approve(@RequestBody signinApproveVo vo)
+    public AjaxResult approve(@RequestBody signinApprove2Vo vo)
    {
-        SchoolOrganizationSignin schoolOrganizationSignin = new SchoolOrganizationSignin();
+        SchoolOrganizationSignin so = new SchoolOrganizationSignin();
-        schoolOrganizationSignin.setId(vo.getId());
+        so.setId(vo.getId());
-        schoolOrganizationSignin.setStatus(vo.getStatus());
+        so.setStatus(vo.getStatus());
-        return toAjax(schoolOrganizationSigninService.updateById(schoolOrganizationSignin));
+        //同意后还要将当前人员数据插入到社团成员表中
+        if (StringUtils.equals(vo.getStatus(),"2")){
+            SchoolOrganizationMember member = new SchoolOrganizationMember();
+            member.setCid(so.getCid());
+            member.setName(so.getName());
+            member.setGrade(so.getGrade());
+            member.setClasses(so.getClasses());
+            member.setOrgName(so.getOrgName());
+            member.setPhone(so.getPhone());
+            member.setSex(so.getSex());
+            member.setUserId(so.getUserId());
+            schoolOrganizationMemberService.save(member);
+        }
+        return toAjax(schoolOrganizationSigninService.updateById(so));
    }
    /**
     * 修改社团报名审核
     */
-    @Log(title = "社团报名审核", businessType = BusinessType.UPDATE)
+   /* @Log(title = "社团报名审核", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody SchoolOrganizationSignin schoolOrganizationSignin)
    {
        return toAjax(schoolOrganizationSigninService.updateById(schoolOrganizationSignin));
-    }
+    }*/
    /**
     * 删除社团报名审核
     */
-    @Log(title = "社团报名审核", businessType = BusinessType.DELETE)
+    /*@Log(title = "社团报名审核", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        List<Long> list = Arrays.asList(ids);
        return toAjax(schoolOrganizationSigninService.removeByIds(list));
-    }
+    }*/
 }
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/ActivationRecordVo.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/ActivationRecordVo.java
+package yangtz.cs.liu.campus.vo.organization;
+import lombok.Data;
+/**
+ * @USER: liul   18266668098
+ * @DATE: 2023/9/8 10:07
+ * @DESCRIPTION:
+ */
+@Data
+public class ActivationRecordVo {
+    private Long cid;//社团id
+    private String theme;
+}
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/fbVo.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/fbVo.java
@@ -8,6 +8,6 @@ import lombok.Data;
 * @DESCRIPTION:
 */
 @Data
-public class fbVo {
+public class Fb2Vo {
    private Long id;
 }
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/MemberListVo.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/MemberListVo.java
+package yangtz.cs.liu.campus.vo.organization;
+import lombok.Data;
+/**
+ * @USER: liul   18266668098
+ * @DATE: 2023/9/8 9:44
+ * @DESCRIPTION:
+ */
+@Data
+public class MemberListVo {
+    private Long cid;//社团id 必填
+    private String name;
+    private String classes;
+    private String grade;
+}
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/SigninVo.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/SigninVo.java
+package yangtz.cs.liu.campus.vo.organization;
+import lombok.Data;
+/**
+ * @USER: liul   18266668098
+ * @DATE: 2023/9/8 9:51
+ * @DESCRIPTION:
+ */
+@Data
+public class SigninVo {
+    private Long cid; //社团id 必填
+    private String name;
+    private String classes;
+    private String grade;
+}
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/StFcVo.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/StFcVo.java
+package yangtz.cs.liu.campus.vo.organization;
+import lombok.Data;
+/**
+ * @USER: liul   18266668098
+ * @DATE: 2023/9/8 9:33
+ * @DESCRIPTION:
+ */
+@Data
+public class StFcVo {
+    private Long cid; //社团id
+    private String theme; //主题
+}
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/signinApproveVo.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/signinApproveVo.java
@@ -8,7 +8,7 @@ import lombok.Data;
 * @DESCRIPTION:
 */
 @Data
-public class signinApproveVo {
+public class signinApprove2Vo {
    private Long id;
    /*1未审核 2同意 3不同意*/