乐团档案

mec-biz/src/main/java/com/ym/mec/biz/dal/page/PhotoQueryInfo.java

@@ -8,12 +8,22 @@ public class PhotoQueryInfo extends QueryInfo {
 
 	private YesOrNoEnum clientShow;
 
+	private YesOrNoEnum clientShowNum;
+
 	private Integer photoAlbumId;
 
 	private String musicGroupId;
 
 	private Integer photoId;
 
+	public YesOrNoEnum getClientShowNum() {
+		return clientShowNum;
+	}
+
+	public void setClientShowNum(YesOrNoEnum clientShowNum) {
+		this.clientShowNum = clientShowNum;
+	}
+
 	public String getType() {
 		return type;
 	}

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

@@ -43,7 +43,7 @@ public class PhotoAlbumServiceImpl extends BaseServiceImpl<Integer, PhotoAlbum>
 		List<PhotoAlbum> rows = photoAlbumPageInfo.getRows();
 		if(rows.size() > 0){
 			List<Integer> albumIds = rows.stream().map(e -> e.getId()).collect(Collectors.toList());
-			Map<Integer, Long> totalNumMap = MapUtil.convertIntegerMap(photoAlbumDao.countTotalNumByAlbumIds(albumIds,queryInfo.getClientShow()));
+			Map<Integer, Long> totalNumMap = MapUtil.convertIntegerMap(photoAlbumDao.countTotalNumByAlbumIds(albumIds,queryInfo.getClientShowNum()));
 			for (PhotoAlbum photoAlbum : rows) {
 				photoAlbum.setPhotoNum(totalNumMap.get(photoAlbum.getId()));
 			}

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

@@ -8,6 +8,7 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,12 +24,14 @@ public class MusicGroupTrainPlanController extends BaseController {
 
 	@ApiOperation("新增乐团训练规划")
 	@PostMapping(value = "add")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/add')")
 	public Object add(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
 		return succeed(musicGroupTrainPlanService.add(musicGroupTrainPlanSaveDto));
 	}
 
 	@ApiOperation("修改乐团训练规划")
 	@PostMapping(value = "update")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/update')")
 	public Object add(String plan,Integer planId) {
 		MusicGroupTrainPlan musicGroupTrainPlan = musicGroupTrainPlanService.get(planId);
 		if(musicGroupTrainPlan == null){
@@ -40,12 +43,14 @@ public class MusicGroupTrainPlanController extends BaseController {
 
 	@ApiOperation("获取乐团训练规划")
 	@PostMapping(value = "queryPlanPage")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/queryPlanPage')")
 	public Object queryPlanPage(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
 		return succeed(musicGroupTrainPlanService.queryPlanPage(musicGroupTrainPlanSaveDto));
 	}
 
 	@ApiOperation("获取乐团训练规划课时")
 	@PostMapping(value = "queryPlanCourseNum")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupTrainPlan/queryPlanCourseNum')")
 	public Object queryPlanCourseNum(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
 		return succeed(musicGroupTrainPlanService.queryPlanCourseNum(musicGroupTrainPlanSaveDto));
 	}

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

@@ -7,6 +7,7 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,24 +22,28 @@ public class PhotoAlbumController extends BaseController {
 
 	@ApiOperation("新增")
 	@PostMapping(value = "add")
+	@PreAuthorize("@pcs.hasPermissions('photoAlbum/add')")
 	public Object add(PhotoAlbum photoAlbum) {
 		return succeed(photoAlbumService.insert(photoAlbum));
 	}
 
 	@ApiOperation("修改")
 	@PostMapping(value = "update")
+	@PreAuthorize("@pcs.hasPermissions('photoAlbum/update')")
 	public Object update(PhotoAlbum photoAlbum) {
 		return succeed(photoAlbumService.update(photoAlbum));
 	}
 
 	@ApiOperation("删除")
 	@PostMapping(value = "del")
+	@PreAuthorize("@pcs.hasPermissions('photoAlbum/del')")
 	public Object del(Integer id) {
 		return succeed(photoAlbumService.del(id));
 	}
 
 	@ApiOperation("分页查询")
 	@PostMapping(value = "queryPage")
+	@PreAuthorize("@pcs.hasPermissions('photoAlbum/queryPage')")
 	public Object queryPage(PhotoQueryInfo queryInfo) {
 		return succeed(photoAlbumService.queryAlbumPage(queryInfo));
 	}

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

@@ -7,6 +7,7 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,24 +25,28 @@ public class PhotoController extends BaseController {
 
 	@ApiOperation("新增")
 	@PostMapping(value = "add")
+	@PreAuthorize("@pcs.hasPermissions('photo/add')")
 	public Object add(@RequestBody List<Photo> photoList) {
 		return succeed(photoService.batchAdd(photoList));
 	}
 
 	@ApiOperation("修改")
 	@PostMapping(value = "update")
+	@PreAuthorize("@pcs.hasPermissions('photo/update')")
 	public Object update(Photo photo) {
 		return succeed(photoService.update(photo));
 	}
 
 	@ApiOperation("删除")
 	@PostMapping(value = "del")
+	@PreAuthorize("@pcs.hasPermissions('photo/del')")
 	public Object del(String ids) {
 		return succeed(photoService.del(ids));
 	}
 
 	@ApiOperation("分页查询")
 	@PostMapping(value = "queryPage")
+	@PreAuthorize("@pcs.hasPermissions('photo/queryPage')")
 	public Object queryPage(PhotoQueryInfo queryInfo) {
 		return succeed(photoService.queryPage(queryInfo));
 	}