Merge branch 'master' of http://git.dayaedu.com/yonge/mec

# Conflicts:
#	mec-web/src/main/java/com/ym/mec/web/controller/TeacherDefaultVipGroupSalaryController.java

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -2,9 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.common.dal.BaseDAO;
-
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import org.apache.ibatis.annotations.Param;
@@ -81,6 +79,22 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<TeacherMusicClassInfoDto> queryGroupCourses(Integer userId);
 
     /**
+     * 获取老师VIP课程信息列表
+     *
+     * @param params
+     * @return
+     */
+    List<TeacherVipClassInfoDto> getTeacherVipClass(Map<String, Object> params);
+
+    /**
+     * count老师VIP课程信息列表
+     *
+     * @param params
+     * @return
+     */
+    int countTeacherVipClass(Map<String, Object> params);
+
+    /**
      * 获取乐团所有班级列表
      *
      * @param musicGroupId
@@ -236,4 +250,13 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      */
     List<Map<Integer, Long>> countTeacherVipNum(String teacherIds);
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/17
+     * @params [teacherId]
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>
+     * @describe 获取老师vip课班级
+     */
+    List<TeacherClassGroupDto> findTeacherVipClassGroup(@Param("teacherId") Long teacherId);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherMapperDao.java

@@ -2,7 +2,6 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.common.dal.BaseDAO;
-
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -32,4 +31,7 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @return
      */
     int delMusicGroupTeacherMapper(@Param("classGroupTeacherMapperList") List<ClassGroupTeacherMapper> classGroupTeacherMapperList);
+
+
+
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupStudentFeeDao.java

