Commit 6567cd25 authored by liqin's avatar liqin 💬

bug fixed

parent 183799ed
...@@ -222,13 +222,7 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> ...@@ -222,13 +222,7 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
sysLog.setOperationType(OperType.DISABLE.getMsg()); sysLog.setOperationType(OperType.DISABLE.getMsg());
} }
} else if (methodLog.operModule().getCode().equals(OperModule.DISPLAYCONTENT.getCode()) && methodLog.operType().getCode().equals(OperType.UPDATE.getCode())) { } else if (methodLog.operModule().getCode().equals(OperModule.DISPLAYCONTENT.getCode()) && methodLog.operType().getCode().equals(OperType.UPDATE.getCode())) {
Boolean o = (Boolean) method_param[1];
if (o) {
sysLog.setOperationType(OperType.UPDATE.getMsg()); sysLog.setOperationType(OperType.UPDATE.getMsg());
} else {
sysLog.setOperationType(OperType.LOWER.getMsg());
}
} else if (methodLog.operModule().getCode().equals(OperModule.VIDEOCOPYRIGHT.getCode())) { } else if (methodLog.operModule().getCode().equals(OperModule.VIDEOCOPYRIGHT.getCode())) {
GenericPageParam g = (GenericPageParam) method_param[0]; GenericPageParam g = (GenericPageParam) method_param[0];
if (VIDEO_CONTENT.name().equals(g.getOwnerType())) { if (VIDEO_CONTENT.name().equals(g.getOwnerType())) {
...@@ -236,7 +230,6 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> ...@@ -236,7 +230,6 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
} else { } else {
sysLog.setOperationObject(OperModule.DISPLAYCOPYRIGHT.getMsg()); sysLog.setOperationObject(OperModule.DISPLAYCOPYRIGHT.getMsg());
} }
} else if (methodLog.operModule().getCode().equals(OperModule.DISPLAYCOPYRIGHT.getCode())) { } else if (methodLog.operModule().getCode().equals(OperModule.DISPLAYCOPYRIGHT.getCode())) {
CopyrightOwner c; CopyrightOwner c;
String type = null; String type = null;
...@@ -261,7 +254,6 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> ...@@ -261,7 +254,6 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
break; break;
} }
} }
} }
/** /**
......
...@@ -50,6 +50,8 @@ public class ExhibitionBoardCatController extends BaseController { ...@@ -50,6 +50,8 @@ public class ExhibitionBoardCatController extends BaseController {
@Resource @Resource
private ExhibitionBoardService exhibitionBoardService; private ExhibitionBoardService exhibitionBoardService;
@Resource @Resource
private ExhibitionBoardTmpService exhibitionBoardTmpService;
@Resource
private ExhibitionBoardCatService exhibitionBoardCatService; private ExhibitionBoardCatService exhibitionBoardCatService;
@Resource @Resource
private CopyrightOwnerService copyrightOwnerService; private CopyrightOwnerService copyrightOwnerService;
...@@ -211,6 +213,10 @@ public class ExhibitionBoardCatController extends BaseController { ...@@ -211,6 +213,10 @@ public class ExhibitionBoardCatController extends BaseController {
LambdaUpdateWrapper<LearningContentBoard> deleteWrapper2 = Wrappers.<LearningContentBoard>lambdaUpdate().eq(LearningContentBoard::getExhibitionBoardCatId, id); LambdaUpdateWrapper<LearningContentBoard> deleteWrapper2 = Wrappers.<LearningContentBoard>lambdaUpdate().eq(LearningContentBoard::getExhibitionBoardCatId, id);
this.learningContentBoardService.remove(deleteWrapper2); this.learningContentBoardService.remove(deleteWrapper2);
final LambdaQueryWrapper<ExhibitionBoard> lambdaQueryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getExhibitionBoardCatId, id).select(ExhibitionBoard::getId);
final List<String> exhibitionBoardIdList = this.exhibitionBoardService.listObjs(lambdaQueryWrapper, Object::toString);
this.exhibitionBoardTmpService.removeByIds(exhibitionBoardIdList);
// final LambdaUpdateWrapper<VideoContent> updateWrapper = Wrappers.<VideoContent>lambdaUpdate().eq(VideoContent::getVideoContentCopyrightOwnerId, id); // final LambdaUpdateWrapper<VideoContent> updateWrapper = Wrappers.<VideoContent>lambdaUpdate().eq(VideoContent::getVideoContentCopyrightOwnerId, id);
// updateWrapper.set(VideoContent::getDeleted, true); // updateWrapper.set(VideoContent::getDeleted, true);
// this.videoContentService.update(updateWrapper); // this.videoContentService.update(updateWrapper);
......
...@@ -5,14 +5,8 @@ import cn.wisenergy.chnmuseum.party.common.log.OperModule; ...@@ -5,14 +5,8 @@ import cn.wisenergy.chnmuseum.party.common.log.OperModule;
import cn.wisenergy.chnmuseum.party.common.log.OperType; import cn.wisenergy.chnmuseum.party.common.log.OperType;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add; import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam; import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
import cn.wisenergy.chnmuseum.party.model.CopyrightOwner; import cn.wisenergy.chnmuseum.party.model.*;
import cn.wisenergy.chnmuseum.party.model.CopyrightOwnerVideoContentCat; import cn.wisenergy.chnmuseum.party.service.*;
import cn.wisenergy.chnmuseum.party.model.VideoContent;
import cn.wisenergy.chnmuseum.party.model.VideoContentCat;
import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerVideoContentCatService;
import cn.wisenergy.chnmuseum.party.service.VideoContentCatService;
import cn.wisenergy.chnmuseum.party.service.VideoContentService;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController; import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
...@@ -58,9 +52,15 @@ public class VideoContentCatController extends BaseController { ...@@ -58,9 +52,15 @@ public class VideoContentCatController extends BaseController {
@Resource @Resource
private VideoContentService videoContentService; private VideoContentService videoContentService;
@Resource
private VideoContentTmpService videoContentTmpService;
@Resource @Resource
private CopyrightOwnerService copyrightOwnerService; private CopyrightOwnerService copyrightOwnerService;
@Resource
private ExhibitionBoardService exhibitionBoardService;
@PostMapping(value = "/save") @PostMapping(value = "/save")
@RequiresAuthentication //@RequiresPermissions("video:content:cat:save") @RequiresAuthentication //@RequiresPermissions("video:content:cat:save")
@ApiOperation(value = "添加视频内容分类", notes = "添加视频内容分类") @ApiOperation(value = "添加视频内容分类", notes = "添加视频内容分类")
...@@ -182,6 +182,14 @@ public class VideoContentCatController extends BaseController { ...@@ -182,6 +182,14 @@ public class VideoContentCatController extends BaseController {
final LambdaUpdateWrapper<CopyrightOwnerVideoContentCat> updateWrapper1 = Wrappers.<CopyrightOwnerVideoContentCat>lambdaUpdate().eq(CopyrightOwnerVideoContentCat::getVideoContentCatId, id); final LambdaUpdateWrapper<CopyrightOwnerVideoContentCat> updateWrapper1 = Wrappers.<CopyrightOwnerVideoContentCat>lambdaUpdate().eq(CopyrightOwnerVideoContentCat::getVideoContentCatId, id);
this.copyrightOwnerVideoContentCatService.remove(updateWrapper1); this.copyrightOwnerVideoContentCatService.remove(updateWrapper1);
final LambdaQueryWrapper<VideoContent> lambdaQueryWrapper = Wrappers.<VideoContent>lambdaQuery().eq(VideoContent::getVideoContentCatId, id).select(VideoContent::getId);
final List<String> videoContentIdList = this.videoContentService.listObjs(lambdaQueryWrapper, Object::toString);
this.videoContentTmpService.removeByIds(videoContentIdList);
final LambdaQueryWrapper<ExhibitionBoard> queryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().in(ExhibitionBoard::getVideoContentId, videoContentIdList).select(ExhibitionBoard::getId);
final List<String> ExhibitionBoardIdList = this.exhibitionBoardService.listObjs(queryWrapper, Object::toString);
this.exhibitionBoardService.removeByIds(ExhibitionBoardIdList);
// final LambdaQueryWrapper<CopyrightOwnerVideoContentCat> eq = Wrappers.<CopyrightOwnerVideoContentCat>lambdaQuery().eq(CopyrightOwnerVideoContentCat::getVideoContentCatId, id); // final LambdaQueryWrapper<CopyrightOwnerVideoContentCat> eq = Wrappers.<CopyrightOwnerVideoContentCat>lambdaQuery().eq(CopyrightOwnerVideoContentCat::getVideoContentCatId, id);
// final List<CopyrightOwnerVideoContentCat> list = this.copyrightOwnerVideoContentCatService.list(eq); // final List<CopyrightOwnerVideoContentCat> list = this.copyrightOwnerVideoContentCatService.list(eq);
// final List<String> collect = list.stream().map(CopyrightOwnerVideoContentCat::getCopyrightOwnerId).distinct().collect(Collectors.toList()); // final List<String> collect = list.stream().map(CopyrightOwnerVideoContentCat::getCopyrightOwnerId).distinct().collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment