提交 d9b6f822 authored 作者: renjiancai's avatar renjiancai

--no commit message

上级 5a5d587f
......@@ -37,7 +37,6 @@ import com.zrqx.core.form.resource.bg.ebook.UpdateEbookForm;
import com.zrqx.core.form.statistics.client.ContractDateFrom;
import com.zrqx.core.form.statistics.client.ContractResoureceOnSaleFrom;
import com.zrqx.core.form.statistics.client.ContractToResourceForm;
import com.zrqx.core.model.resource.articlelibrary.ArticleGoods;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
import com.zrqx.core.model.resource.articlelibrary.ChapterLibrary;
import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
......@@ -47,7 +46,6 @@ import com.zrqx.core.model.resource.ebook.BookGoods;
import com.zrqx.core.model.resource.ebook.BookGoodsAlbum;
import com.zrqx.core.model.resource.ebook.BookIssued;
import com.zrqx.core.model.resource.ebook.Ebook;
import com.zrqx.core.model.resource.imagelibrary.ImageGoods;
import com.zrqx.core.model.resource.pdflibrary.PdfLibrary;
import com.zrqx.core.model.resource.publicLibrary.ClassifyRelation;
import com.zrqx.core.model.resource.publicLibrary.LabelRelation;
......@@ -65,13 +63,10 @@ import com.zrqx.core.vo.resource.ebook.EpubVo;
import com.zrqx.core.vo.resource.ebook.ImportExcelBookVO;
import com.zrqx.core.vo.resource.label.LabelAndContentByDataTypeVO;
import com.zrqx.resource.bg.client.contract.ContractClient;
import com.zrqx.resource.bg.service.ResourceRelationVoService;
import com.zrqx.resource.bg.service.animationlibrary.AnimationLibraryService;
import com.zrqx.resource.bg.service.articlelibrary.ArticleGoodsService;
import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
import com.zrqx.resource.bg.service.articlelibrary.ChapterLibraryService;
import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryService;
import com.zrqx.resource.bg.service.coursewarelibrary.CoursewareLibraryService;
import com.zrqx.resource.bg.service.ebook.BookContractResourceService;
import com.zrqx.resource.bg.service.ebook.BookGoodsAlbumService;
import com.zrqx.resource.bg.service.ebook.BookGoodsService;
......@@ -84,7 +79,6 @@ import com.zrqx.resource.bg.service.label.LabelContentDiyTypeService;
import com.zrqx.resource.bg.service.pdflibrary.PdfLibraryService;
import com.zrqx.resource.bg.service.publicLibrary.ClassifyRelationService;
import com.zrqx.resource.bg.service.publicLibrary.LabelRelationService;
import com.zrqx.resource.bg.service.publicLibrary.ResourceRelationService;
import com.zrqx.resource.bg.service.series.SeriesService;
import com.zrqx.resource.bg.service.videolibrary.VideoLibraryService;
import com.zrqx.resource.commons.Redis;
......@@ -132,24 +126,16 @@ public class EbookLibraryController {
@Autowired
private BookGoodsAlbumService bookAlbumService;
@Autowired
private ResourceRelationVoService resourceRelationService;
@Autowired
private VideoLibraryService videoLibraryService;
@Autowired
private AudioLibraryService audioLibraryService;
@Autowired
private AnimationLibraryService animationLibraryService;
@Autowired
private CoursewareLibraryService coursewareLibraryService;
@Autowired
private PdfLibraryService pdfLibrarySerivce;
@Autowired
private LabelContentDiyTypeService labelContentDiyTypeService;
@Autowired
private BookContractResourceService bookContractResourceService;
@Autowired
private ResourceRelationService relationService;
@Autowired
private BookGoodsService goodsService;
@Autowired
private ContractClient contractClient;
......
......@@ -6,12 +6,11 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example.Criteria;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.BatchImportForm;
......@@ -22,6 +21,8 @@ import com.zrqx.core.form.resource.bg.recycleBin.SaveResourceForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.animationlibrary.AnimationGoods;
import com.zrqx.core.model.resource.animationlibrary.AnimationLibrary;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.publicLibrary.ClassifyRelation;
import com.zrqx.core.model.resource.publicLibrary.LabelRelation;
import com.zrqx.core.service.BaseServiceImpl;
......@@ -38,6 +39,8 @@ import com.zrqx.resource.bg.service.copyright.CopyrightResourceService;
import com.zrqx.resource.bg.service.copyright.CopyrightService;
import com.zrqx.resource.bg.service.recycleBin.RecycleBinService;
import tk.mybatis.mapper.entity.Example.Criteria;
/**
* 动画库
*/
......@@ -114,6 +117,23 @@ public class AnimationLibrarySerivceImpl extends BaseServiceImpl<AnimationLibrar
label.setObjectId(entity.getId());
labelMapper.delete(label);
}
// 维护合同的关联关系
if (StringUtils.isNotBlank(form.getRelatedContracts())) {
Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());
if (copyright != null) {
copyrightResourceService.createCriteria().andEqualTo("objectId",entity.getId());
List<CopyrightResource> resource2 = copyrightResourceService.selectByCriteria();
if(resource2!=null && resource2.size()>0){
CopyrightResource resource = new CopyrightResource();
resource.setObjectId(entity.getId());
resource.setType(entity.getResourceType());
copyrightResourceService.resouctSave(resource, copyright);
resource.setCopyrightId(copyright.getId());
resource.setId(UUIDUtil.getUUID());
copyrightResourceService.insert(resource);
}
}
}
//添加商品信息
AnimationGoods goods = new AnimationGoods();
BeanUtils.copyProperties(form, goods);
......
......@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -19,6 +20,8 @@ import com.zrqx.core.model.resource.articlelibrary.ArticleGoods;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
import com.zrqx.core.model.resource.audiolibrary.AudioGoods;
import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.diytype.DiyType;
import com.zrqx.core.model.resource.pdflibrary.PdfGoods;
import com.zrqx.core.model.resource.pdflibrary.PdfLibrary;
......@@ -69,12 +72,6 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,In
@Autowired
private RecycleBinService binService;
@Autowired
private PdfLibraryService pdfLibraryService;
@Autowired
private VideoLibraryService videoLibraryService;
@Autowired
private AudioLibraryService audioLibraryService;
@Autowired
private PdfLibraryMapper pdfLibraryMapper;
@Autowired
private PdfGoodsMapper pdfGoodsMapper;
......@@ -269,6 +266,19 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,In
label.setObjectId(entity.getId());
labelMapper.delete(label);
}
// 维护合同的关联关系
if (StringUtils.isNotBlank(form.getRelatedContracts())) {
Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());
if (copyright != null) {
CopyrightResource resource = new CopyrightResource();
resource.setObjectId(entity.getId());
resource.setType(2);
copyrightResourceService.resouctSave(resource, copyright);
resource.setCopyrightId(copyright.getId());
resource.setId(UUIDUtil.getUUID());
copyrightResourceService.insert(resource);
}
}
//添加商品信息
ArticleGoods goods=new ArticleGoods();
BeanUtils.copyProperties(form, goods);
......
......@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -19,6 +20,8 @@ import com.zrqx.core.form.resource.bg.recycleBin.SaveResourceForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.audiolibrary.AudioGoods;
import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.publicLibrary.ClassifyRelation;
import com.zrqx.core.model.resource.publicLibrary.LabelRelation;
import com.zrqx.core.service.BaseServiceImpl;
......@@ -98,6 +101,19 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,Intege
label.setObjectId(entity.getId());
labelMapper.delete(label);
}
// 维护合同的关联关系
if (StringUtils.isNotBlank(form.getRelatedContracts())) {
Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());
if (copyright != null) {
CopyrightResource resource = new CopyrightResource();
resource.setObjectId(form.getId());
resource.setType(7);
copyrightResourceService.resouctSave(resource, copyright);
resource.setCopyrightId(copyright.getId());
resource.setId(UUIDUtil.getUUID());
copyrightResourceService.insert(resource);
}
}
AudioGoods goods = new AudioGoods();
BeanUtils.copyProperties(form, goods);
if(form.getStartDate()!=null && form.getStartDate()!=""){
......
......@@ -27,7 +27,8 @@ import com.zrqx.core.model.resource.audiolibrary.AudioGoods;
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.diytype.DiyType;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.pdflibrary.PdfGoods;
import com.zrqx.core.model.resource.pdflibrary.PdfLibrary;
import com.zrqx.core.model.resource.publicLibrary.ClassifyRelation;
......@@ -269,6 +270,23 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
label.setObjectId(entity.getId());
labelMapper.delete(label);
}
// 维护合同的关联关系
if (StringUtils.isNotBlank(form.getRelatedContracts())) {
Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());
if (copyright != null) {
copyrightResourceService.createCriteria().andEqualTo("objectId",entity.getId());
List<CopyrightResource> resource2 = copyrightResourceService.selectByCriteria();
if(resource2!=null && resource2.size()>0){
CopyrightResource resource = new CopyrightResource();
resource.setObjectId(entity.getId());
resource.setType(entity.getResourceType());
copyrightResourceService.resouctSave(resource, copyright);
resource.setCopyrightId(copyright.getId());
resource.setId(UUIDUtil.getUUID());
copyrightResourceService.insert(resource);
}
}
}
// 保存商品信息
ClauseGoods goods = new ClauseGoods();
BeanUtils.copyProperties(form, goods);
......
......@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -27,6 +28,8 @@ import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
import com.zrqx.core.model.resource.audiolibrary.AudioGoods;
import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.diytype.DiyType;
import com.zrqx.core.model.resource.ebook.Book;
import com.zrqx.core.model.resource.ebook.BookContractResource;
......@@ -92,10 +95,6 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
@Autowired
private EbookMapper ebookMapper;
@Autowired
private ImageLibraryMapper imageLibraryMapper;
@Autowired
private ArticleLibraryMapper articleLibraryMapper;
@Autowired
private ArticleLibraryService articleLibraryService;
@Autowired
private ClassifyRelationMapper diyTypeMapper;
......@@ -400,65 +399,21 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
issued.setObjectId(book.getId());
bookIssuedMapper.insert(issued);
//添加相关合同
form.setList(new ArrayList<String>());
if(form.getContractList()!=null && form.getContractList().size()>0){
List<ContractToResourceForm> contractList = form.getContractList();
List<String> list =new ArrayList<String>();
//先删除之前关联
BookContractResource delete=new BookContractResource();
delete.setObjectId(form.getId());
contractResourceMapper.delete(delete);
//重新添加关联信息
for (ContractToResourceForm cont : contractList) {
//判断是否重复添加
Criteria criteria = bookContractResourceService.createCriteria();
criteria.andEqualTo("contractId", cont.getContractId());
criteria.andEqualTo("objectId", book.getId());
List<BookContractResource> selectByCriteria = bookContractResourceService.selectByCriteria();
if(selectByCriteria.size()==0){
BookContractResource contract=new BookContractResource();
contract.setObjectId(book.getId());
contract.setCreateTime(new Date());
contract.setContractName(cont.getContractName());
if(cont.getContractExpirationTime()!=null && !cont.getContractExpirationTime().equals("")){
contract.setContractExpirationTime(sdf.parse(cont.getContractExpirationTime()));
}
contract.setContractId(cont.getContractId());
contract.setContractNumber(cont.getContractNumber());
if(cont.getSignTime()!=null && !cont.getSignTime().equals("")){
contract.setSignTime(sdf.parse(cont.getSignTime()));
}
contract.setContractType(cont.getContractType());
contract.setProportion(cont.getProportion());
contract.setRenewOption(cont.getRenewOption());
if(!form.getList().contains(cont.getContractId())){
form.getList().add(cont.getContractId());
}
book.setNumberCopyright(cont.getHasDigitalCopyright());
bookMapper.updateByPrimaryKey(book);
contractResourceMapper.insert(contract);
list.add(cont.getContractId());
}
}
System.out.println("任建宇远程资源调用添加合同开始1");
if(list.size()>0){
System.out.println("任建宇远程资源调用添加合同开始2");
ContractClientForm contractClient = new ContractClientForm();
contractClient.setList(list);
contractClient.setObjectId(book.getId());
contractClient.setAuthor(book.getAuthor());
contractClient.setName(book.getName());
contractClient.setObjectType(book.getResourceType());
contractClient.setIsbn(book.getIsbn());
contractClient.setCreateTime(new Date());
contractClient.setOnsale(book.getGoodsStatus());
contractClient.setReversion(issued.getEdition());
client.updateContractResource(contractClient);
bookMapper.updateByPrimaryKeySelective(book);
// 维护合同的关联关系
if (StringUtils.isNotBlank(form.getRelatedContracts())) {
Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());
if (copyright != null) {
CopyrightResource resource = new CopyrightResource();
resource.setObjectId(book.getId());
resource.setType(book.getResourceType());
copyrightResourceService.resouctSave(resource, copyright);
resource.setCopyrightId(copyright.getId());
resource.setId(UUIDUtil.getUUID());
copyrightResourceService.insert(resource);
}
}else{
book.setNumberCopyright(0);
bookMapper.updateByPrimaryKeySelective(book);
}
}
// 分类关系
if (form.getDiyTypeId()!=null && form.getDiyTypeId().size() > 0) {
//删除原有关系表中的关系
......@@ -514,7 +469,6 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
}
bookAlbumMapper.insertUuidList(albumList);
}
}
return true;
}
......
......@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -18,6 +19,8 @@ import com.zrqx.core.form.resource.bg.imagelibrary.QueryImageLibraryForm;
import com.zrqx.core.form.resource.bg.imagelibrary.SaveUpdateImageLibraryForm;
import com.zrqx.core.form.resource.bg.recycleBin.SaveResourceForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.imagelibrary.ImageGoods;
import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
import com.zrqx.core.model.resource.publicLibrary.ClassifyRelation;
......@@ -111,6 +114,23 @@ public class ImageLibrarySerivceImpl extends BaseServiceImpl<ImageLibrary,Intege
label.setObjectId(entity.getId());
labelMapper.delete(label);
}
// 维护合同的关联关系
if (StringUtils.isNotBlank(form.getRelatedContracts())) {
Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());
if (copyright != null) {
copyrightResourceService.createCriteria().andEqualTo("objectId",entity.getId());
List<CopyrightResource> resource2 = copyrightResourceService.selectByCriteria();
if(resource2!=null && resource2.size()>0){
CopyrightResource resource = new CopyrightResource();
resource.setObjectId(entity.getId());
resource.setType(entity.getResourceType());
copyrightResourceService.resouctSave(resource, copyright);
resource.setCopyrightId(copyright.getId());
resource.setId(UUIDUtil.getUUID());
copyrightResourceService.insert(resource);
}
}
}
//添加商品信息
ImageGoods goods = new ImageGoods();
BeanUtils.copyProperties(form, goods);
......
......@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -18,6 +19,8 @@ import com.zrqx.core.form.resource.bg.pdflibrary.SavePdfLibraryForm;
import com.zrqx.core.form.resource.bg.pdflibrary.SaveUpdatePdfLibraryForm;
import com.zrqx.core.form.resource.bg.recycleBin.SaveResourceForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.pdflibrary.PdfGoods;
import com.zrqx.core.model.resource.pdflibrary.PdfLibrary;
import com.zrqx.core.model.resource.publicLibrary.ClassifyRelation;
......@@ -112,6 +115,23 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
label.setObjectId(entity.getId());
labelMapper.delete(label);
}
// 维护合同的关联关系
if (StringUtils.isNotBlank(form.getRelatedContracts())) {
Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());
if (copyright != null) {
copyrightResourceService.createCriteria().andEqualTo("objectId",entity.getId());
List<CopyrightResource> resource2 = copyrightResourceService.selectByCriteria();
if(resource2!=null && resource2.size()>0){
CopyrightResource resource = new CopyrightResource();
resource.setObjectId(entity.getId());
resource.setType(entity.getResourceType());
copyrightResourceService.resouctSave(resource, copyright);
resource.setCopyrightId(copyright.getId());
resource.setId(UUIDUtil.getUUID());
copyrightResourceService.insert(resource);
}
}
}
//添加商品信息
PdfGoods goods = new PdfGoods();
BeanUtils.copyProperties(form, goods);
......
......@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -17,6 +18,8 @@ import com.zrqx.core.form.resource.bg.recycleBin.SaveResourceForm;
import com.zrqx.core.form.resource.bg.videolibrary.QueryVideoLibraryForm;
import com.zrqx.core.form.resource.bg.videolibrary.SaveUpdateVideoLibraryForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.copyright.Copyright;
import com.zrqx.core.model.resource.copyright.CopyrightResource;
import com.zrqx.core.model.resource.publicLibrary.ClassifyRelation;
import com.zrqx.core.model.resource.publicLibrary.LabelRelation;
import com.zrqx.core.model.resource.videolibrary.VideoGoods;
......@@ -107,6 +110,23 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Intege
label.setObjectId(entity.getId());
labelMapper.delete(label);
}
// 维护合同的关联关系
if (StringUtils.isNotBlank(form.getRelatedContracts())) {
Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());
if (copyright != null) {
copyrightResourceService.createCriteria().andEqualTo("objectId",entity.getId());
List<CopyrightResource> resource2 = copyrightResourceService.selectByCriteria();
if(resource2!=null && resource2.size()>0){
CopyrightResource resource = new CopyrightResource();
resource.setObjectId(entity.getId());
resource.setType(entity.getResourceType());
copyrightResourceService.resouctSave(resource, copyright);
resource.setCopyrightId(copyright.getId());
resource.setId(UUIDUtil.getUUID());
copyrightResourceService.insert(resource);
}
}
}
//添加商品信息
VideoGoods goods = new VideoGoods();
BeanUtils.copyProperties(form, goods);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论