@@ -1,12 +1,12 @@
 package com.ym.mec.biz.dal.dao;
 
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudentFee> {
 
@@ -46,4 +46,13 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @return
 	 */
 	int batchUpdate(List<MusicGroupStudentFee> updateList);
+
+	/**
+	 * @Author: Joburgess
+	 * @Date: 2019/10/17
+	 * @params [musicGroupIds]
+	 * @return java.util.List<java.util.Map<java.lang.Long,java.lang.Integer>>
+	 * @describe 统计乐团下连续旷课超过次数的学生人数
+	 */
+	List<Map<Long,Integer>> countContinuosAbsenteeismStudentNum(@Param("musicGroupIds") List<Long> musicGroupIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectDao.java

@@ -1,18 +1,15 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.ConditionDto;
-import com.ym.mec.biz.dal.dto.QueryConditionDto;
 import com.ym.mec.biz.dal.dto.SubjectApplyDetailDto;
 import com.ym.mec.biz.dal.dto.UserGoodsDto;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.dal.BaseDAO;
-
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public interface SubjectDao extends BaseDAO<Integer, Subject> {
 
@@ -80,4 +77,13 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @return
      */
     List<Map<Integer, String>> queryNameByIds(@Param("subjectIds") String subjectIds);
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/17
+     * @params [subjectIds]
+     * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.String>>
+     * @describe 根据科目编号获取部门编号,部门名称
+     */
+    List<Map<Long,String>> findBySubjecIds(@Param("subjectIds") List<String> subjectIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -4,8 +4,6 @@ import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.util.List;
-
 public class CourseListDto {
 
     @ApiModelProperty(value = "班级类型", required = true)
@@ -35,6 +33,15 @@ public class CourseListDto {
     @ApiModelProperty(value = "上课模式",required = true)
     private String teachMode;
 
+    @ApiModelProperty(value = "课程形式")
+    private int classMode;
+
+    @ApiModelProperty(value = "线上课数")
+    private Integer onlineClassesNum;
+
+    @ApiModelProperty(value = "线下课数")
+    private Integer offLineClassesNum;
+
     @ApiModelProperty(value = "单节课时",required = true)
     private Integer singleClassMinutes;
 
@@ -44,6 +51,30 @@ public class CourseListDto {
     //续费状态
     private MusicGroupStudentFee.PaymentStatus paymentStatus;
 
+    public Integer getOnlineClassesNum() {
+        return onlineClassesNum;
+    }
+
+    public void setOnlineClassesNum(Integer onlineClassesNum) {
+        this.onlineClassesNum = onlineClassesNum;
+    }
+
+    public Integer getOffLineClassesNum() {
+        return offLineClassesNum;
+    }
+
+    public void setOffLineClassesNum(Integer offLineClassesNum) {
+        this.offLineClassesNum = offLineClassesNum;
+    }
+
+    public int getClassMode() {
+        return classMode;
+    }
+
+    public void setClassMode(int classMode) {
+        this.classMode = classMode;
+    }
+
     public MusicGroupStudentFee.PaymentStatus getPaymentStatus() {
         return paymentStatus;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherClassGroupDto.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2019/10/17
@@ -44,6 +46,50 @@ public class TeacherClassGroupDto {
     @ApiModelProperty(value = "连续3节课未签到人数")
     private Integer threeClassNoAttendanceStudentNum;
 
+    @ApiModelProperty(value = "剩余课时数")
+    private Integer surplusClassTimes;
+
+    @ApiModelProperty(value = "预计缴费截止时间,课程开始时间")
+    private Date paymentExpireDate;
+
+    @ApiModelProperty(value = "课程结束时间")
+    private Date coursesExpireDate;
+
+    @ApiModelProperty(value = "单节课时")
+    private Integer singleClassTimes;
+
+    public Date getPaymentExpireDate() {
+        return paymentExpireDate;
+    }
+
+    public void setPaymentExpireDate(Date paymentExpireDate) {
+        this.paymentExpireDate = paymentExpireDate;
+    }
+
+    public Date getCoursesExpireDate() {
+        return coursesExpireDate;
+    }
+
+    public void setCoursesExpireDate(Date coursesExpireDate) {
+        this.coursesExpireDate = coursesExpireDate;
+    }
+
+    public Integer getSingleClassTimes() {
+        return singleClassTimes;
+    }
+
+    public void setSingleClassTimes(Integer singleClassTimes) {
+        this.singleClassTimes = singleClassTimes;
+    }
+
+    public Integer getSurplusClassTimes() {
+        return surplusClassTimes;
+    }
+
+    public void setSurplusClassTimes(Integer surplusClassTimes) {
+        this.surplusClassTimes = surplusClassTimes;
+    }
+
     public String getSubjectIdList() {
         return subjectIdList;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherClassHeadInfo.java

@@ -0,0 +1,66 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/10/17
+ */
+public class TeacherClassHeadInfo extends ClassGroup {
+
+    @ApiModelProperty(value = "主教编号")
+    private Long bishopTeacherId;
+
+    @ApiModelProperty(value = "主教名称")
+    private String bishopTeacher;
+
+    @ApiModelProperty(value = "助教编号")
+    private Long teachingTeacherId;
+
+    @ApiModelProperty(value = "助教名称")
+    private String teachingTeacher;
+
+    @ApiModelProperty(value = "班级全部学生名称，vip课用")
+    private String studentNames;
+
+    public String getStudentNames() {
+        return studentNames;
+    }
+
+    public void setStudentNames(String studentNames) {
+        this.studentNames = studentNames;
+    }
+
+    public Long getBishopTeacherId() {
+        return bishopTeacherId;
+    }
+
+    public void setBishopTeacherId(Long bishopTeacherId) {
+        this.bishopTeacherId = bishopTeacherId;
+    }
+
+    public String getBishopTeacher() {
+        return bishopTeacher;
+    }
+
+    public void setBishopTeacher(String bishopTeacher) {
+        this.bishopTeacher = bishopTeacher;
+    }
+
+    public Long getTeachingTeacherId() {
+        return teachingTeacherId;
+    }
+
+    public void setTeachingTeacherId(Long teachingTeacherId) {
+        this.teachingTeacherId = teachingTeacherId;
+    }
+
+    public String getTeachingTeacher() {
+        return teachingTeacher;
+    }
+
+    public void setTeachingTeacher(String teachingTeacher) {
+        this.teachingTeacher = teachingTeacher;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -205,9 +205,18 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     /**
      * @Author: Joburgess
      * @Date: 2019/10/17
-     * @params []
+     * @params [type]
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>
      * @describe 获取老师所在班级列表
      */
-    List<TeacherClassGroupDto> findTeacherClassGroups();
+    List<TeacherClassGroupDto> findTeacherClassGroups(String type);
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/17
+     * @params [classGroupId]
+     * @return com.ym.mec.biz.dal.dto.TeacherClassHeadInfo
+     * @describe 获取班级信息
+     */
+    TeacherClassHeadInfo findTeaherClassGroupInfo(Long classGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -1,18 +1,15 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.ConditionDto;
-import com.ym.mec.biz.dal.dto.QueryConditionDto;
 import com.ym.mec.biz.dal.dto.SubjectApplyDetailDto;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
 import com.ym.mec.biz.dal.page.SubjectQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import java.util.Map;
 
 public interface SubjectService extends BaseService<Integer, Subject> {
 
@@ -70,4 +67,13 @@ public interface SubjectService extends BaseService<Integer, Subject> {
     List<Subject> findTeacherSubjects();
 
     List<ConditionDto> findSubjectConditions();
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/10/17
+     * @params [subjectIdsList]
+     * @return java.util.Map<java.lang.Long,java.lang.String>
+     * @describe 根据部门编号列表获取部门编号,名称map
+     */
+    Map<Long,String> findSubjectMapBySubjectIdsList(List<String> subjectIdsList);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.time.Instant;
@@ -62,6 +63,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private SubjectService subjectService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -338,12 +341,20 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             params.put("offset", pageInfo.getOffset());
             courseListDtos = classGroupDao.queryCoursePage(params);
             courseListDtos.forEach(e -> {
-                if ("VIP".equals(e.getTeachMode())) {
+                if (ClassGroupTypeEnum.VIP==e.getType()) {
                     //获取vip课的学生名称列表
                     List<String> vipStuNames = classGroupDao.findVipStuNames(e.getMusicGroupId());
                     if (vipStuNames != null && vipStuNames.size() > 0) {
-                        StringUtils.join(vipStuNames, ",");
-                        e.setStudentNames(StringUtils.join());
+                        e.setStudentNames(StringUtils.join(vipStuNames, ","));
+                    }
+                    if(e.getOffLineClassesNum()>0&&e.getOffLineClassesNum()<=0){
+                        e.setClassMode(1);
+                    }else if(e.getOffLineClassesNum()>0&&e.getOffLineClassesNum()>0){
+                        e.setClassMode(3);
+                    }else if(e.getOnlineClassesNum()<0&&e.getOffLineClassesNum()>=0){
+                        e.setClassMode(2);
+                    }else{
+                        e.setClassMode(0);
                     }
                 } else {
                     //获取学员乐团课的续费状态
@@ -496,16 +507,50 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<TeacherClassGroupDto> findTeacherClassGroups() {
+    public List<TeacherClassGroupDto> findTeacherClassGroups(String type) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){
             throw new BizException("请登录");
         }
 
-        List<TeacherClassGroupDto> teacherMusicClassGroup = classGroupDao.findTeacherMusicClassGroup(user.getId().longValue());
+        List<TeacherClassGroupDto> teacherMusicClassGroup;
+        switch (type){
+            case "VIP":
+                teacherMusicClassGroup = classGroupDao.findTeacherVipClassGroup(user.getId().longValue());
+                break;
+            case "MUSIC_GROUP":
+                teacherMusicClassGroup = classGroupDao.findTeacherMusicClassGroup(user.getId().longValue());
+                break;
+            default:
+                throw new BizException("请指定课程类型");
+        }
+        if(CollectionUtils.isEmpty(teacherMusicClassGroup)){
+            return teacherMusicClassGroup;
+        }
+
+        List<String> subjectIdsList = teacherMusicClassGroup.stream().map(teacherClassGroupDto -> teacherClassGroupDto.getSubjectIdList()).collect(Collectors.toList());
+        Map<Long, String> subjectMapBySubjectIdsList = subjectService.findSubjectMapBySubjectIdsList(subjectIdsList);
 
+        List<Long> musicGroupIds = teacherMusicClassGroup.stream().map(teacherClassGroupDto -> teacherClassGroupDto.getMusicGroupId()).collect(Collectors.toList());
+        List<Map<Long, Integer>> musicGroupIdAndNumList = musicGroupStudentFeeDao.countContinuosAbsenteeismStudentNum(musicGroupIds);
+        Map<Long, Integer> musicGroupIdAndNum = MapUtil.convertMybatisMap(musicGroupIdAndNumList);
 
-        return null;
+        teacherMusicClassGroup.forEach(teacherClassGroupDto -> {
+            String subjectIdList=teacherClassGroupDto.getSubjectIdList();
+            if(StringUtils.isNotEmpty(subjectIdList)){
+                if(Objects.nonNull(musicGroupIdAndNum)&&Objects.nonNull(musicGroupIdAndNum.get(teacherClassGroupDto.getMusicGroupId()))){
+                    teacherClassGroupDto.setThreeClassNoAttendanceStudentNum(musicGroupIdAndNum.get(teacherClassGroupDto.getMusicGroupId()));
+                }
+                String[] subjectIds = subjectIdList.split(",");
+                List<String> subjectNameList=new ArrayList<>();
+                for (String subjectId : subjectIds) {
+                    subjectNameList.add(subjectMapBySubjectIdsList.get(Integer.parseInt(subjectId)));
+                }
+                teacherClassGroupDto.setSubjectNames(StringUtils.join(subjectNameList,","));
+            }
+        });
+
+        return teacherMusicClassGroup;
     }
 
     @Override
@@ -522,4 +567,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         return true;
     }
+
+    @Override
+    public TeacherClassHeadInfo findTeaherClassGroupInfo(Long classGroupId) {
+
+        return null;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DemoGroupServiceImpl.java

@@ -63,6 +63,7 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 		}
 
 		demoGroupApplyDto.setUserId(user.getId());
+		demoGroupApplyDto.setOrganIdList(user.getOrganId().toString());
 		demoGroupDao.insert(demoGroupApplyDto);
 		demoGroupCoursesPlanDao.batchInsertByDates(demoGroupApplyDto.getCourseDates(),
 				demoGroupApplyDto.getId(),

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectServiceImpl.java

@@ -1,12 +1,10 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dao.SubjectGoodsMapperDao;
 import com.ym.mec.biz.dal.dto.ConditionDto;
-import com.ym.mec.biz.dal.dto.QueryConditionDto;
 import com.ym.mec.biz.dal.dto.SubjectApplyDetailDto;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
@@ -16,14 +14,13 @@ import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-
 import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -143,4 +140,18 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject>  imple
     public List<ConditionDto> findSubjectConditions() {
         return subjectDao.findSubjectConditions();
     }
+
+    @Override
+    public Map<Long, String> findSubjectMapBySubjectIdsList(List<String> subjectIdsList) {
+        if(CollectionUtils.isEmpty(subjectIdsList)){
+            return new HashMap<>();
+        }
+        String subjectIdsString = StringUtils.join(subjectIdsList, ",");
+        String[] split = subjectIdsString.split(",");
+        List<String> subjectIds=new ArrayList<>(Arrays.asList(split));
+        subjectIds = subjectIds.stream().distinct().collect(Collectors.toList());
+        List<Map<Long, String>> bySubjecIds = subjectDao.findBySubjecIds(subjectIds);
+        Map<Long,String> subjectIdAndName = MapUtil.convertMybatisMap(bySubjecIds);
+        return subjectIdAndName;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1,93 +1,15 @@
 package com.ym.mec.biz.service.impl;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.ClassGroupDao;
-import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
-import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
-import com.ym.mec.biz.dal.dao.ClassGroupTeacherSalaryDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
-import com.ym.mec.biz.dal.dao.StudentApplyRefundsDao;
-import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
-import com.ym.mec.biz.dal.dao.StudentVipGroupPaymentDao;
-import com.ym.mec.biz.dal.dao.SubjectDao;
-import com.ym.mec.biz.dal.dao.SysUserCashAccountDetailDao;
-import com.ym.mec.biz.dal.dao.TeacherDefaultVipGroupSalaryDao;
-import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
-import com.ym.mec.biz.dal.dao.VipGroupCategoryDao;
-import com.ym.mec.biz.dal.dao.VipGroupClassGroupMapperDao;
-import com.ym.mec.biz.dal.dao.VipGroupDao;
-import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
-import com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto;
-import com.ym.mec.biz.dal.dto.TeachingRecordBaseInfo;
-import com.ym.mec.biz.dal.dto.VipGroupApplyBaseInfoDto;
-import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
-import com.ym.mec.biz.dal.dto.VipGroupBuyParamsDto;
-import com.ym.mec.biz.dal.dto.VipGroupCostCountDto;
-import com.ym.mec.biz.dal.dto.VipGroupCostCountParamsDto;
-import com.ym.mec.biz.dal.dto.VipGroupManageDetailDto;
-import com.ym.mec.biz.dal.dto.VipGroupSalaryBaseInfo;
-import com.ym.mec.biz.dal.dto.VipGroupSalaryDto;
-import com.ym.mec.biz.dal.dto.VipGroupSalarySettlementDto;
-import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
-import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
-import com.ym.mec.biz.dal.entity.StudentApplyRefunds;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentVipGroupPayment;
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
-import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
-import com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary;
-import com.ym.mec.biz.dal.entity.VipGroup;
-import com.ym.mec.biz.dal.entity.VipGroupActivity;
-import com.ym.mec.biz.dal.entity.VipGroupCategory;
-import com.ym.mec.biz.dal.entity.VipGroupClassGroupMapper;
-import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
-import com.ym.mec.biz.dal.enums.AuditStatusEnum;
-import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
-import com.ym.mec.biz.dal.enums.TeachTypeEnum;
-import com.ym.mec.biz.dal.enums.VipGroupActivityTypeEnum;
-import com.ym.mec.biz.dal.enums.VipGroupStatusEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-import com.ym.mec.biz.dal.page.StudentVipGroupQueryInfo;
-import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
-import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
-import com.ym.mec.biz.dal.page.VipGroupSalaryQueryInfo;
-import com.ym.mec.biz.dal.page.VipGroupTeachingRecordQueryInfo;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.CourseScheduleRewardsRulesService;
-import com.ym.mec.biz.service.CourseScheduleService;
-import com.ym.mec.biz.service.CourseScheduleStudentPaymentService;
-import com.ym.mec.biz.service.CourseScheduleTeacherSalaryService;
-import com.ym.mec.biz.service.PayService;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
-import com.ym.mec.biz.service.VipGroupService;
+import com.ym.mec.biz.dal.enums.*;
+import com.ym.mec.biz.dal.page.*;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
@@ -96,6 +18,16 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> implements VipGroupService {
@@ -187,7 +119,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             throw new BizException("线上课课时数量安排有误!");
         }
 
-        //获取活动信息
+		SysUser sysUser = sysUserFeignService.queryUserById(vipGroup.getVipGroupApplyBaseInfo().getUserId());
+
+        if(Objects.isNull(sysUser)){
+        	throw new BizException("该用户不存在");
+		}
+
+		//获取活动信息
         VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupApplyBaseInfo().getVipGroupActivityId().intValue());
 
 		//生成vip课信息
@@ -201,6 +139,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				vipGroupApplyBaseInfoDto.getOnlineClassesUnitPrice(),
 				vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice()).get("totalPrice"));
 		vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
+		vipGroupApplyBaseInfoDto.setOrganId(sysUser.getOrganId());
 		vipGroupDao.insert(vipGroupApplyBaseInfoDto);
 
 		//获取vip课类型信息

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -237,25 +237,31 @@
         <result column="current_class_times_" property="currentClassTimes"/>
         <result column="address_" property="address"/>
         <result column="single_class_minutes_" property="singleClassMinutes"/>
+        <result column="online_classes_num_" property="onlineClassesNum"/>
+        <result column="offline_classes_num_" property="offLineClassesNum"/>
     </resultMap>
     <select id="queryCoursePage" resultMap="CourseListDto">
         SELECT * FROM (
         SELECT cg.type_,s.address_,mg.name_ music_group_name_,
         cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_
-        music_group_id_,cg.create_time_,cs.teach_mode_
+        music_group_id_,
+        0 online_classes_num_,
+        0 offline_classes_num_,
+        cg.create_time_
         FROM student_registration sr
         LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
-        LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_
         LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
         LEFT JOIN school s ON mg.school_id_ = s.id_
         WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
         UNION ALL
         SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
         cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_
-        music_group_id_,cg.create_time_,cs.teach_mode_
+        music_group_id_,
+        IF(vg.online_classes_num_ IS NULL,0,vg.online_classes_num_) online_classes_num_,
+        IF(vg.offline_classes_num_ IS NULL,0,vg.offline_classes_num_) offline_classes_num_,
+        cg.create_time_
         FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_
         LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
         LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
         LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
@@ -433,9 +439,13 @@
         <result property="schoolId" column="school_id_"/>
         <result property="schoolName" column="school_name_"/>
         <result property="subjectIdList" column="subject_id_list_"/>
+        <result property="surplusClassTimes" column="surplus_class_times_"/>
+        <result property="paymentExpireDate" column="payment_expire_date_"/>
+        <result property="coursesExpireDate" column="courses_expire_date_"/>
+        <result property="singleClassTimes" column="single_class_minutes_"/>
     </resultMap>
 
-    <select id="findTeacherMusicClassGroup" resultType="com.ym.mec.biz.dal.dto.TeacherClassGroupDto">
+    <select id="findTeacherMusicClassGroup" resultMap="TeacherClassGroupDto">
         SELECT
             cg.id_ class_group_id_,
             cg.name_ class_group_name_,
@@ -443,16 +453,51 @@
             cg.current_class_times_,
             cg.total_class_times_,
             cg.subject_id_list_,
+            COUNT(cg.id_) surplus_class_times_,
             mg.id_ music_group_id_,
             mg.name_ music_group_name_,
             s.id_ school_id_,
             s.name_ school_name_
         FROM
-            class_group_teacher_mapper cgtm
-            LEFT JOIN class_group cg ON cgtm.class_group_id_=cg.id_
-            LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-            LEFT JOIN school s ON mg.school_id_=s.id_
-        WHERE cgtm.user_id_=#{teacherId} AND cg.type_!="VIP" AND cg.type_!="DEMO"
+            course_schedule_teacher_salary csts
+            LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
+            LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
+            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+            LEFT JOIN school s ON mg.school_id_ = s.id_
+        WHERE
+            csts.user_id_ = #{teacherId}
+            AND cs.status_ != 'OVER'
+            AND cs.type_ != 'VIP'
+            AND cs.type_ != 'DEMO'
+            AND csts.expect_salary_!=0
+        GROUP BY cg.id_
+    </select>
+    <select id="findTeacherVipClassGroup" resultMap="TeacherClassGroupDto">
+        SELECT
+            cg.id_ class_group_id_,
+            cg.name_ class_group_name_,
+            vg.payment_expire_date_,
+            vg.courses_expire_date_,
+            vg.single_class_minutes_,
+            cg.total_class_times_,
+            COUNT(vg.id_) surplus_class_times_,
+            mg.id_ music_group_id_,
+            mg.name_ music_group_name_,
+            s.id_ school_id_,
+            s.name_ school_name_
+        FROM
+            vip_group vg
+            LEFT JOIN vip_group_class_group_mapper vgcgm ON vg.id_ = vgcgm.vip_group_id_
+            LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
+            LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
+            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+            LEFT JOIN school s ON mg.school_id_ = s.id_
+        WHERE
+            cs.actual_teacher_id_ = #{teacherId}
+            AND cs.status_ != 'OVER'
+            AND cs.type_ = 'VIP'
+        GROUP BY
+            vg.id_,cg.id_
     </select>
 
     <!-- 增加实际学生人数 -->

mec-biz/src/main/resources/config/mybatis/DemoGroupMapper.xml

@@ -134,8 +134,9 @@
 			CONCAT(dgcp.course_date_,' ',dgcp.start_time_) start_class_time_,
 			DATE_ADD( CONCAT(dgcp.course_date_,' ',dgcp.start_time_),INTERVAL #{demoGroup.singleClassMinutes} MINUTE) end_class_time_,
 			#{demoGroup.userId} teacher_id_,
+			#{demoGroup.userId} actual_teacher_id_,
 			'ONLINE' teach_mode_,
-			'demo' type_
+			'DEMO' type_
 		FROM
 			demo_group_courses_plan dgcp
 			WHERE dgcp.id_=#{coursePlanId}

mec-biz/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

@@ -114,7 +114,22 @@
     <select id="queryWillRenewList" resultMap="MusicGroupStudentFee">
         SELECT * FROM music_group_student_fee_ WHERE payment_status_ = 'PAID_COMPLETED' and date_add(now(), interval #{days} day) >= next_payment_date_
     </select>
-    
+
+    <select id="countContinuosAbsenteeismStudentNum" resultType="java.util.Map">
+        SELECT
+            music_group_id_ AS 'key',
+            COUNT( id_ ) AS 'value'
+        FROM
+            music_group_student_fee_
+        WHERE
+            continuous_absenteeism_times_ &gt;=3
+            AND music_group_id_ IN
+            <foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
+                #{musicGroupId}
+            </foreach>
+        GROUP BY music_group_id_
+    </select>
+
     <update id="batchUpdate" parameterType="java.util.List">
     	<foreach collection="list" item="item" index="index" open="" close="" separator=";">
         UPDATE music_group_student_fee_

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -132,6 +132,12 @@
     <select id="queryNameByIds" resultType="java.util.Map">
         select id_ `key`,name_ `value` FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIds})
     </select>
+    <select id="findBySubjecIds" resultType="java.util.Map">
+        select id_ `key`,name_ `value` FROM `subject` s WHERE s.id_ IN
+        <foreach collection="subjectIds" item="subjectId" open="(" close=")" separator=",">
+            #{subjectId}
+        </foreach>
+    </select>
 
     <sql id="querySubPageSql">
         <where>

mec-common/common-core/src/main/java/com/ym/mec/common/security/PermissionCheckService.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 public class PermissionCheckService {
 
 	public boolean hasPermissions(String... permissions) {
-		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+		Authentication authentication = SecurityUtils.getAuthentication();
 		if (authentication == null) {
 			return false;
 		}

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -1,54 +1,31 @@
 package com.ym.mec.student.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dto.MusicGroupSubjectGoodsAndInfoDto;
 import com.ym.mec.biz.dal.dto.RegisterPayDto;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.dal.enums.GoodsType;
-import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
-import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-import com.ym.mec.biz.service.GoodsService;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
-import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
-import com.ym.mec.biz.service.PayService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.StudentRegistrationService;
+import com.ym.mec.biz.dal.enums.*;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.string.IdWorker;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 @RequestMapping("musicGroup")
 @Api(tags = "乐团服务")
@@ -176,7 +153,7 @@ public class MusicGroupController extends BaseController {
 	}
 
     @ApiOperation(value = "退团")
-    @GetMapping("/quitMusicGroup")
+    @PostMapping("/quitMusicGroup")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
 	public HttpResponseResult quitMusicGroup(String musicGroupId) throws Exception {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ClassGroupController.java

@@ -0,0 +1,30 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/10/17
+ */
+@Api(tags = "班级服务")
+@RequestMapping("classGroup")
+@RestController
+public class ClassGroupController extends BaseController {
+
+    @Autowired
+    private ClassGroupService classGroupService;
+
+    @ApiOperation(value = "教师课程获取")
+    @GetMapping("/findTeacherClassGroups")
+    public Object findTeacherClassGroups(String type){
+        return succeed(classGroupService.findTeacherClassGroups(type));
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/ChargeTypeController.java

@@ -4,10 +4,13 @@ import com.ym.mec.biz.dal.entity.ChargeType;
 import com.ym.mec.biz.service.ChargeTypeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("chargeType")
@@ -20,6 +23,7 @@ public class ChargeTypeController extends BaseController {
 
     @ApiOperation(value = "新增、修改收费类型")
     @PostMapping("/upSet")
+    @PreAuthorize("@pcs.hasPermissions('chargeType/upSet')")
     public Object upSet(@RequestBody ChargeType chargeType) {
         chargeTypeService.upSet(chargeType);
         return succeed();
@@ -27,6 +31,7 @@ public class ChargeTypeController extends BaseController {
 
     @ApiOperation(value = "删除收费类型")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('chargeType/del')")
     public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
         chargeTypeService.del(id);
         return succeed();
@@ -34,6 +39,7 @@ public class ChargeTypeController extends BaseController {
 
     @ApiOperation(value = "分页查询收费类型列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('chargeType/queryPage')")
     public Object queryPage(QueryInfo queryInfo) {
         return succeed(chargeTypeService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -9,9 +9,12 @@ import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.QueryInfo;
+
 import io.swagger.annotations.*;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -29,12 +32,14 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "新增单技班班级")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/add')")
     public Object add(@RequestBody ClassGroup classGroup) throws Exception {
         return succeed(classGroupService.addClassGroup(classGroup));
     }
 
     @ApiOperation(value = "新增合奏班")
     @PostMapping("/addMixClass")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/addMixClass')")
     public Object addMixClass(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId,
                               @ApiParam(value = "班级名称", required = true) String name,
                               @ApiParam(value = "班级编号,号分割", required = true) String classGroupIds) throws Exception {
@@ -43,6 +48,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "新增提高班")
     @PostMapping("/addHighClass")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/addHighClass')")
     public Object addHighClass(@ApiParam(value = "乐团提高班json", required = true) @RequestParam List<HighClassGroupDto> highClassGroupDtoList) throws Exception {
         if (highClassGroupDtoList.size() <= 0) {
             return failed("参数不合法");
@@ -52,6 +58,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "删除单技班")
     @PostMapping("/delSingle")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/delSingle')")
     public Object delSingle(Integer classGroupId) {
         classGroupService.delete(classGroupId);
         return succeed();
@@ -59,6 +66,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "删除合奏班")
     @PostMapping("/delMix")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/delMix')")
     public Object delMix(Integer classGroupId) {
         classGroupService.delete(classGroupId);
         return succeed();
@@ -66,6 +74,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "修改班级")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/update')")
     public Object update(ClassGroup classGroup) {
         classGroup.setUpdateTime(new Date());
         classGroupService.update(classGroup);
@@ -74,12 +83,14 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "分页查询班级列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/queryPage')")
     public Object queryPage(QueryInfo queryInfo) {
         return succeed(classGroupService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "合奏班相关班级获取")
     @GetMapping("/findClassGroupAboutMix")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/findClassGroupAboutMix')")
     public HttpResponseResult findClassGroupAboutMix(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId,
                                          @ApiParam(value = "班级编号", required = false) Integer mixClassGroupId) {
         return succeed(classGroupService.findClassGroup(musicGroupId, mixClassGroupId));
@@ -87,24 +98,28 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "乐团单技班列表")
     @GetMapping("/findMusicGroupClass")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/findMusicGroupClass')")
     public HttpResponseResult findMusicGroupClass(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId) {
         return succeed(classGroupService.findAllNormalClassGroupByMusicGroupId(musicGroupId));
     }
 
     @ApiOperation(value = "获取未分班的单技班列表")
     @GetMapping("/findNoClassSubjects")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/findNoClassSubjects')")
     public HttpResponseResult findNoClassSubjects(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId) {
         return succeed(classGroupService.findNoClassSubjects(musicGroupId));
     }
 
     @ApiOperation(value = "乐团合奏班列表")
     @GetMapping("/findMixMusicGroupClass")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/findMixMusicGroupClass')")
     public HttpResponseResult findMixMusicGroupClass(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId) {
         return succeed(classGroupService.findAllMixClassGroupByMusicGroupId(musicGroupId));
     }
 
     @ApiOperation(value = "乐团所有班列表")
     @GetMapping("/findAllClassGroupByMusicGroup")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/findAllClassGroupByMusicGroup')")
     public HttpResponseResult findAllClassGroupByMusicGroup(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId) {
         return succeed(classGroupService.findAllClassGroupByMusicGroup(musicGroupId));
     }
@@ -112,6 +127,7 @@ public class ClassGroupController extends BaseController {
     @ApiOperation(value = "乐团班级老师设置")
     @PostMapping("/addClassGroupTeacher")
     @ApiParam(value = "乐团班级老师json", required = true)
+    @PreAuthorize("@pcs.hasPermissions('classGroup/addClassGroupTeacher')")
     public HttpResponseResult addClassGroupTeacher(@RequestBody List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
         if (classGroupTeacherMapperList.size() <= 0) {
             return failed("参数不合法");
@@ -121,12 +137,14 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "获取乐团班级老师")
     @GetMapping("/findMusicGroupClassTeacher")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/findMusicGroupClassTeacher')")
     public HttpResponseResult findMusicGroupClassTeacher(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId) {
         return succeed(classGroupService.getClassGroupAndTeachers(musicGroupId,"NORMAL,MIX"));
     }
 
     @ApiOperation(value = "获取乐团班级老师课酬")
     @GetMapping("/findMusicGroupClassTeacherSalary")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/findMusicGroupClassTeacherSalary')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "type", value = "结算类型（1-基准课酬，4-梯度课酬）", required = true, dataType = "Integer")})
     public HttpResponseResult findMusicGroupClassTeacherSalary(String musicGroupId, SalarySettlementTypeEnum type) {
@@ -139,6 +157,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "乐团班级老师课酬确认")
     @PostMapping("/setClassGroupTeacherSalary")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/setClassGroupTeacherSalary')")
     @ApiParam(value = "乐团班级老师<包含相应课酬>json", required = true)
     public Object setClassGroupTeacherSalary(@RequestBody List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
         if (classGroupTeacherMapperList.size() <= 0) {
@@ -149,6 +168,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("/findGroupUsers")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/findGroupUsers')")
     public Object findGroupUsers(String groupId) {
         if (StringUtils.isEmpty(groupId)) {
             return failed("参数校验错误");
@@ -158,6 +178,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "乐团班级设置，成团确认")
     @PostMapping("/addMusicGroupTeam")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/addMusicGroupTeam')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "teacherId", value = "老师编号", required = true, dataType = "Integer")})
     public Object addMusicGroupTeam(Integer teacherId,String musicGroupId,Integer improventClassesNum) throws Exception {
@@ -171,6 +192,7 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "合并班级")
     @PostMapping("/mergeClassGroup")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/mergeClassGroup')")
     @ApiImplicitParams({@ApiImplicitParam(name = "classGroupIds", value = "班级编号,号分割", required = true, dataType = "String")})
     public HttpResponseResult mergeClassGroup(String classGroupIds) throws Exception {
         //软删除班级

mec-web/src/main/java/com/ym/mec/web/controller/CooperationOrganController.java

@@ -4,10 +4,13 @@ import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -22,6 +25,7 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "新增合作单位(教学点)")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/add')")
     public Object add(CooperationOrgan cooperationOrgan) {
         cooperationOrganService.insert(cooperationOrgan);
         return succeed();
@@ -29,6 +33,7 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "删除合作单位(教学点)")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/del')")
     public Object del(@ApiParam(value = "合作单位(教学点)编号", required = true) @PathVariable("id") Integer id) {
         cooperationOrganService.delete(id);
         return succeed();
@@ -36,6 +41,7 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "修改合作单位(教学点)")
     @PutMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/update')")
     public Object update(CooperationOrgan cooperationOrgan) {
         cooperationOrgan.setUpdateTime(new Date());
         cooperationOrganService.update(cooperationOrgan);
@@ -44,12 +50,14 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "分页查询合作单位(教学点)列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/queryPage')")
     public Object queryPage(QueryInfo queryInfo) {
         return succeed(cooperationOrganService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "根据机构编号获取合作单位(教学点)列表")
     @GetMapping("/queryByOrganId")
+    @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/queryByOrganId')")
     public Object queryByOrganId(Integer organId){
         return succeed(cooperationOrganService.queryByOrganId(organId));
     }

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -7,11 +7,14 @@ import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -33,6 +36,7 @@ public class CourseScheduleController extends BaseController {
 
     @ApiOperation(value = "排课")
     @PostMapping("/batchAddCourseSchedule/{musicGroupID}")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchAddCourseSchedule')")
     public Object batchAddCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                          @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
         scheduleService.batchAddCourseSchedule(courseSchedules);
@@ -41,6 +45,7 @@ public class CourseScheduleController extends BaseController {
 
     @ApiOperation(value = "批量跟新排课")
     @PostMapping("/batchUpdateCourseSchedule/{musicGroupID}")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchUpdateCourseSchedule')")
     public Object batchUpdateCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                             @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") Long musicGroupID){
         scheduleService.batchUpdateCourseSchedule(courseSchedules,musicGroupID);
@@ -49,6 +54,7 @@ public class CourseScheduleController extends BaseController {
 
     @ApiOperation(value = "根据月份获取乐团在该月有课的日期")
     @GetMapping("/getCourseScheduleDateByMonth")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCourseScheduleDateByMonth')")
         public Object getCourseScheduleDateByMonth(@ApiParam(value = "乐团编号", required = true) @RequestParam Long musicGroupID,
                                                    @ApiParam(value = "月份", required = true) @RequestParam Date month) {
         return succeed(scheduleService.getCourseScheduleDateByMonth(musicGroupID,month));
@@ -56,23 +62,27 @@ public class CourseScheduleController extends BaseController {
 
     @ApiOperation(value = "根据日期获取当日排课")
     @GetMapping("/getCourseSchedulesWithDate")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCourseSchedulesWithDate')")
     public Object getCourseSchedulesWithDate(@ApiParam(value = "日期", required = true) Date date){
         return succeed(scheduleService.getCourseSchedulesWithDate(date));
     }
 
     @ApiOperation(value = "根据课程ID查询正在或即将开始的课程")
     @GetMapping("/getCurrentCourseDetail/{courseID}")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCurrentCourseDetail')")
     public Object getCurrentCourseDetail(@ApiParam(value = "课程ID", required = true) @PathVariable("courseID") Long courseID){
         return succeed(scheduleService.getCurrentCourseDetail(courseID));
     }
 
     @ApiOperation(value = "根据班级ID获取当前课程的学生")
     @GetMapping("/getCurrentCourseStudents")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCurrentCourseStudents')")
     public Object getCurrentCourseStudents(@RequestBody StudentAttendanceQueryInfo queryInfo){
         return succeed(studentAttendanceService.getCurrentCourseStudents(queryInfo));
     }
 
     @ApiOperation(value = "课时调整")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/classStartDateAdjust')")
     @PostMapping(value = "/classStartDateAdjust",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object classStartDateAdjust(ClassDateAdjustDto classDateAdjustDto){
         scheduleService.classStartDateAdjust(classDateAdjustDto);
@@ -80,6 +90,7 @@ public class CourseScheduleController extends BaseController {
     }
 
     @ApiOperation(value = "课时交换")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/courseSwap')")
     @GetMapping(value = "/courseSwap",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object courseSwap(Long courseScheduleId1,Long courseScheduleId2){
         scheduleService.courseSwap(courseScheduleId1,courseScheduleId2);
@@ -88,6 +99,7 @@ public class CourseScheduleController extends BaseController {
 
     @ApiOperation(value = "课程投诉审核")
     @GetMapping(value = "/courseScheduleCommplaintAudit")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/courseScheduleCommplaintAudit')")
     public Object courseScheduleCommplaintAudit(CourseScheduleComplaints courseScheduleComplaints){
         scheduleService.courseScheduleCommplaintAudit(courseScheduleComplaints);
         return succeed();

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleRewardsRulesController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,7 +15,7 @@ import com.ym.mec.biz.service.CourseScheduleRewardsRulesService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
 
-@RequestMapping("courseSchedule")
+@RequestMapping("courseScheduleRewards")
 @Api(tags = "课程奖励规则")
 @RestController
 public class CourseScheduleRewardsRulesController extends BaseController {
@@ -24,30 +25,35 @@ public class CourseScheduleRewardsRulesController extends BaseController {
 
 	@ApiOperation(value = "查询规则列表")
 	@GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('courseScheduleRewards/queryPage')")
 	public Object queryPage(QueryInfo queryInfo) {
 		return succeed(courseScheduleRewardsRulesService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "单查询")
 	@GetMapping("/query")
+    @PreAuthorize("@pcs.hasPermissions('courseScheduleRewards/query')")
 	public Object query(Integer id) {
 		return succeed(courseScheduleRewardsRulesService.get(id));
 	}
 
 	@ApiOperation(value = "新增")
 	@PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('courseScheduleRewards/add')")
 	public Object add(CourseScheduleRewardsRules courseScheduleRewardsRules) {
 		return succeed(courseScheduleRewardsRulesService.insert(courseScheduleRewardsRules));
 	}
 
 	@ApiOperation(value = "修改")
 	@PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('courseScheduleRewards/update')")
 	public Object update(CourseScheduleRewardsRules courseScheduleRewardsRules) {
 		return succeed(courseScheduleRewardsRulesService.update(courseScheduleRewardsRules));
 	}
 
 	@ApiOperation(value = "删除")
 	@PostMapping("/delete")
+    @PreAuthorize("@pcs.hasPermissions('courseScheduleRewards/delete')")
 	public Object delete(Integer id) {
 		return succeed(courseScheduleRewardsRulesService.delete(id));
 	}

mec-web/src/main/java/com/ym/mec/web/controller/GoodsCategoryController.java

@@ -4,9 +4,12 @@ import com.ym.mec.biz.dal.entity.GoodsCategory;
 import com.ym.mec.biz.dal.page.GoodsCategoryQueryInfo;
 import com.ym.mec.biz.service.GoodsCategoryService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("category")
@@ -19,12 +22,14 @@ public class GoodsCategoryController extends BaseController {
 
     @ApiOperation(value = "删除商品分类")
     @PostMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('category/del')")
     public Object del(Integer id) {
         return succeed(goodsCategoryService.delete(id));
     }
 
     @ApiOperation(value = "新增、修改商品类型")
     @PostMapping("/upset")
+    @PreAuthorize("@pcs.hasPermissions('category/upset')")
     public Object upset(@RequestBody GoodsCategory goodsCategory){
         goodsCategoryService.upsetGoodsCategory(goodsCategory);
         return succeed();
@@ -32,6 +37,7 @@ public class GoodsCategoryController extends BaseController {
 
     @ApiOperation(value = "分页查询商品分类列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('category/queryPage')")
     public Object queryPage(GoodsCategoryQueryInfo queryInfo) {
         return succeed(goodsCategoryService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/GoodsController.java

@@ -1,6 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -10,10 +9,10 @@ import io.swagger.annotations.ApiParam;
 import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -32,6 +31,7 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "新增商品(教材、辅件)")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('goods/add')")
     public Object add(Goods goods){
         goodsService.insert(goods);
         return succeed();
@@ -39,6 +39,7 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "删除商品(教材、辅件)")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('goods/del')")
     public Object del(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
         goodsService.delete(id);
         return succeed();
@@ -46,6 +47,7 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "修改商品(教材、辅件)")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('goods/update')")
     public Object update(Goods goods){
         goods.setUpdateTime(new Date());
         goodsService.update(goods);
@@ -54,18 +56,21 @@ public class GoodsController extends BaseController {
 
     @ApiOperation(value = "根据商品(教材、辅件)编号查询商品(教材、辅件)")
     @GetMapping("/get/{id}")
+    @PreAuthorize("@pcs.hasPermissions('goods/get')")
     public Object get(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
         return succeed(goodsService.get(id));
     }
 
     @ApiOperation(value = "分页查询商品(教材、辅件)列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('goods/queryPage')")
     public Object queryPage(GoodsQueryInfo queryInfo){
         return succeed(goodsService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "通过科目编号、商品分类 查询商品(教材、辅件)列表")
     @GetMapping("/queryGoodsBySubId")
+    @PreAuthorize("@pcs.hasPermissions('goods/queryGoodsBySubId')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "subjectId", value = "科目编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "type", value = "INSTRUMENT 乐器, ACCESSORIES 教辅", required = true, dataType = "String")})
     public Object findGoodsBySubId(Integer subjectId,String type){

mec-web/src/main/java/com/ym/mec/web/controller/HotWordLabelManageController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiParam;
 import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,10 +31,9 @@ public class HotWordLabelManageController extends BaseController {
     @Autowired
     private HotWordsLabelService hotWordsLabelService;
 
-
-
     @ApiOperation(value = "新增热词标签")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('hotWordLabelManage/add')")
     public Object add(HotWordsLabel hotWordsLabel) {
         hotWordsLabelService.insert(hotWordsLabel);
         return succeed();
@@ -41,6 +41,7 @@ public class HotWordLabelManageController extends BaseController {
 
     @ApiOperation(value = "删除热词标签")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('hotWordLabelManage/del')")
     public Object del(@ApiParam(value = "热词标签编号", required = true) @PathVariable("id") Integer id) {
         hotWordsLabelService.delete(id);
         return succeed();
@@ -48,6 +49,7 @@ public class HotWordLabelManageController extends BaseController {
 
     @ApiOperation(value = "修改热词标签")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('hotWordLabelManage/update')")
     public Object update(HotWordsLabel hotWordsLabel) {
         hotWordsLabel.setUpdateTime(new Date());
         hotWordsLabelService.update(hotWordsLabel);
@@ -57,6 +59,7 @@ public class HotWordLabelManageController extends BaseController {
 
     @ApiOperation("分页查询热词列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('hotWordLabelManage/queryPage')")
     public Object queryPage(QueryInfo queryInfo){
         return succeed(hotWordsLabelService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/LeaveCategoryController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiParam;
 import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +28,7 @@ public class LeaveCategoryController extends BaseController {
 
     @ApiOperation(value = "新增请假类型")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('leaveCategory/add')")
     public Object add(LeaveCategory leaveCategory) {
         leaveCategoryService.insert(leaveCategory);
         return succeed();
@@ -34,6 +36,7 @@ public class LeaveCategoryController extends BaseController {
 
     @ApiOperation(value = "删除请假类型")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('leaveCategory/del')")
     public Object del(@ApiParam(value = "请假类型编号", required = true) @PathVariable("id") Integer id) {
         leaveCategoryService.delete(id);
         return succeed();
@@ -41,6 +44,7 @@ public class LeaveCategoryController extends BaseController {
 
     @ApiOperation(value = "修改请假类型")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('leaveCategory/update')")
     public Object update(LeaveCategory leaveCategory) {
         leaveCategory.setUpdateTime(new Date());
         leaveCategoryService.update(leaveCategory);
@@ -49,6 +53,7 @@ public class LeaveCategoryController extends BaseController {
 
     @ApiOperation(value = "分页查询请假类型列表")
     @PostMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('leaveCategory/queryPage')")
     public Object queryPage(QueryInfo queryInfo) {
         return succeed(leaveCategoryService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupBuildLogController.java

@@ -2,9 +2,12 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.service.MusicGroupBuildLogService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,6 +22,7 @@ public class MusicGroupBuildLogController extends BaseController {
 
     @ApiOperation("根据乐团编号获取乐团流程记录")
     @GetMapping(value = "/findAll")
+    @PreAuthorize("@pcs.hasPermissions('recharge/findAll')")
     public Object findAll(String musicGroupId){
         return succeed(musicGroupBuildLogService.findById(musicGroupId));
     }

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -9,6 +10,7 @@ import io.swagger.annotations.ApiParam;
 import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +36,7 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "修改乐团")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/update')")
     public Object update(MusicGroup musicGroup){
         musicGroup.setUpdateTime(new Date());
         musicGroupService.update(musicGroup);
@@ -42,18 +45,21 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "根据乐团编号查询乐团")
     @GetMapping("/get/{id}")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/get')")
     public Object get(@ApiParam(value = "乐团编号", required = true) @PathVariable("id") String id){
         return succeed(musicGroupService.get(id));
     }
 
     @ApiOperation(value = "分页查询乐团列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/queryPage')")
     public Object queryPage(MusicGroupQueryInfo queryInfo){
         return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
     }
 
     @ApiOperation(value = "新增乐团  建团申请数据提交")
     @PostMapping("/createGroup")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/createGroup')")
     public Object createGroup(@RequestBody SubFeeSettingDto subFeeSettingDto){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null || sysUser.getId() == null){

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPaymentCalenderController.java

@@ -8,6 +8,7 @@ import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +31,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
 
     @ApiOperation(value = "新增乐团缴费日历")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/add')")
     public Object add(MusicGroupPaymentCalender musicGroupPaymentCalender) {
         musicGroupPaymentCalenderService.insert(musicGroupPaymentCalender);
         return succeed();
@@ -37,6 +39,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
 
     @ApiOperation(value = "批量新增、修改乐团缴费周期")
     @PostMapping("/batchAdd")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/batchAdd')")
     public Object batchAdd(@RequestBody List<MusicGroupPaymentCalender> musicGroupPaymentCalenders) {
         musicGroupPaymentCalenderService.batchInsert(musicGroupPaymentCalenders);
         return succeed();
@@ -44,6 +47,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
 
     @ApiOperation(value = "删除乐团缴费日历")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/del')")
     public Object del(@ApiParam(value = "乐团缴费日历编号", required = true) @PathVariable("id") Long id) {
         musicGroupPaymentCalenderService.delete(id);
         return succeed();
@@ -51,6 +55,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
 
     @ApiOperation(value = "修改乐团缴费日历")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/update')")
     public Object update(MusicGroupPaymentCalender musicGroupPaymentCalender) {
         musicGroupPaymentCalender.setUpdateTime(new Date());
         musicGroupPaymentCalenderService.update(musicGroupPaymentCalender);
@@ -59,6 +64,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
 
     @ApiOperation(value = "分页查询乐团缴费日历列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/queryPage')")
     public Object queryPage(QueryInfo queryInfo) {
         return succeed(musicGroupPaymentCalenderService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPaymentEntitiesController.java

@@ -8,6 +8,7 @@ import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +31,7 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
 
     @ApiOperation(value = "新增乐团付费主体")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentEntities/add')")
     public Object add(MusicGroupPaymentEntities musicGroupPaymentEntities){
         musicGroupPaymentEntitiesService.insert(musicGroupPaymentEntities);
         return succeed();
@@ -37,6 +39,7 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
 
     @ApiOperation(value = "批量新增乐团付费主体")
     @PostMapping("/batchAdd")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentEntities/batchAdd')")
     public Object batchAdd(@RequestBody List<MusicGroupPaymentEntities> musicGroupPaymentEntities){
         musicGroupPaymentEntitiesService.batchInsert(musicGroupPaymentEntities);
         return succeed();
@@ -44,6 +47,7 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
 
     @ApiOperation(value = "删除乐团付费主体")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentEntities/del')")
     public Object del(@ApiParam(value = "乐团付费主体编号", required = true) @PathVariable("id") Integer id){
         musicGroupPaymentEntitiesService.delete(id);
         return succeed();
@@ -51,6 +55,7 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
 
     @ApiOperation(value = "修改乐团付费主体")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentEntities/update')")
     public Object update(MusicGroupPaymentEntities musicGroupPaymentEntities){
         musicGroupPaymentEntities.setUpdateTime(new Date());
         musicGroupPaymentEntitiesService.update(musicGroupPaymentEntities);
@@ -59,6 +64,7 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
 
     @ApiOperation(value = "分页查询乐团付费主体")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentEntities/queryPage')")
     public Object queryPage(QueryInfo queryInfo){
         return succeed(musicGroupPaymentEntitiesService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupQuitController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,18 +36,21 @@ public class MusicGroupQuitController extends BaseController {
 
 	@ApiOperation(value = "分页查询")
 	@GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuit/queryPage')")
 	public HttpResponseResult queryPage(QueryInfo queryInfo) throws Exception {
 		return succeed(musicGroupQuitService.queryPage(queryInfo));
 	}
 	
 	@ApiOperation(value = "单查询")
 	@GetMapping("/query")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuit/query')")
 	public HttpResponseResult query(Long id) throws Exception {
 		return succeed(musicGroupQuitService.get(id));
 	}
 
 	@ApiOperation(value = "退团")
 	@PostMapping("/quitMusicGroup")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupQuit/quitMusicGroup')")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "退团申请id", required = true, dataType = "Long"),
 			@ApiImplicitParam(name = "status", value = "审批状态（APPROVED, DENIED, PROCESSING）", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "reason", value = "原因", required = true, dataType = "String") })

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupSubjectPlanController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,12 +24,14 @@ public class MusicGroupSubjectPlanController extends BaseController {
 
     @ApiOperation(value = "根据id查询乐团声部招生情况")
     @GetMapping("/get/{id}")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupSubjectPlan/get')")
     public Object get(@ApiParam(value = "乐团编号", required = true) @PathVariable("id") int id) {
         return succeed(musicGroupSubjectPlanService.get(id));
     }
 
     @ApiOperation(value = "乐团声部分班情况")
     @GetMapping("/getMusicSubjectClass")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupSubjectPlan/getMusicSubjectClass')")
     public Object getMusicSubjectClass(@ApiParam(value = "乐团编号", required = true) String musicGroupId) {
         return succeed(musicGroupSubjectPlanService.getMusicSubjectClassPlan(musicGroupId));
     }

mec-web/src/main/java/com/ym/mec/web/controller/OrganizationController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiParam;
 import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,24 +29,28 @@ public class OrganizationController extends BaseController {
 
     @ApiOperation(value = "分页查询分部列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('organization/queryPage')")
     public Object queryPage(OrganizationQueryInfo queryInfo){
         return succeed(organizationService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "新增分部")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('organization/add')")
     public Object add(Organization organization){
         return succeed(organizationService.insert(organization));
     }
 
     @ApiOperation(value = "根据分部编号删除分部")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('organization/del')")
     public Object del(@ApiParam(value = "分部编号", required = true) @PathVariable("id") Integer id){
         return succeed(organizationService.delete(id));
     }
 
     @ApiOperation(value = "修改分部信息")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('organization/update')")
     public Object update(Organization organization){
         organization.setUpdateTime(new Date());
         return succeed(organizationService.update(organization));
@@ -53,6 +58,7 @@ public class OrganizationController extends BaseController {
 
     @ApiOperation(value = "根据分部编号查询分部详情")
     @GetMapping("/get/{id}")
+    @PreAuthorize("@pcs.hasPermissions('organization/get')")
     @ApiParam(value = "分部编号", required = true)
     public Object get( @PathVariable("id") Integer id){
         return succeed(organizationService.get(id));

mec-web/src/main/java/com/ym/mec/web/controller/SchoolController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiParam;
 import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,6 +30,7 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "新增学校")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('school/add')")
     public Object add(School school){
         schoolService.insert(school);
         return succeed();
@@ -36,6 +38,7 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "删除学校")
     @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('school/del')")
     public Object del(@ApiParam(value = "学校编号", required = true) @PathVariable("id") Integer id){
         schoolService.delete(id);
         return succeed();
@@ -43,6 +46,7 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "修改学校")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('school/update')")
     public Object update(School school){
         school.setUpdateTime(new Date());
         schoolService.update(school);
@@ -51,18 +55,21 @@ public class SchoolController extends BaseController {
 
     @ApiOperation(value = "根据学校编号查询学校")
     @GetMapping("/get/{id}")
+    @PreAuthorize("@pcs.hasPermissions('school/get')")
     public Object get(@ApiParam(value = "学校编号", required = true) @PathVariable("id") Integer id){
         return succeed(schoolService.get(id));
     }
 
     @ApiOperation(value = "分页查询学校列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('school/queryPage')")
     public Object queryPage(SchoolQueryInfo queryInfo){
         return succeed(schoolService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "根据机构编号获取学校列表")
     @GetMapping("/queryByOrganId")
+    @PreAuthorize("@pcs.hasPermissions('school/queryByOrganId')")
     public Object queryByOrganId(@RequestParam Integer organId){
         return succeed(schoolService.queryByOrganId(organId,null));
     }

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -5,10 +5,9 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.page.StudentManageAttendanceQueryInfo;
@@ -31,42 +30,49 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "获取学生列表")
     @GetMapping("/queryStudentList")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/queryStudentList')")
     public Object queryStudentList(StudentManageQueryInfo queryInfo){
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
 
     @ApiOperation(value = "根据学生ID获取学生基本报名信息")
     @GetMapping("/findStudentBaseInfo")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/findStudentBaseInfo')")
     public Object findStudentBaseInfo(@ApiParam(value = "学生编号", required = true) Integer userId){
         return succeed(studentManageService.findStudentManageBaseInfo(userId));
     }
 
     @ApiOperation(value = "根据学生ID获取其所在的乐团")
     @GetMapping("/findStudentMusicGroups")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/findStudentMusicGroups')")
     public Object findStudentMusicGroups(@ApiParam(value = "学生编号", required = true) Integer userId){
         return succeed(studentManageService.findStudentMusicGroupsByUserId(userId));
     }
 
     @ApiOperation(value = "根据乐团获取排课列表")
     @GetMapping("/findStudentCourses")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/findStudentCourses')")
     public Object findStudentCourses(StudentManageCourseQueryInfo queryInfo){
         return succeed(studentManageService.findStudentCourseList(queryInfo));
     }
 
     @ApiOperation(value = "获取学生签到列表")
     @GetMapping("/findStudentAttendances")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/findStudentAttendances')")
     public Object findStudentAttendances(StudentManageAttendanceQueryInfo queryInfo){
         return succeed(studentManageService.findStudentAttendances(queryInfo));
     }
 
     @ApiOperation(value = "获取学生vip课")
     @GetMapping("/findStudentVipGroups")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/findStudentVipGroups')")
     public Object findStudentVipGroups(Integer userId){
         return succeed(studentManageService.findStudentVipGroups(userId));
     }
 
     @ApiOperation(value = "获取用户默认账户基本信息")
     @GetMapping("/getUserCashAccountBaseInfo")
+    @PreAuthorize("@pcs.hasPermissions('studentManage/getUserCashAccountBaseInfo')")
     public Object getUserCashAccountBaseInfo(Integer userId){
         return succeed(studentManageService.getStudentAccountBaseInfo(userId));
     }

mec-web/src/main/java/com/ym/mec/web/controller/StudentRegistrationController.java

@@ -10,6 +10,7 @@ import java.util.Date;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,6 +32,7 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "乐团添加学员")
     @PostMapping("/insertStudent")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/insertStudent')")
     public Object add(StudentRegistration studentRegistration) throws Exception {
         return succeed(studentRegistrationService.insertStudent(studentRegistration));
     }
@@ -44,6 +46,7 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "修改学生报名信息")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/update')")
     public Object update(StudentRegistration studentRegistration) {
         studentRegistration.setUpdateTime(new Date());
         studentRegistrationService.update(studentRegistration);
@@ -52,6 +55,7 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "批量调剂学生报名专业")
     @PostMapping("/batchUpdateSubject")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/batchUpdateSubject')")
     public Object batchUpdateSubject(String userId,Integer subId) {
         if (StringUtils.isEmpty(userId) || subId == null) {
             return failed();
@@ -61,12 +65,14 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "乐团【报名中、缴费中】 学生详情列表分页查询")
     @GetMapping("/queryStudentApplyDetail")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/queryStudentApplyDetail')")
     public Object queryStudentApplyDetail(StudentRegistrationQueryInfo queryInfo) {
         return succeed(studentRegistrationService.queryStudentDetailPage(queryInfo));
     }
 
     @ApiOperation(value = "学生报名缴费金额详情")
     @GetMapping("/queryFeeDetail")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/queryFeeDetail')")
     @ApiImplicitParams({@ApiImplicitParam(name = "studentId", value = "学生编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public Object queryFeeDetail(String studentId,String musicGroupId) {
@@ -78,6 +84,7 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "获取未分班的学生")
     @GetMapping("/getNoClassStu")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/getNoClassStu')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "actualSubjectId", value = "科目(声部)id,多个逗号分开", required = true, dataType = "String")})
     public Object getNoClassStuBySubjectId(String musicGroupId, String actualSubjectId) {
@@ -86,6 +93,7 @@ public class StudentRegistrationController extends BaseController {
 
     @ApiOperation(value = "获取班级学生")
     @GetMapping("/getClassStu")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/getClassStu')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")})
     public Object getClassStu(String musicGroupId, int classGroupId) {

mec-web/src/main/java/com/ym/mec/web/controller/StudentWithdrawController.java

@@ -9,10 +9,13 @@ import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.StudentWithdrawService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -29,6 +32,7 @@ public class StudentWithdrawController extends BaseController {
 
     @ApiOperation(value = "新增提现申请")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('studentWithdraw//add')")
     public Object add(StudentWithdraw studentWithdraw) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null && sysUser.getId() == null){
@@ -41,6 +45,7 @@ public class StudentWithdrawController extends BaseController {
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('studentWithdraw/queryPage')")
     public Object queryPage(WithdrawDto queryInfo) {
         return succeed(studentWithdrawService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiParam;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,6 +33,7 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "修改、新增科目")
     @PostMapping("/upset")
+    @PreAuthorize("@pcs.hasPermissions('subject/upset')")
     public Object update(@RequestBody Subject subject){
         subjectService.upSetSubject(subject);
         return succeed();
@@ -39,24 +41,28 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "根据科目编号查询科目")
     @GetMapping("/get/{id}")
+    @PreAuthorize("@pcs.hasPermissions('subject/get')")
     public Object get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Integer id){
         return succeed(subjectService.get(id));
     }
 
     @ApiOperation(value = "分页查询科目列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('subject/queryPage')")
     public Object queryPage(SubjectQueryInfo queryInfo){
         return succeed(subjectService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "分页查询科目树状列表")
     @GetMapping("/queryPageTree")
+    @PreAuthorize("@pcs.hasPermissions('subject/queryPageTree')")
     public Object queryPageTree(SubjectQueryInfo queryInfo){
         return succeed(subjectService.queryPageTree(queryInfo));
     }
 
     @ApiOperation(value = "通过乐团编号查询乐团科目规划")
     @GetMapping("/querySubByMusicGroupId")
+    @PreAuthorize("@pcs.hasPermissions('subject/querySubByMusicGroupId')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public Object findSubByMusicGroupId(String musicGroupId){
         return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
@@ -64,6 +70,7 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "通过乐团收费类型，获取默认的声部列表")
     @GetMapping("/findDefaultSubByChargeTypeId")
+    @PreAuthorize("@pcs.hasPermissions('subject/findDefaultSubByChargeTypeId')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "chargeTypeId", value = "收费类型编号", required = true, dataType = "Integer")})
     public Object findDefaultSubByChargeTypeId(Integer chargeTypeId){
         return succeed(subjectService.findDefaultSubByChargeTypeId(chargeTypeId));
@@ -71,6 +78,7 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "修改、新增声部关联的商品列表")
     @PostMapping("/markGoods")
+    @PreAuthorize("@pcs.hasPermissions('subject/markGoods')")
     public Object markGoods(@RequestBody List<SubjectGoodsMapper> subjectGoodsMappers){
         subjectService.markGoods(subjectGoodsMappers);
         return succeed();
@@ -78,6 +86,7 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "通过乐团编号获取声部列表以及声部报名、缴费、计划人数")
     @GetMapping("/findSubApplyDetail")
+    @PreAuthorize("@pcs.hasPermissions('subject/findSubApplyDetail')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public Object findSubApplyDetail(String musicGroupId){
         return succeed(subjectService.findSubApplyDetail(musicGroupId));

mec-web/src/main/java/com/ym/mec/web/controller/SysAreaController.java

@@ -2,9 +2,10 @@ package com.ym.mec.web.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import io.swagger.annotations.ApiParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +25,7 @@ public class SysAreaController extends BaseController {
 
     @ApiOperation(value = "根据父节点查询区域树状列表（递归）")
     @GetMapping("/queryTree")
+    @PreAuthorize("@pcs.hasPermissions('area/queryTree')")
     public Object queryPage(TreeDto treeDto){
         if(treeDto.getParentId() == 0){
             return failed("非法参数");
@@ -33,6 +35,7 @@ public class SysAreaController extends BaseController {
 
     @ApiOperation(value = "根据父节点查询下一级子节点列表（不递归）")
     @GetMapping("/queryChild")
+    @PreAuthorize("@pcs.hasPermissions('area/queryChild')")
     public Object queryChild(TreeDto treeDto){
         return succeed(sysAreaService.queryChild(treeDto));
     }
@@ -58,6 +61,7 @@ public class SysAreaController extends BaseController {
 
     @ApiOperation(value = "根据子级区域获取父级节点")
     @GetMapping("/getParentArea/{id}")
+    @PreAuthorize("@pcs.hasPermissions('area/getParentArea')")
     @ApiParam(value = "区域编号", required = true)
     public Object getParentArea( @PathVariable("id") Integer id){
         return succeed(sysAreaService.getParentArea(id));

mec-web/src/main/java/com/ym/mec/web/controller/SysConfigController.java

@@ -10,6 +10,7 @@ import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,6 +33,7 @@ public class SysConfigController extends BaseController {
 
 	@ApiOperation(value = "参数列表")
 	@GetMapping(value = "list")
+    @PreAuthorize("@pcs.hasPermissions('sysConfig/list')")
 	public Object configList(String group) {
 		Map<String,Object> params = new HashMap<String, Object>();
 		params.put("group", group);
@@ -41,6 +43,7 @@ public class SysConfigController extends BaseController {
 
 	@ApiOperation(value = "修改参数")
 	@PostMapping(value = "update")
+    @PreAuthorize("@pcs.hasPermissions('sysConfig/update')")
 	public Object update(SysConfig config) {
 		config.setModifyOn(new Date());
 		sysConfigService.update(config);
@@ -49,6 +52,7 @@ public class SysConfigController extends BaseController {
 
 	@ApiOperation(value = "新增参数")
 	@PostMapping(value = "add")
+    @PreAuthorize("@pcs.hasPermissions('sysConfig/add')")
 	public Object addConfig(SysConfig config) {
 		if (config == null)
 			return failed("参数无效");
@@ -65,6 +69,7 @@ public class SysConfigController extends BaseController {
 
 	@ApiOperation(value = "查询参数")
 	@GetMapping(value = "get")
+    @PreAuthorize("@pcs.hasPermissions('sysConfig/get')")
 	public Object getConfig(Long id) {
 		if (id == null || id <= 0)
 			return failed("请检查输入的ID");
@@ -73,6 +78,7 @@ public class SysConfigController extends BaseController {
 
 	@ApiOperation(value = "查询参数")
 	@GetMapping(value = "queryByParamName")
+    @PreAuthorize("@pcs.hasPermissions('sysConfig/queryByParamName')")
 	public Object queryByParamName(String paramName) {
 		if(StringUtils.isBlank(paramName)){
 			return failed("参数不能为空");

mec-web/src/main/java/com/ym/mec/web/controller/SysUserBankCardController.java

@@ -5,9 +5,12 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
 import com.ym.mec.biz.service.SysUserBankCardService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +28,7 @@ public class SysUserBankCardController extends BaseController {
 
     @ApiOperation(value = "新增银行卡信息")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('userBankCard/add')")
     public Object add(SysUserBankCard sysUserBankCard) {
         if(sysUserBankCard == null){
             return failed("参数校验异常");
@@ -39,6 +43,7 @@ public class SysUserBankCardController extends BaseController {
 
     @ApiOperation(value = "删除银行卡信息")
     @PostMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('userBankCard/del')")
     public Object del(Long id) {
         if(id == null){
             return failed("参数校验失败");
@@ -53,6 +58,7 @@ public class SysUserBankCardController extends BaseController {
 
     @ApiOperation(value = "分页查询银行卡信息列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('userBankCard/queryPage')")
     public Object queryPage() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null || sysUser.getId() == null){

mec-web/src/main/java/com/ym/mec/web/controller/SysUserCashAccountController.java

@@ -5,9 +5,12 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,6 +27,7 @@ public class SysUserCashAccountController extends BaseController {
 
     @ApiOperation(value = "获取用户账户信息")
     @GetMapping("/get")
+    @PreAuthorize("@pcs.hasPermissions('userCashAccount/get')")
     public Object add() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
@@ -34,6 +38,7 @@ public class SysUserCashAccountController extends BaseController {
 
     @ApiOperation(value = "分页查询收费类型列表")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('userCashAccount/queryPage')")
     public Object queryPage(QueryInfo queryInfo) {
         return succeed(sysUserCashAccountService.queryPage(queryInfo));
     }

mec-web/src/main/java/com/ym/mec/web/controller/SysUserCashAccountDetailController.java

@@ -6,9 +6,12 @@ import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
 import com.ym.mec.biz.service.SysUserCashAccountDetailService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +29,7 @@ public class SysUserCashAccountDetailController extends BaseController {
 
     @ApiOperation(value = "新增用户交易明细")
     @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('userCashAccountDetail/add')")
     public Object add(SysUserCashAccountDetail sysUserCashAccountDetail) {
         sysUserCashAccountDetailService.insert(sysUserCashAccountDetail);
         return succeed();
@@ -33,6 +37,7 @@ public class SysUserCashAccountDetailController extends BaseController {
 
     @ApiOperation(value = "分页查询用户交易明细")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('userCashAccountDetail/queryPage')")
     public Object queryPage(CashAccountDetail queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if(user == null && user.getId() != null){

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -4,9 +4,12 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,6 +26,7 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "获取分部所有老师")
     @GetMapping("/findTeachers")
+    @PreAuthorize("@pcs.hasPermissions('teacher/findTeachers')")
     public HttpResponseResult findTeachers() {
         Integer organId = sysUserFeignService.queryUserInfo().getOrganId();
         return succeed(teacherService.findTeachers(organId));

mec-web/src/main/java/com/ym/mec/web/controller/TeacherDefaultVipGroupSalaryController.java

@@ -7,6 +7,7 @@ import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +27,7 @@ public class TeacherDefaultVipGroupSalaryController extends BaseController {
 
     @ApiOperation(value = "根据老师编号及课程类型编号获取默认课酬")
     @GetMapping("/findByTeacherAndCategory")
+    @PreAuthorize("@pcs.hasPermissions('teacherDefaultVipGroupSalary/findByTeacherAndCategory')")
     public Object findByTeacherAndCategory(Long userId, Long categoryId){
         return succeed(teacherDefaultVipGroupSalaryService.findByTeacherAndCategory(userId,categoryId));
     }

mec-web/src/main/java/com/ym/mec/web/controller/TeacherVipSchoolController.java

@@ -3,9 +3,12 @@ package com.ym.mec.web.controller;
 import com.ym.mec.biz.dal.entity.TeacherSchool;
 import com.ym.mec.biz.service.TeacherSchoolService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,18 +30,21 @@ public class TeacherVipSchoolController extends BaseController {
 
     @ApiOperation("单查询")
     @GetMapping(value = "/query")
+    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/query')")
     public Object query(Long id) {
         return succeed(teacherSchoolService.get(id));
     }
 
     @ApiOperation("根据教师编号获取教学点")
     @GetMapping(value = "/queryAll")
+    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/queryAll')")
     public Object queryAll(Integer teacherId) {
         return succeed(teacherSchoolService.findByTeacherId(teacherId));
     }
 
     @ApiOperation("新增")
     @PostMapping(value = "/add")
+    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/add')")
     public Object add(TeacherSchool teacherSchool) {
         Date date = new Date();
         teacherSchool.setCreateTime(date);
@@ -49,6 +55,7 @@ public class TeacherVipSchoolController extends BaseController {
 
     @ApiOperation("修改")
     @PostMapping(value = "/update")
+    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/update')")
     public Object update(TeacherSchool teacherSchool) {
         Date date = new Date();
         teacherSchool.setUpdateTime(date);
@@ -58,6 +65,7 @@ public class TeacherVipSchoolController extends BaseController {
 
     @ApiOperation("删除")
     @PostMapping(value = "/delete")
+    @PreAuthorize("@pcs.hasPermissions('teacherVipSchool/delete')")
     public Object delete(Long id) {
         teacherSchoolService.delete(id);
         return succeed();

mec-web/src/main/java/com/ym/mec/web/controller/UploadFileController.java

@@ -8,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -31,6 +32,7 @@ public class UploadFileController extends BaseController {
 	private UploadFileService uploadFileService;
 
 	@PostMapping(value = "uploadFile")
+    @PreAuthorize("@pcs.hasPermissions('uploadFile')")
 	public Object uploadFile(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file) {
 		try {
 			if (file != null && StringUtils.isNotBlank(file.getOriginalFilename())) {

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupActivityController.java

@@ -5,9 +5,12 @@ import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
 import com.ym.mec.biz.service.VipGroupActivityService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
@@ -27,6 +30,7 @@ public class VipGroupActivityController extends BaseController {
 
     @ApiOperation(value = "新增vip课活动方案")
     @PostMapping("/addVipGroupActivity")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/addVipGroupActivity')")
     public Object addVipGroupActivity(@RequestBody VipGroupActivityAddDto vipGroupActivityAddDto){
         vipGroupActivityService.addVipGroupActivity(vipGroupActivityAddDto);
         return succeed();
@@ -34,12 +38,14 @@ public class VipGroupActivityController extends BaseController {
 
     @ApiOperation(value = "分页查询活动方案")
     @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/queryPage')")
     public Object queryPage(VipGroupActivityQueryInfo queryInfo){
         return succeed(vipGroupActivityService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "修改活动方案")
     @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/update')")
     public Object update(@RequestBody VipGroupActivityAddDto vipGroupActivityAddDto){
         vipGroupActivityService.updateVipGroupActivity(vipGroupActivityAddDto);
         return succeed();
@@ -47,6 +53,7 @@ public class VipGroupActivityController extends BaseController {
 
     @ApiOperation(value = "删除活动方案")
     @PostMapping("/delete")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/delete')")
     public Object delete(Long id){
         if(Objects.isNull(id)){
             throw new BizException("请指定活动编号!");
@@ -57,6 +64,7 @@ public class VipGroupActivityController extends BaseController {
 
     @ApiOperation(value = "根据课程类型获取对应课程活动方案")
     @GetMapping("/findByVipGroupCategory")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/findByVipGroupCategory')")
     public Object findByVipGroupCategory(Long categoryId){
         return succeed(vipGroupActivityService.findByVipGroupCategory(categoryId));
     }

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupCategoryController.java

@@ -3,9 +3,12 @@ package com.ym.mec.web.controller;
 import com.ym.mec.biz.dal.entity.VipGroupCategory;
 import com.ym.mec.biz.service.VipGroupCategoryService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,18 +26,21 @@ public class VipGroupCategoryController extends BaseController {
 
 	@ApiOperation("单查询")
 	@GetMapping(value = "/query")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/query')")
 	public Object query(int id) {
 		return succeed(vipGroupCategoryService.get(id));
 	}
 
 	@ApiOperation("全查询")
 	@GetMapping(value = "/queryAll")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/queryAll')")
 	public Object queryAll(Long organId) {
 		return succeed(vipGroupCategoryService.findAllByOrgan(organId));
 	}
 
 	@ApiOperation("新增")
 	@PostMapping(value = "/add")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/add')")
 	public Object add(VipGroupCategory vipGroupCategory) {
 		Date date = new Date();
 		vipGroupCategory.setCreateTime(date);
@@ -46,6 +52,7 @@ public class VipGroupCategoryController extends BaseController {
 
 	@ApiOperation("修改")
 	@PostMapping(value = "/update")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/update')")
 	public Object update(VipGroupCategory vipGroupCategory) {
 		Date date = new Date();
 		vipGroupCategory.setUpdateTime(date);
@@ -55,6 +62,7 @@ public class VipGroupCategoryController extends BaseController {
 
 	@ApiOperation("删除")
 	@PostMapping(value = "/delete")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/delete')")
 	public Object delete(int id) {
 		VipGroupCategory vipGroupCategory = vipGroupCategoryService.get(id);
 		Date date = new Date();

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupDefaultClassesCycleController.java

@@ -3,9 +3,12 @@ package com.ym.mec.web.controller;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
 import com.ym.mec.biz.service.VipGroupDefaultClassesCycleService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,18 +26,21 @@ public class VipGroupDefaultClassesCycleController extends BaseController {
 
 	@ApiOperation("单查询")
 	@GetMapping(value = "/query")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesCycle/query')")
 	public Object query(int id) {
 		return succeed(vipGroupDefaultClassesCycleService.get(id));
 	}
 
 	@ApiOperation("全查询")
 	@GetMapping(value = "/queryAll")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesCycle/queryAll')")
 	public Object queryAll(Long organId) {
 		return succeed(vipGroupDefaultClassesCycleService.findAllByOrgan(organId));
 	}
 
 	@ApiOperation("新增")
 	@PostMapping(value = "/add")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesCycle/add')")
 	public Object add(VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle) {
 		vipGroupDefaultClassesCycleService.insert(vipGroupDefaultClassesCycle);
 		return succeed();
@@ -42,6 +48,7 @@ public class VipGroupDefaultClassesCycleController extends BaseController {
 
 	@ApiOperation("修改")
 	@PostMapping(value = "/update")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesCycle/update')")
 	public Object update(VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle) {
 		Date date = new Date();
 		vipGroupDefaultClassesCycle.setUpdateTime(date);
@@ -51,6 +58,7 @@ public class VipGroupDefaultClassesCycleController extends BaseController {
 
 	@ApiOperation("删除")
 	@PostMapping(value = "/delete")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesCycle/delete')")
 	public Object delete(int id) {
 		vipGroupDefaultClassesCycleService.delete(id);
 		return succeed();

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupDefaultClassesUnitPriceController.java

@@ -3,9 +3,12 @@ package com.ym.mec.web.controller;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
 import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,18 +26,21 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 
 	@ApiOperation("单查询")
 	@GetMapping(value = "/query")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesUnitPrice/query')")
 	public Object query(int id) {
 		return succeed(vipGroupDefaultClassesUnitPriceService.get(id));
 	}
 
 	@ApiOperation("全查询")
 	@GetMapping(value = "/queryAll")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesUnitPrice/queryAll')")
 	public Object queryAll(Long organId) {
 		return succeed(vipGroupDefaultClassesUnitPriceService.findAll(null));
 	}
 
 	@ApiOperation("新增")
 	@PostMapping(value = "/add")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesUnitPrice/add')")
 	public Object add(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice) {
 		Date date = new Date();
 		vipGroupDefaultClassesUnitPrice.setCreateTime(date);
@@ -45,6 +51,7 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 
 	@ApiOperation("修改")
 	@PostMapping(value = "/update")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesUnitPrice/update')")
 	public Object update(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice) {
 		Date date = new Date();
 		vipGroupDefaultClassesUnitPrice.setUpdateTime(date);
@@ -54,6 +61,7 @@ public class VipGroupDefaultClassesUnitPriceController extends BaseController {
 
 	@ApiOperation("删除")
 	@PostMapping(value = "/delete")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesUnitPrice/delete')")
 	public Object delete(int id) {
 		vipGroupDefaultClassesUnitPriceService.delete(id);
 		return succeed();

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -13,10 +13,13 @@ import com.ym.mec.biz.dal.page.VipGroupTeachingRecordQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -40,6 +43,7 @@ public class VipGroupManageController extends BaseController {
 
     @ApiOperation(value = "vip课申请")
     @PostMapping("/vipGroupApply")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/vipGroupApply')")
     public Object vipGroupApply(@RequestBody VipGroupApplyDto vipGroupApplyDto){
         SysUser sysUser = sysUserFeignService.queryUserById(vipGroupApplyDto.getVipGroupApplyBaseInfo().getUserId());
         if(Objects.isNull(sysUser)){
@@ -52,30 +56,35 @@ public class VipGroupManageController extends BaseController {
 
     @ApiOperation(value = "全查询")
     @GetMapping("/queryAll")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/queryAll')")
     public Object queryAll(VipGroupQueryInfo queryInfo) {
         return succeed(vipGroupService.findVipGroups(queryInfo));
     }
 
     @ApiOperation(value = "获取小课学员")
     @GetMapping(value = "/findVipGroupStudents")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/findVipGroupStudents')")
     public Object findVipGroupStudents(VipGroupQueryInfo queryInfo){
         return succeed(vipGroupService.findVipGroupStudents(queryInfo));
     }
 
     @ApiOperation(value = "vip课详情")
     @GetMapping("/getVipGroupDetail")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/getVipGroupDetail')")
     public Object getVipGroupDetail(Long vipGroupId){
         return succeed(vipGroupService.getVipGroupDetail(vipGroupId));
     }
 
     @ApiOperation(value = "获取vip课考勤记录")
     @PostMapping("/getVipGroupAttendances")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/getVipGroupAttendances')")
     public Object getVipGroupAttendances(@RequestBody VipGroupAttendanceQueryInfo queryInfo){
         return succeed(vipGroupService.findVipGroupAttendances(queryInfo));
     }
 
     @ApiOperation(value = "退课申请")
     @PostMapping("/applyRefundForStudent")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/applyRefundForStudent')")
     public Object applyRefundForStudent(Long vipGroupId,Long studentId){
         vipGroupService.applyRefund(vipGroupId,studentId);
         return succeed();
@@ -83,6 +92,7 @@ public class VipGroupManageController extends BaseController {
 
     @ApiOperation(value = "退课申请审核")
     @PostMapping("/applyRefundAudit")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/applyRefundAudit')")
     public Object applyRefundAudit(StudentApplyRefunds studentApplyRefunds){
         vipGroupService.applyRefundAudit(studentApplyRefunds);
         return succeed();
@@ -90,18 +100,21 @@ public class VipGroupManageController extends BaseController {
 
     @ApiOperation(value = "获取VIP课教学记录")
     @GetMapping("/findVipGroupTeachingRecord")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/findVipGroupTeachingRecord')")
     public Object findVipGroupTeachingRecord(VipGroupTeachingRecordQueryInfo queryInfo){
         return succeed(vipGroupService.findVipGroupTeachingRecord(queryInfo));
     }
 
     @ApiOperation(value = "获取vip课基本信息")
     @GetMapping("/findTeachingRecordBaseInfo")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/findTeachingRecordBaseInfo')")
     public Object findTeachingRecordBaseInfo(Long vipGroupId){
         return succeed(vipGroupService.findTeachingRecordBaseInfo(vipGroupId));
     }
 
     @ApiOperation("课酬总费用")
     @PostMapping("/getVipGroupCostCount")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/getVipGroupCostCount')")
     public Object getVipGroupCostCount(VipGroup vipGroup){
         Map results = vipGroupService.countVipGroupPredictFee(vipGroup, vipGroup.getOnlineClassesUnitPrice(), vipGroup.getOfflineClassesUnitPrice());
         return succeed(results);
@@ -109,6 +122,7 @@ public class VipGroupManageController extends BaseController {
 
     @ApiOperation(value = "停止vip课")
     @PostMapping("/stopVipGroup")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/stopVipGroup')")
     public Object stopVipGroup(Long vipGroupId){
         if(Objects.isNull(vipGroupId)){
             return failed(HttpStatus.FORBIDDEN,"请指定vip课");
@@ -119,18 +133,21 @@ public class VipGroupManageController extends BaseController {
 
     @ApiOperation(value = "获取vip课财务信息")
     @GetMapping("/findVipGroupSalarys")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/findVipGroupSalarys')")
     public Object findVipGroupSalarys(VipGroupSalaryQueryInfo queryInfo){
         return succeed(vipGroupService.findVipGroupSalarys(queryInfo));
     }
 
     @ApiOperation(value = "获取当前课程上课学员")
     @GetMapping("/findVipGroupAttendanceStudents")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/findVipGroupAttendanceStudents')")
     public Object findVipGroupStudents(Long courseScheduleId){
         return succeed(vipGroupService.findVipGroupAttendanceStudents(courseScheduleId));
     }
 
     @ApiOperation(value = "课时调整")
     @PostMapping(value = "/classStartDateAdjust")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/classStartDateAdjust')")
     public Object classStartDateAdjust(ClassDateAdjustDto classDateAdjustDto){
         if(Objects.isNull(classDateAdjustDto.getId())){
             return failed(HttpStatus.FORBIDDEN, "请指定课程!");