Merge branch 'dev_1_2_20220802' of http://git.dayaedu.com/yonge/cooleshow into dev_1_2_20220802

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityEvaluationRecordController.java

@@ -9,6 +9,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -31,6 +32,7 @@ public class ActivityEvaluationRecordController extends BaseController {
      */
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('activityEvaluationRecord/detail')")
     public HttpResponseResult<ActivityEvaluationRecordVo> detail(@PathVariable("id") Long id) {
     	return succeed(activityEvaluationRecordService.detail(id));
 	}
@@ -40,47 +42,10 @@ public class ActivityEvaluationRecordController extends BaseController {
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入activityEvaluationRecordSearch")
+    @PreAuthorize("@pcs.hasPermissions('activityEvaluationRecord/page')")
     public HttpResponseResult<PageInfo<ActivityEvaluationRecordVo>> page(@RequestBody ActivityEvaluationRecordSearch query) {
 		IPage<ActivityEvaluationRecordVo> pages = activityEvaluationRecordService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
 	}
-    
-    /**
-	 * 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperation(value = "新增", notes = "传入activityEvaluationRecord")
-	public HttpResponseResult save(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
-    	return status(activityEvaluationRecordService.save(activityEvaluationRecord));
-	}
-    
-    /**
-	 * 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperation(value = "修改", notes = "传入activityEvaluationRecord")
-	public HttpResponseResult update(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
-        return status(activityEvaluationRecordService.updateById(activityEvaluationRecord));
-	}
-    
-    /**
-	 * 新增或修改
-	 */
-    @PostMapping("/submit")
-    @ApiOperation(value = "新增或修改", notes = "传入activityEvaluationRecord")
-	public HttpResponseResult submit(@Valid @RequestBody ActivityEvaluationRecord activityEvaluationRecord) {
-        return status(activityEvaluationRecordService.saveOrUpdate(activityEvaluationRecord));
-    }
 
- 	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        if (StringUtil.isEmpty(ids)) {
-			return failed("参数不能为空");
-		}
-		return status(activityEvaluationRecordService.removeByIds(StringUtil.toLongList(ids)));
-	}
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityPlanController.java

@@ -13,6 +13,7 @@ import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.*;
 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 javax.annotation.Resource;
@@ -39,6 +40,7 @@ public class ActivityPlanController extends BaseController {
      */
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/detail')")
     public HttpResponseResult<ActivityPlanVo> detail(@PathVariable("id") Long id) {
         return succeed(activityPlanService.detail(id));
     }
@@ -48,6 +50,7 @@ public class ActivityPlanController extends BaseController {
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入activityPlanSearch")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/page')")
     public HttpResponseResult<PageInfo<ActivityPlanVo>> page(@RequestBody ActivityPlanSearch query) {
         IPage<ActivityPlanVo> pages = activityPlanService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
@@ -58,6 +61,7 @@ public class ActivityPlanController extends BaseController {
      */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入activityPlan")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/submit')")
     public HttpResponseResult<ActivityPlan> submit(@Valid @RequestBody ActivityPlanDto activityPlan) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
@@ -71,6 +75,7 @@ public class ActivityPlanController extends BaseController {
      */
     @GetMapping("/updateActivityState")
     @ApiOperation(value = "启用/停用")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/updateActivityState')")
     public HttpResponseResult updateActivityState(
             @ApiParam(value = "活动id", required = true) @RequestParam("activityId") Long activityId,
             @ApiParam(value = "活动状态 0 停用 1 启用", required = true) @RequestParam("activityState") Integer activityState) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRegistrationController.java

@@ -9,6 +9,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -31,56 +32,20 @@ public class ActivityRegistrationController extends BaseController {
      */
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
+    @PreAuthorize("@pcs.hasPermissions('activityRegistration/detail')")
     public HttpResponseResult<ActivityRegistrationVo> detail(@PathVariable("id") Long id) {
     	return succeed(activityRegistrationService.detail(id));
 	}
     
     /**
-     * 查询分页
+     * 参与名单
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入activityRegistrationSearch")
+    @PreAuthorize("@pcs.hasPermissions('activityRegistration/page')")
     public HttpResponseResult<PageInfo<ActivityRegistrationVo>> page(@RequestBody ActivityRegistrationSearch query) {
 		IPage<ActivityRegistrationVo> pages = activityRegistrationService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
 	}
-    
-    /**
-	 * 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperation(value = "新增", notes = "传入activityRegistration")
-	public HttpResponseResult save(@Valid @RequestBody ActivityRegistration activityRegistration) {
-    	return status(activityRegistrationService.save(activityRegistration));
-	}
-    
-    /**
-	 * 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperation(value = "修改", notes = "传入activityRegistration")
-	public HttpResponseResult update(@Valid @RequestBody ActivityRegistration activityRegistration) {
-        return status(activityRegistrationService.updateById(activityRegistration));
-	}
-    
-    /**
-	 * 新增或修改
-	 */
-    @PostMapping("/submit")
-    @ApiOperation(value = "新增或修改", notes = "传入activityRegistration")
-	public HttpResponseResult submit(@Valid @RequestBody ActivityRegistration activityRegistration) {
-        return status(activityRegistrationService.saveOrUpdate(activityRegistration));
-    }
 
- 	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        if (StringUtil.isEmpty(ids)) {
-			return failed("参数不能为空");
-		}
-		return status(activityRegistrationService.removeByIds(StringUtil.toLongList(ids)));
-	}
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityRewardController.java

@@ -9,6 +9,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -30,8 +31,9 @@ public class ActivityRewardController extends BaseController {
      * 通过奖品id查询单条
      */
     @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入id")
-    public HttpResponseResult<ActivityRewardVo> detail(@PathVariable("id") Long id) {
+    @ApiOperation(value = "通过奖品id查询单条", notes = "传入id")
+	@PreAuthorize("@pcs.hasPermissions('activityReward/detail')")
+	public HttpResponseResult<ActivityRewardVo> detail(@PathVariable("id") Long id) {
     	return succeed(activityRewardService.detail(id));
 	}
 
@@ -39,7 +41,8 @@ public class ActivityRewardController extends BaseController {
 	 * 通过活动id查询单条
 	 */
 	@GetMapping("/detailByActivityId/{id}")
-	@ApiOperation(value = "详情", notes = "传入id")
+	@ApiOperation(value = "通过活动id查询单条", notes = "传入id")
+	@PreAuthorize("@pcs.hasPermissions('activityReward/detailByActivityId')")
 	public HttpResponseResult<ActivityRewardVo> detailByActivityId(@PathVariable("id") Long id) {
 		return succeed(activityRewardService.detailByActivityId(id));
 	}
@@ -49,7 +52,8 @@ public class ActivityRewardController extends BaseController {
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入activityRewardSearch")
-    public HttpResponseResult<PageInfo<ActivityRewardVo>> page(@RequestBody ActivityRewardSearch query) {
+	@PreAuthorize("@pcs.hasPermissions('activityReward/page')")
+	public HttpResponseResult<PageInfo<ActivityRewardVo>> page(@RequestBody ActivityRewardSearch query) {
 		IPage<ActivityRewardVo> pages = activityRewardService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
 	}
@@ -59,8 +63,8 @@ public class ActivityRewardController extends BaseController {
 	 */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入activityReward")
+	@PreAuthorize("@pcs.hasPermissions('activityReward/submit')")
 	public HttpResponseResult submit(@Valid @RequestBody ActivityReward activityReward) {
         return status(activityRewardService.submit(activityReward));
     }
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ActivityRegistrationSearch.java

@@ -10,5 +10,9 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "ActivityRegistrationSearch对象", description = "活动报名表查询对象")
 public class ActivityRegistrationSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
+	/**
+	 *
+	 */
+	private String musicName;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityEvaluationVo.java

@@ -1,7 +1,11 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
+import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
 
 /**
  * @Author: liweifan
@@ -10,4 +14,55 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "ActivityEvaluationVo对象", description = "评测活动表查询视图对象")
 public class ActivityEvaluationVo extends ActivityEvaluation{
 	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "曲目名称")
+	private String musicSheetName;
+	@ApiModelProperty(value = "标签")
+	private String musicTagNames;
+	@ApiModelProperty(value = "可用声部")
+	private String subjectNames;
+	@ApiModelProperty(value = "曲目来源: TEACHER 老师 PLATFORM 平台")
+	private SourceTypeEnum sourceType;
+	@ApiModelProperty(value = "销售价格")
+	private BigDecimal musicPrice;
+
+	public String getMusicSheetName() {
+		return musicSheetName;
+	}
+
+	public void setMusicSheetName(String musicSheetName) {
+		this.musicSheetName = musicSheetName;
+	}
+
+	public String getMusicTagNames() {
+		return musicTagNames;
+	}
+
+	public void setMusicTagNames(String musicTagNames) {
+		this.musicTagNames = musicTagNames;
+	}
+
+	public String getSubjectNames() {
+		return subjectNames;
+	}
+
+	public void setSubjectNames(String subjectNames) {
+		this.subjectNames = subjectNames;
+	}
+
+	public SourceTypeEnum getSourceType() {
+		return sourceType;
+	}
+
+	public void setSourceType(SourceTypeEnum sourceType) {
+		this.sourceType = sourceType;
+	}
+
+	public BigDecimal getMusicPrice() {
+		return musicPrice;
+	}
+
+	public void setMusicPrice(BigDecimal musicPrice) {
+		this.musicPrice = musicPrice;
+	}
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityEvaluationMapper.xml

@@ -22,13 +22,27 @@
         SELECT
         <include refid="baseColumns"/>
         FROM activity_evaluation t
+        left join music_sheet ms on t.music_sheet_id_ = ms.id_
         where t.id_ = #{id}
     </select>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationVo">
         SELECT
-        <include refid="baseColumns" />
+            <include refid="baseColumns" />,
+                ms.music_sheet_name_ as musicSheetName,
+                (select group_concat(mt.name_) from music_tag mt
+                    where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames,
+                (select group_concat(s.name_) from subject s
+                    where find_in_set(s.id_,ms.music_subject_) and s.del_flag_ = 0 ) as subjectNames,
+                ms.source_type_ as sourceType,
+                ms.music_price_ as musicPrice
         FROM activity_evaluation t
+        left join music_sheet ms on t.music_sheet_id_ = ms.id_
+        <where>
+            <if test="param.activityId != null">
+                and t.activity_id_ = #{param.activityId}
+            </if>
+        </where>
     </select>
 
     <select id="selectUnjoinMusicIds" resultType="java.lang.Long">