Commit 44ce882f authored by liqin's avatar liqin 💬

bug fixed

parent acb265fe
......@@ -100,6 +100,7 @@ public class ExhibitionBoard implements Serializable {
@ApiModelProperty("是否已删除")
@TableField("is_deleted")
@TableLogic
private Boolean deleted;
@ApiModelProperty("创建日期")
......
......@@ -10,8 +10,10 @@ import cn.wisenergy.chnmuseum.party.service.AuditService;
import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
import cn.wisenergy.chnmuseum.party.service.LearningContentService;
import cn.wisenergy.chnmuseum.party.service.VideoContentService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
......@@ -21,6 +23,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
/**
* <pre>
......@@ -258,6 +261,10 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
update = this.videoContentService.updateById(videoContent);
break;
case REMOVE:
final LambdaQueryWrapper<ExhibitionBoard> queryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getVideoContentId, videoContent.getId());
queryWrapper.select(ExhibitionBoard::getId);
final List<String> ExhibitionBoardIdList = this.exhibitionBoardService.listObjs(queryWrapper, Object::toString);
this.exhibitionBoardService.removeByIds(ExhibitionBoardIdList);
update = this.videoContentService.removeById(videoContent);
break;
default:
......
......@@ -40,6 +40,8 @@ import java.util.stream.Collectors;
@Api(tags = {"视频内容内容接口"})
public class VideoContentController extends BaseController {
@Resource
private ExhibitionBoardService exhibitionBoardService;
@Resource
private VideoContentService videoContentService;
@Resource
......@@ -141,11 +143,26 @@ public class VideoContentController extends BaseController {
return getFailResult();
}
@GetMapping("/getExhibitionBoardById/{id}")
@RequiresAuthentication //@RequiresPermissions("video:content:delete")
@ApiOperation(value = "根据视频内容ID查询被引用的展板", notes = "根据视频内容ID查询被引用的展板")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
})
public Map<String, Object> getExhibitionBoardById(@PathVariable("id") String id) {
final List<ExhibitionBoard> exhibitionBoardList = this.exhibitionBoardService.list(Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getVideoContentId, id));
if (!exhibitionBoardList.isEmpty()) {
final String collect = exhibitionBoardList.stream().map(ExhibitionBoard::getName).collect(Collectors.joining("、"));
return getFailResult(collect);
}
return getSuccessResult();
}
@DeleteMapping("/delete/{id}")
@RequiresAuthentication //@RequiresPermissions("video:content:delete")
@ApiOperation(value = "根据ID删除视频内容", notes = "根据ID删除视频内容")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
@ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
})
public Map<String, Object> deleteVideoContent(@PathVariable("id") String id) {
TUser user = getcurUser();
......
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