Skip to content

N
nrgl
提交 bf068700 authored 作者: renjiancai's avatar renjiancai
浏览文件
操作

--no commit message

上级 c971e319
隐藏空白字符变更
内嵌 并排
正在显示 包含 211 行增加 和 21 行删除
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/articlelibrary/ArticleLibraryController.java
浏览文件 @ bf068700
......@@ -12,7 +12,6 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -30,7 +29,6 @@ import com.zrqx.core.form.resource.bg.BatchDeleteForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaverFileForm;
import com.zrqx.core.form.resource.bg.animation.BatchUpdateAnimationLibraryForm;
import com.zrqx.core.form.resource.bg.articlelibrary.BatchUpdateArticleLibraryForm;
import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
......@@ -90,6 +88,7 @@ public class ArticleLibraryController {
@Autowired
private LabelContentDiyTypeService labelContentDiyTypeService;
@ApiOperation(value = "新增", notes = "新增一个")
@PostMapping(value = ResourceRequestPath.SAVE)
public CallBack<Boolean> save(@RequestBody SaveUpdateArticleLibraryForm form) throws ParseException {
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/clauseLibrary/ClauseLibraryController.java
浏览文件 @ bf068700
......@@ -4,13 +4,13 @@
*/
package com.zrqx.resource.bg.controller.clauseLibrary;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,35 +28,39 @@ import com.zrqx.core.enums.ResourceTypeEnum;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.BatchDeleteForm;
import com.zrqx.core.form.resource.bg.BatchUpdateForm;
import com.zrqx.core.form.resource.bg.ImportForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.BatchUpdateForm;
import com.zrqx.core.form.resource.bg.SaverFileForm;
import com.zrqx.core.form.resource.bg.clauseLibrary.QueryClauseLibraryForm;
import com.zrqx.core.form.resource.bg.clauseLibrary.SaveUpdateClauseLibraryForm;
import com.zrqx.core.model.resource.audiolibrary.AudioLibraryLabel;
import com.zrqx.core.model.resource.clauseLibrary.ClauseLibrary;
import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
import com.zrqx.core.model.resource.clauseLibrary.ClauseGoods;
import com.zrqx.core.model.resource.clauseLibrary.ClauseLibrary;
import com.zrqx.core.model.resource.clauseLibrary.ClauseLibraryDiyType;
import com.zrqx.core.model.resource.clauseLibrary.ClauseLibraryLabel;
import com.zrqx.core.model.resource.clauseLibrary.ClauseResource;
import com.zrqx.core.model.resource.pdflibrary.PdfLibrary;
import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.DateUtils;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
import com.zrqx.core.util.UUIDUtil;
import com.zrqx.core.vo.resource.ResourceRelationVo;
import com.zrqx.core.vo.resource.clauseLibrary.ClauseLibraryListVo;
import com.zrqx.core.vo.resource.clauseLibrary.ClauseLibraryOneVo;
import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
import com.zrqx.resource.bg.service.ResourceRelationService;
import com.zrqx.resource.bg.service.clauseLibrary.ClauseLibraryService;
import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryService;
import com.zrqx.resource.bg.service.clauseLibrary.ClauseGoodsService;
import com.zrqx.resource.bg.service.clauseLibrary.ClauseLibraryDiyTypeService;
import com.zrqx.resource.bg.service.clauseLibrary.ClauseLibraryLabelService;
import com.zrqx.resource.bg.service.clauseLibrary.ClauseLibraryService;
import com.zrqx.resource.bg.service.clauseLibrary.ClauseResourceService;
import com.zrqx.resource.bg.service.label.LabelContentDiyTypeService;
import com.zrqx.resource.bg.service.pdflibrary.PdfLibraryService;
import com.zrqx.resource.bg.service.videolibrary.VideoLibraryService;
/**
* 资源-条文库Controller
......@@ -83,6 +87,12 @@ public class ClauseLibraryController {
private ResourceRelationService resourceRelationService;
@Autowired
private LabelContentDiyTypeService labelContentDiyTypeService;
@Autowired
private VideoLibraryService videoLibraryService;
@Autowired
private AudioLibraryService audioLibraryService;
@Autowired
private PdfLibraryService pdfLibrarySerivce;
@ApiOperation(value = "新增", notes = "新增一个")
@PostMapping(value = ResourceRequestPath.SAVE)
......@@ -149,6 +159,24 @@ public class ClauseLibraryController {
vo.setStartDate(DateUtils.dateTimeToStr(goods.getStartDate(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
vo.setEndDate(DateUtils.dateTimeToStr(goods.getEndDate(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
}
if(entity.getVideo()!=null && !entity.getVideo().equals("0")){
VideoLibrary videoLibrary = videoLibraryService.selectByPrimaryKey(entity.getVideo());
if(videoLibrary!=null ){
vo.setVideoName(videoLibrary.getName());
}
}
if(entity.getAudio()!=null && !entity.getAudio().equals("0")){
AudioLibrary audioLibrary = audioLibraryService.selectByPrimaryKey(entity.getAudio());
if(audioLibrary!=null ){
vo.setAudioName(audioLibrary.getName());
}
}
if(entity.getPdf()!=null && !entity.getPdf().equals("0")){
PdfLibrary pdfLibrary = pdfLibrarySerivce.selectByPrimaryKey(entity.getPdf());
if(pdfLibrary!=null ){
vo.setPdfName(pdfLibrary.getName());
}
}
BeanUtils.copyProperties(entity, vo);
}
return CallBack.success(vo);
......@@ -170,16 +198,22 @@ public class ClauseLibraryController {
}
List<ClauseResource> recordList = new ArrayList<ClauseResource>();
for (int i = 0; i < entity.getResourceIds().size(); i++) {
ClauseResource e = new ClauseResource();
e.setResourceId(entity.getResourceIds().get(i));
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setObjectId(entity.getObjectId());
e.setName(entity.getNames().get(i));
if (StringUtils.isNotBlank(entity.getCover().get(i))) {
e.setCover(entity.getCover().get(i));
Criteria criteria =resourceService.createCriteria();
criteria.andEqualTo("resourceId", entity.getResourceIds().get(i));
criteria.andEqualTo("objectId", entity.getObjectId());
List<ClauseResource> list = resourceService.selectByCriteria();
if(list==null || list.size()==0) {
ClauseResource e = new ClauseResource();
e.setResourceId(entity.getResourceIds().get(i));
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setObjectId(entity.getObjectId());
e.setName(entity.getNames().get(i));
if (StringUtils.isNotBlank(entity.getCover().get(i))) {
e.setCover(entity.getCover().get(i));
}
recordList.add(e);
}
recordList.add(e);
}
return CallBack.success(resourceService.insertUuidList(recordList));
}
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/clauseLibrary/ClauseLibraryMapper.java
浏览文件 @ bf068700
......@@ -13,7 +13,6 @@ import org.apache.ibatis.annotations.Select;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.clauseLibrary.QueryClauseLibraryForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.authorLibrary.AuthorLibrary;
import com.zrqx.core.model.resource.clauseLibrary.ClauseLibrary;
import com.zrqx.core.vo.resource.ResourceRelationListVo;
import com.zrqx.core.vo.resource.clauseLibrary.ClauseLibraryListVo;
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/clauseLibrary/ClauseLibraryServiceImpl.java
浏览文件 @ bf068700
......@@ -26,6 +26,7 @@ import com.zrqx.core.form.resource.bg.recycleBin.SaveResourceForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.achievementLibrary.AchievementLibrary;
import com.zrqx.core.model.resource.achievementLibrary.AchievementLibraryDiyType;
import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
import com.zrqx.core.model.resource.authorLibrary.AuthorLibrary;
import com.zrqx.core.model.resource.clauseLibrary.ClauseLibrary;
import com.zrqx.core.model.resource.clauseLibrary.ClauseGoods;
......@@ -33,16 +34,21 @@ import com.zrqx.core.model.resource.clauseLibrary.ClauseLibraryDiyType;
import com.zrqx.core.model.resource.clauseLibrary.ClauseLibraryLabel;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.pdflibrary.PdfLibrary;
import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
import com.zrqx.core.service.BaseServiceImpl;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
import com.zrqx.core.util.UUIDUtil;
import com.zrqx.core.vo.resource.ResourceRelationListVo;
import com.zrqx.core.vo.resource.clauseLibrary.ClauseLibraryListVo;
import com.zrqx.resource.bg.mapper.audiolibrary.AudioLibraryMapper;
import com.zrqx.resource.bg.mapper.clauseLibrary.ClauseLibraryMapper;
import com.zrqx.resource.bg.mapper.clauseLibrary.ClauseGoodsMapper;
import com.zrqx.resource.bg.mapper.clauseLibrary.ClauseLibraryDiyTypeMapper;
import com.zrqx.resource.bg.mapper.clauseLibrary.ClauseLibraryLabelMapper;
import com.zrqx.resource.bg.mapper.pdflibrary.PdfLibraryMapper;
import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryMapper;
import com.zrqx.resource.bg.service.copyright.CopyrightResourceService;
import com.zrqx.resource.bg.service.copyright.CopyrightService;
import com.zrqx.resource.bg.service.recycleBin.RecycleBinService;
......@@ -70,7 +76,13 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
private CopyrightResourceService copyrightResourceService;
@Autowired
private CopyrightService copyrightService;
@Autowired
private PdfLibraryMapper pdfLibraryMapper;
@Autowired
private VideoLibraryMapper videoLibraryMapper;
@Autowired
private AudioLibraryMapper audioLibraryMapper;
@Override
public BaseMapper<ClauseLibrary> getMapper() {
return mapper;
......@@ -104,6 +116,79 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
entity.setIsDelete(0);
entity.setStatus(0);
entity.setResourceType(14);
if(form.getPdfResourceType()!=null ){
if(form.getPdfResourceType().equals(1)){
List<PdfLibrary> list = pdfLibraryMapper.isRepeat(form.getPdfName());
if(list.size()==0){
PdfLibrary pdf=new PdfLibrary();
pdf.setPdf(form.getPdf());
pdf.setName(form.getPdfName());
pdf.setUploadTime(new Date());
pdf.setStatus(0);
pdf.setResourceType(15);
pdf.setIsDelete(0);
pdfLibraryMapper.insertSelective(pdf);
entity.setPdf(pdf.getId());
}else{
for (PdfLibrary pdf : list) {
entity.setPdf(pdf.getId());
}
}
}
if(form.getPdfResourceType().equals(2)){
entity.setPdf(form.getPdf());
}
}
if(form.getVideoResourceType()!=null){
if(form.getVideoResourceType().equals(1)){
List<VideoLibrary> list = videoLibraryMapper.isRepeat(form.getVideoName());
if(list.size()==0){
VideoLibrary video=new VideoLibrary();
video.setVideo(form.getVideo());
video.setName(form.getAudioName());
video.setSize(form.getSize());
video.setUploadTime(new Date());
video.setStatus(0);
video.setResourceType(6);
video.setIsDelete(0);
video.setTimeLength(form.getTimeLength());
videoLibraryMapper.insertSelective(video);
entity.setVideo(video.getId());
}else{
for (VideoLibrary video : list) {
entity.setVideo(video.getId());
}
}
}
if(form.getVideoResourceType().equals(2)){
entity.setVideo(form.getVideo());
}
}
if(form.getAudioResourceType()!=null){
if(form.getAudioResourceType().equals(1)){
List<AudioLibrary> list = audioLibraryMapper.isRepeat(form.getAudioName());
if(list.size()==0){
AudioLibrary audio=new AudioLibrary();
audio.setSize(form.getSize());
audio.setTimeLength(form.getTimeLength());
audio.setAudio(form.getAudio());
audio.setName(form.getAudioName());
audio.setUploadTime(new Date());
audio.setStatus(0);
audio.setResourceType(7);
audio.setIsDelete(0);
audioLibraryMapper.insertSelective(audio);
entity.setAudio(audio.getId());
}else{
for (AudioLibrary audio : list) {
entity.setAudio(audio.getId());
}
}
}
if(form.getAudioResourceType().equals(2)){
entity.setAudio(form.getAudio());
}
}
if (mapper.insert(entity) != 1) {
throw new BaseException(ResponseCodeEnum.FAIL + "-条文保存");
}
......@@ -115,6 +200,79 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
}
entity.setId(objectId);
entity.setUpdateTime(new Date());
if(form.getPdfResourceType()!=null ){
if(form.getPdfResourceType().equals(1)){
List<PdfLibrary> list = pdfLibraryMapper.isRepeat(form.getPdfName());
if(list.size()==0){
PdfLibrary pdf=new PdfLibrary();
pdf.setPdf(form.getPdf());
pdf.setName(form.getPdfName());
pdf.setUploadTime(new Date());
pdf.setStatus(0);
pdf.setResourceType(15);
pdf.setIsDelete(0);
pdfLibraryMapper.insertSelective(pdf);
entity.setPdf(pdf.getId());
}else{
for (PdfLibrary pdf : list) {
entity.setPdf(pdf.getId());
}
}
}
if(form.getPdfResourceType().equals(2)){
entity.setPdf(form.getPdf());
}
}
if(form.getVideoResourceType()!=null){
if(form.getVideoResourceType().equals(1)){
List<VideoLibrary> list = videoLibraryMapper.isRepeat(form.getVideoName());
if(list.size()==0){
VideoLibrary video=new VideoLibrary();
video.setVideo(form.getVideo());
video.setName(form.getAudioName());
video.setSize(form.getSize());
video.setUploadTime(new Date());
video.setStatus(0);
video.setResourceType(6);
video.setIsDelete(0);
video.setTimeLength(form.getTimeLength());
videoLibraryMapper.insertSelective(video);
entity.setVideo(video.getId());
}else{
for (VideoLibrary video : list) {
entity.setVideo(video.getId());
}
}
}
if(form.getVideoResourceType().equals(2)){
entity.setVideo(form.getVideo());
}
}
if(form.getAudioResourceType()!=null){
if(form.getAudioResourceType().equals(1)){
List<AudioLibrary> list = audioLibraryMapper.isRepeat(form.getAudioName());
if(list.size()==0){
AudioLibrary audio=new AudioLibrary();
audio.setSize(form.getSize());
audio.setTimeLength(form.getTimeLength());
audio.setAudio(form.getAudio());
audio.setName(form.getAudioName());
audio.setUploadTime(new Date());
audio.setStatus(0);
audio.setResourceType(7);
audio.setIsDelete(0);
audioLibraryMapper.insertSelective(audio);
entity.setAudio(audio.getId());
}else{
for (AudioLibrary audio : list) {
entity.setAudio(audio.getId());
}
}
}
if(form.getAudioResourceType().equals(2)){
entity.setAudio(form.getAudio());
}
}
if (mapper.updateByPrimaryKeySelective(entity) != 1) {
throw new BaseException(ResponseCodeEnum.FAIL + "-条文更新");
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论