Skip to content

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

--no commit message

上级 5ef81080
隐藏空白字符变更
内嵌 并排
正在显示 包含 194 行增加 和 150 行删除
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/QueryResourceRelationForm.java
浏览文件 @ da3a57dd
......@@ -9,7 +9,7 @@ public class QueryResourceRelationForm {
@ApiModelProperty("资源id")
private String id;
@ApiModelProperty("资源名称")
private Integer name;
private String name;
@ApiModelProperty("1图书库 2文章库 3期刊库 4论文库 5图片库 6视频库 7音频库 8动画库 9课件库 10法规库 11标准库 12专利库 13成果库 14条文库 15PDF库 16专家库")
private Integer resourceType;
}
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/pdffilelibrary/SaveUpdatePdfLibraryForm.java
浏览文件 @ da3a57dd
......@@ -10,8 +10,6 @@ import lombok.Data;
@Data
@ApiModel(value="SaveUpdatePdfLibraryForm",description="添加或修改pdf库")
public class SaveUpdatePdfLibraryForm {
@ApiModelProperty("pdfid，新增时不需要填写")
private String id;
@ApiModelProperty(value = "pdf名称")
private String name;
@ApiModelProperty("来源")
......
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/periodical/QueryPeriodVolumeForm.java
浏览文件 @ da3a57dd
......@@ -7,7 +7,7 @@ import lombok.Data;
@ApiModel(value="QueryPeriodVolumeForm",description="卷期查询")
public class QueryPeriodVolumeForm {
@ApiModelProperty("期刊id")
private Integer periodicalId;
private String id;
@ApiModelProperty("状态 0已录入 1审核通过 2审核未通过")
private Integer status;
@ApiModelProperty("年")
......
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/periodical/QueryPeriodicalForm.java
浏览文件 @ da3a57dd
......@@ -15,9 +15,9 @@ public class QueryPeriodicalForm {
@ApiModelProperty("CN")
private String cn;
@ApiModelProperty(value = "自定义分类id")
private List<String> diyTypeId;
private List<String> dtId;
@ApiModelProperty("自定义分类code")
private String diyTypeCode;
private String code;
@ApiModelProperty("筛选 1：期刊名 2：ISSN 3：CN")
private Integer option;
}
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/periodical/SaveUpdatePeriodicalForm.java
浏览文件 @ da3a57dd
......@@ -110,8 +110,8 @@ public class SaveUpdatePeriodicalForm {
@ApiModelProperty(value = "标签id")
private List<String> labelId;
@ApiModelProperty(value = "标签内容id")
private List<String> labelCountentDivTypeId;
private List<String> labelCountentId;
@ApiModelProperty(value = "标签内容code")
private List<String> labelCountentDivTypeCode;
private List<String> labelCountentCode;
}
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/videolibrary/SaveUpdateVideoLibraryForm.java
浏览文件 @ da3a57dd
......@@ -11,8 +11,6 @@ import lombok.Data;
@Data
@ApiModel(value = "SaveUpdateVideoLibraryForm", description = "添加或修改视频库")
public class SaveUpdateVideoLibraryForm {
@ApiModelProperty("视频id，新增时不需要填写")
private String id;
@ApiModelProperty(value = "视频名称")
private String name;
@ApiModelProperty("作者")
......
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/pdffilelibrary/PdfLibraryDiyType.java
浏览文件 @ da3a57dd
package com.zrqx.core.model.resource.pdffilelibrary;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.persistence.Id;
import javax.persistence.Table;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
......@@ -14,7 +13,6 @@ import lombok.Data;
@Table(name = "res_Pdf_library_diy_type")
public class PdfLibraryDiyType {
@Id
@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
@ApiModelProperty("PDF与自定义分类关系表id")
private String id;
@ApiModelProperty("PDF库id")
......
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/pdffilelibrary/PdfLibraryLableDiyType.java
浏览文件 @ da3a57dd
package com.zrqx.core.model.resource.pdffilelibrary;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.persistence.Id;
import javax.persistence.Table;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
......@@ -14,7 +13,6 @@ import lombok.Data;
@Table(name = "res_Pdf_library_lable_diy_type")
public class PdfLibraryLableDiyType {
@Id
@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
@ApiModelProperty("PDF与标签关系表id")
private String id;
@ApiModelProperty("PDF库id")
......
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/pdffilelibrary/PdfResource.java
浏览文件 @ da3a57dd
package com.zrqx.core.model.resource.pdffilelibrary;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
......@@ -16,7 +15,6 @@ import lombok.Data;
@Table(name = "res_pdf_resource")
public class PdfResource {
@Id
@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
@ApiModelProperty("关联表id")
private String id;
@ApiModelProperty("PDFid")
......@@ -27,5 +25,6 @@ public class PdfResource {
private Integer resourceType;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("资源名称")
private String name;
}
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/periodical/PeriodVolumeResource.java
浏览文件 @ da3a57dd
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.persistence.Id;
import javax.persistence.Table;
import lombok.Data;
......@@ -13,6 +14,7 @@ import lombok.Data;
@ApiModel(value = "PeriodVolumeResource", description = "关联资源")
@Table(name = "res_period_volume_resource")
public class PeriodVolumeResource {
@Id
@ApiModelProperty("关联表id")
private String id;
@ApiModelProperty("期刊id")
......@@ -23,4 +25,6 @@ public class PeriodVolumeResource {
private Integer resourceType;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("资源名称")
private String name;
}
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/periodical/PeriodicalDiyType.java
浏览文件 @ da3a57dd
......@@ -3,6 +3,7 @@ package com.zrqx.core.model.resource.periodical;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.persistence.Id;
import javax.persistence.Table;
import lombok.Data;
......@@ -11,8 +12,7 @@ import lombok.Data;
@Table(name = "res_periodical_diy_Type")
@ApiModel(value = "PeriodicalDiyType", description = "期刊类别关系")
public class PeriodicalDiyType {
//@Id
//@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
@Id
@ApiModelProperty("id")
private String id;
@ApiModelProperty("期刊id")
......
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/periodical/PeriodicalLabelDiyType.java
浏览文件 @ da3a57dd
......@@ -12,8 +12,7 @@ import lombok.Data;
@ApiModel(value="PeriodicalLabelDiyType",description="文章与标签关系表")
@Table(name = "res_periodical_label_diy_type")
public class PeriodicalLabelDiyType {
//@Id
//@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
@Id
@ApiModelProperty("期刊与标签内容关系表id")
private String id;
@ApiModelProperty("期刊id")
......@@ -21,7 +20,7 @@ public class PeriodicalLabelDiyType {
@ApiModelProperty(value = "标签id")
private String labelId;
@ApiModelProperty(value = "标签内容id")
private String labelContentDivTypeId;
private String labelContentId;
@ApiModelProperty(value = "标签内容code")
private String labelContentDivTypeCode;
private String labelContentCode;
}
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/videolibrary/VideoLibrary.java
浏览文件 @ da3a57dd
......@@ -45,8 +45,10 @@ public class VideoLibrary {
private String bookName;
@ApiModelProperty("状态：0已录入，1审核已通过，2审核未通过")
private Integer status;
@ApiModelProperty("所属部门id")
private Integer departmentId;
@ApiModelProperty("所属部门")
private Integer department;
private String department;
@ApiModelProperty("上传时间")
private Date uploadTime;
@ApiModelProperty("更新时间")
......
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/videolibrary/VideoLibraryDiyType.java
浏览文件 @ da3a57dd
package com.zrqx.core.model.resource.videolibrary;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.persistence.Id;
import javax.persistence.Table;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value="VideoLibraryDiyType",description="视频与自定义分类关系表")
@Table(name = "res_Video_library_diy_type")
@Table(name = "res_video_library_diy_type")
public class VideoLibraryDiyType {
@Id
@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
@ApiModelProperty("视频与自定义分类关系表id")
private String id;
@ApiModelProperty("视频库id")
......
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/videolibrary/VideoLibraryLableDiyType.java
浏览文件 @ da3a57dd
package com.zrqx.core.model.resource.videolibrary;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.persistence.Id;
import javax.persistence.Table;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
......@@ -14,7 +13,6 @@ import lombok.Data;
@Table(name = "res_video_library_lable_diy_type")
public class VideoLibraryLableDiyType {
@Id
@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
@ApiModelProperty("视频与标签关系表id")
private String id;
@ApiModelProperty("视频库id")
......
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/videolibrary/VideoResource.java
浏览文件 @ da3a57dd
......@@ -20,11 +20,13 @@ public class VideoResource {
@ApiModelProperty("关联表id")
private String id;
@ApiModelProperty("视频id")
private String videoId;
private String objectId;
@ApiModelProperty("资源id")
private String resourceId;
@ApiModelProperty("资源类型")
private Integer resourceType;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("资源名称")
private String name;
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/animationlibrary/AnimationLibraryController.java
浏览文件 @ da3a57dd
......@@ -39,7 +39,6 @@ import com.zrqx.core.model.resource.animationlibrary.AnimationLibrary;
import com.zrqx.core.model.resource.animationlibrary.AnimationLibraryDiyType;
import com.zrqx.core.model.resource.animationlibrary.AnimationLibraryLableDiyType;
import com.zrqx.core.model.resource.animationlibrary.AnimationResource;
import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/articlelibrary/ArticleLibraryController.java
浏览文件 @ da3a57dd
......@@ -33,7 +33,6 @@ 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;
import com.zrqx.core.model.resource.animationlibrary.AnimationLibrary;
import com.zrqx.core.model.resource.articlelibrary.ArticleGoods;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/pdffilelibrary/PdfLibraryController.java
浏览文件 @ da3a57dd
......@@ -24,6 +24,7 @@ import tk.mybatis.mapper.entity.Example.Criteria;
import com.zrqx.core.constant.resource.ResourceRequestPath;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
import com.zrqx.core.form.resource.bg.pdffilelibrary.BatchUpdatePdfLibraryForm;
......@@ -39,6 +40,7 @@ import com.zrqx.core.model.resource.pdffilelibrary.PdfResource;
import com.zrqx.core.util.CallBack;
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.pdffilelibrary.PdfLibraryListVO;
import com.zrqx.core.vo.resource.pdffilelibrary.PdfLibraryOneVO;
......@@ -95,7 +97,7 @@ public class PdfLibraryController {
}
//修改商品信息
Criteria cr = pdfGoodsService.createCriteria();
cr.andEqualTo("plId", form.getId());
cr.andEqualTo("objectId", form.getId());
PdfGoods entity=new PdfGoods();
BeanUtils.copyProperties(form, entity);
if(!pdfGoodsService.updateByCriteriaSelective(entity)){
......@@ -107,7 +109,7 @@ public class PdfLibraryController {
@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_PRICE)
public CallBack<Boolean> updatePrice(@RequestBody BatchUpdatePdfLibraryForm form){
Criteria cr = pdfGoodsService.createCriteria();
cr.andIn("plId", form.getIds());
cr.andIn("objectId", form.getIds());
PdfGoods entity=new PdfGoods();
entity.setSellingPrice(new BigDecimal(form.getSellingPrice()));
entity.setPriceType(form.getPriceType());
......@@ -120,20 +122,21 @@ public class PdfLibraryController {
@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_DIYTIPE)
public CallBack<Boolean> updateDivType(@RequestBody BatchUpdatePdfLibraryForm form) {
List<PdfLibraryDiyType> list = new ArrayList<PdfLibraryDiyType>();
form.getIds().forEach(ilId -> {
form.getIds().forEach(objectId -> {
//刪除原有的分类
PdfLibraryDiyType ob = new PdfLibraryDiyType();
ob.setObjectId(ilId);
ob.setObjectId(objectId);
vdrService.delete(ob);
for (int i = 0; i < form.getDiyTypeId().size(); i++) {
PdfLibraryDiyType obj = new PdfLibraryDiyType();
obj.setObjectId(ilId);
obj.setId(UUIDUtil.getUUID());
obj.setObjectId(objectId);
obj.setDtId(form.getDiyTypeId().get(i));
obj.setCode(form.getDiyTypeCode().get(i));
list.add(obj);
}
});
if (!vdrService.insertList(list)) {
if (!vdrService.insertUuidList(list)) {
throw new BaseException(ResponseCodeEnum.FAIL);
}
return CallBack.success();
......@@ -172,20 +175,18 @@ public class PdfLibraryController {
PdfLibraryOneVO vo = new PdfLibraryOneVO();
BeanUtils.copyProperties(entity,vo);
//查询分类
vdrService.createCriteria().andEqualTo("plId" , oid);
vdrService.createCriteria().andEqualTo("objectId" , oid);
List<PdfLibraryDiyType> list = vdrService.selectByCriteria();
vo.setDivTypeId(new ArrayList<String>());
list.forEach(obj -> vo.getDivTypeId().add(obj.getDtId()));
//查询标签
pdfLibraryLableService.createCriteria().andEqualTo("plId" , oid);
pdfLibraryLableService.createCriteria().andEqualTo("objectId" , oid);
List<PdfLibraryLableDiyType> listLable = pdfLibraryLableService.selectByCriteria();
vo.setDivLableId(new ArrayList<String>());
listLable.forEach(obj -> vo.getDivLableId().add(obj.getLableId()));
//查询信息
pdfGoodsService.createCriteria().andEqualTo("plId" , oid);
pdfGoodsService.createCriteria().andEqualTo("objectId" , oid);
PdfGoods goods = pdfGoodsService.selectOneByCriteria();
vo.setEndDate(goods.getEndDate().toString());
vo.setStartDate(goods.getStartDate().toString());
BeanUtils.copyProperties(goods , vo);
return CallBack.success(vo);
}
......@@ -210,7 +211,11 @@ public class PdfLibraryController {
}
return CallBack.success(new PageInfo<ResourceRelationVo>(resourceRelationService.queryRelationList(list)));
}
@ApiOperation(value = "选择弹窗中的列表", notes = "查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<PdfLibraryListVO>> page(QueryResourceForPoPForm form, PageParam pageParam) {
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
......@@ -220,13 +225,13 @@ public class PdfLibraryController {
List<PdfResource> recordList = new ArrayList<PdfResource>();
Arrays.asList(entity.getResourceIds()).forEach(resourceId -> {
PdfResource e = new PdfResource();
e.setId(entity.getId());
e.setId(UUIDUtil.getUUID());
e.setObjectId(entity.getObjectId());
e.setResourceId(resourceId);
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
recordList.add(e);
});
return CallBack.success(resourceService.insertList(recordList));
return CallBack.success(resourceService.insertUuidList(recordList));
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/periodical/PeriodVolumeLibraryController.java
浏览文件 @ da3a57dd
......@@ -7,7 +7,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -59,6 +58,9 @@ public class PeriodVolumeLibraryController {
@ApiOperation("查询期刊列表")
@GetMapping(ResourceRequestPath.PAGE)
public CallBack<PageInfo<PeriodVolumeListVO>> getBookList(QueryPeriodVolumeForm form,PageParam pageParam){
if (form == null || form.getId() == null) {
throw new BaseException("期刊id不能为空！");
}
if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
pageParam.setOrderBy("uploadTime desc");
}
......@@ -126,8 +128,9 @@ public class PeriodVolumeLibraryController {
e.setResourceId(resourceId);
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setName(entity.getName());
recordList.add(e);
});
return CallBack.success(resourceService.insertList(recordList));
return CallBack.success(resourceService.insertUuidList(recordList));
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/periodical/PeriodicalLibraryController.java
浏览文件 @ da3a57dd
......@@ -78,13 +78,13 @@ public class PeriodicalLibraryController {
//图书信息
Periodical periodical = periodicalService.selectByPrimaryKey(oid);
//商品信息
periodicalGoodsService.createCriteria().andEqualTo("periodicalId" , oid);
periodicalGoodsService.createCriteria().andEqualTo("objectId" , oid);
PeriodicalGoods goods=new PeriodicalGoods();
//自定义分类
periodicalDiyTypeService.createCriteria().andEqualTo("periodicalId", oid);
periodicalDiyTypeService.createCriteria().andEqualTo("objectId", oid);
List<PeriodicalDiyType> dtList = periodicalDiyTypeService.selectByCriteria();
//自定义标签
periodicalLabelService.createCriteria().andEqualTo("periodicalId", oid);
periodicalLabelService.createCriteria().andEqualTo("objectId", oid);
List<PeriodicalLabelDiyType> lcdList = periodicalLabelService.selectByCriteria();
PeriodicelVO vo = new PeriodicelVO();
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/videolibrary/VideoLibraryController.java
浏览文件 @ da3a57dd
......@@ -40,6 +40,7 @@ import com.zrqx.core.model.resource.videolibrary.VideoResource;
import com.zrqx.core.util.CallBack;
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.videolibrary.VideoLibraryListVO;
import com.zrqx.core.vo.resource.videolibrary.VideoLibraryOneVO;
......@@ -95,7 +96,7 @@ public class VideoLibraryController {
}
//修改商品信息
Criteria cr = videoGoodsService.createCriteria();
cr.andEqualTo("vlId", form.getId());
cr.andEqualTo("objectId", form.getId());
VideoGoods entity=new VideoGoods();
BeanUtils.copyProperties(form, entity);
videoGoodsService.updateByCriteriaSelective(entity);
......@@ -105,7 +106,7 @@ public class VideoLibraryController {
@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_PRICE)
public CallBack<Boolean> updatePrice(@RequestBody BatchUpdateVideoLibraryForm form){
Criteria cr = videoGoodsService.createCriteria();
cr.andIn("vlId", form.getIds());
cr.andIn("objectId", form.getIds());
VideoGoods entity=new VideoGoods();
entity.setSellingPrice(new BigDecimal(form.getSellingPrice()));
entity.setPriceType(form.getPriceType());
......@@ -136,32 +137,33 @@ public class VideoLibraryController {
@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_DIYTIPE)
public CallBack<Boolean> updateDivType(@RequestBody BatchUpdateVideoLibraryForm form) {
List<VideoLibraryDiyType> list = new ArrayList<VideoLibraryDiyType>();
form.getIds().forEach(ilId -> {
form.getIds().forEach(objectId -> {
//刪除原有的分类
VideoLibraryDiyType ob = new VideoLibraryDiyType();
ob.setObjectId(ilId);
ob.setObjectId(objectId);
vdrService.delete(ob);
for (int i = 0; i < form.getDiyTypeId().size(); i++) {
VideoLibraryDiyType obj = new VideoLibraryDiyType();
obj.setObjectId(ilId);
obj.setId(UUIDUtil.getUUID());
obj.setObjectId(objectId);
obj.setDtId(form.getDiyTypeId().get(i));
obj.setCode(form.getDiyTypeCode().get(i));
list.add(obj);
}
});
if (!vdrService.insertList(list)) {
if (!vdrService.insertUuidList(list)) {
throw new BaseException(ResponseCodeEnum.FAIL);
}
return CallBack.success();
}
@ApiOperation(value = "批量删除", notes = "批量删除")
@PostMapping(value = ResourceRequestPath.BATCH_DELETE)
public CallBack<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
public CallBack<Boolean> deleteByIds(@RequestBody List<String> ids) {
return CallBack.success(service.batchDelete(ids));
}
@ApiOperation(value = "查询", notes = "根据ID查询")
@GetMapping(value = ResourceRequestPath.GET_OID)
public CallBack<VideoLibraryOneVO> getById(@PathVariable Integer oid) {
public CallBack<VideoLibraryOneVO> getById(@PathVariable String oid) {
Criteria cr=service.createCriteria();
cr.andEqualTo("id", oid);
cr.andEqualTo("isDelete", 0);
......@@ -170,20 +172,18 @@ public class VideoLibraryController {
BeanUtils.copyProperties(entity,vo);
if(entity!=null){
//查询分类
vdrService.createCriteria().andEqualTo("vlId" , oid);
vdrService.createCriteria().andEqualTo("objectId" , oid);
List<VideoLibraryDiyType> list = vdrService.selectByCriteria();
vo.setDivTypeId(new ArrayList<String>());
list.forEach(obj -> vo.getDivTypeId().add(obj.getDtId()));
//查询标签
videoLibraryLableService.createCriteria().andEqualTo("vlId" , oid);
videoLibraryLableService.createCriteria().andEqualTo("objectId" , oid);
List<VideoLibraryLableDiyType> listLable = videoLibraryLableService.selectByCriteria();
vo.setDivLableId(new ArrayList<String>());
listLable.forEach(obj -> vo.getDivLableId().add(obj.getLableId()));
//查询信息
videoGoodsService.createCriteria().andEqualTo("vlId" , oid);
videoGoodsService.createCriteria().andEqualTo("objectId" , oid);
VideoGoods goods = videoGoodsService.selectOneByCriteria();
vo.setEndDate(goods.getEndDate().toString());
vo.setStartDate(goods.getStartDate().toString());
BeanUtils.copyProperties(goods , vo);
}
return CallBack.success(vo);
......@@ -223,13 +223,13 @@ public class VideoLibraryController {
List<VideoResource> recordList = new ArrayList<VideoResource>();
Arrays.asList(entity.getResourceIds()).forEach(resourceId -> {
VideoResource e = new VideoResource();
e.setId(entity.getId());
e.setId(UUIDUtil.getUUID());
e.setResourceId(resourceId);
e.setCreateTime(new Date());
e.setResourceType(entity.getResourceType());
e.setVideoId(entity.getObjectId());
e.setObjectId(entity.getObjectId());
recordList.add(e);
});
return CallBack.success(resourceService.insertList(recordList));
return CallBack.success(resourceService.insertUuidList(recordList));
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/pdffilelibrary/PdfLibraryMapper.java
浏览文件 @ da3a57dd
......@@ -17,7 +17,7 @@ public interface PdfLibraryMapper extends BaseMapper<PdfLibrary> {
@Select("<script>"
+ "select distinct a.id,a.name,a.source,g.price,g.priceType,g.sellingPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status,a.isDelete "
+ "from res_Pdf_Library a left join res_Pdf_Library_Diy_Type ad "
+ "on a.id = ad.plid left JOIN res_Pdf_Goods g on a.id=g.plid "
+ "on a.id = ad.objectId left JOIN res_Pdf_Goods g on a.id=g.objectId "
+ "where 1=1 and a.isDelete = 0 "
+ "<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"
+ "and ad.code like concat(#{form.diyTypeCode},'%') "
......@@ -38,7 +38,7 @@ public interface PdfLibraryMapper extends BaseMapper<PdfLibrary> {
+ "and a.source like concat('%',#{form.source},'%') "
+ "</if>"
+ "<if test='form.status != null'>"
+ "and a.status = #{form.status}"
+ "and a.status = #{form.status} "
+ "</if>"
+ "<if test='form.beginTime != null and form.beginTime != \"\"'>"
+ "and a.uploadTime &gt;= #{form.beginTime} "
......@@ -50,15 +50,14 @@ public interface PdfLibraryMapper extends BaseMapper<PdfLibrary> {
List<PdfLibraryListVO> query(@Param("form")QueryPdfLibraryForm form);
@Select("<script>"
+ "select distinct a.id,a.name,a.source,g.price,g.priceType,g.sellingPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.timeLength,a.size,a.status,a.isDelete "
+ "select distinct a.id,a.name,a.source,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status,a.isDelete "
+ "from res_Pdf_Library a left join res_Pdf_Library_Diy_Type ad "
+ "on a.id = ad.plid left JOIN res_Pdf_Goods g on a.id=g.plid "
+ "where 1=1 and a.isDelete = 0 "
+ "on a.id = ad.objectId where 1=1 and a.isDelete = 0 "
+ "<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"
+ "and ad.code like concat(#{form.diyTypeCode},'%') "
+ "</if>"
+ "<if test='form.title != null and form.title != \"\"'>"
+ "and a.name like concat('%',#{form.title},'%') "
+ "<if test='form.name != null and form.name != \"\"'>"
+ "and a.name like concat('%',#{form.name},'%') "
+ "</if>"
+ "</script>")
List<PdfLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/pdffilelibrary/PdfResourceMapper.java
浏览文件 @ da3a57dd
......@@ -11,9 +11,10 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
public interface PdfResourceMapper extends BaseMapper<PdfResource> {
@Select("<script>"
+ "select id ,resourceId,resourceType,createTime from res_pdf_resource "
+ "where plId = #{id} "
+ "select id ,objectId,name,resourceId,resourceType,createTime from res_pdf_resource "
+ "where objectId = #{id} "
+ "<if test='resourceType != null'> and resourceType = #{resourceType}</if>"
+ "<if test='name != null'> and name like concat #{name}</if>"
+ "</script>")
List<ResourceRelationVo> queryByIdAndResourceType(QueryResourceRelationForm entity);
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/periodical/PeriodVolumeMapper.java
浏览文件 @ da3a57dd
......@@ -15,16 +15,16 @@ import com.zrqx.core.vo.resource.periodicel.PeriodVolumeListVO;
*/
public interface PeriodVolumeMapper extends BaseMapper<PeriodVolume> {
@Select("<script>"
+ "select p.id,p.volume,p.year,DATE_FORMAT(p.uploadTime,'%Y-%m-%d') uploadTime,p.status,p.isDelete "
+ "from res_period_volume p where 1=1 and p.isDelete = 0 "
+ "select p.id,p.objectId,p.volume,p.year,DATE_FORMAT(p.uploadTime,'%Y-%m-%d') uploadTime,p.status,p.isDelete "
+ "from res_period_volume p where 1=1 and p.isDelete = 0 and p.objectId = #{form.id}"
+ "<if test='form.status != null'>"
+ "and p.status = #{form.status} "
+ "</if>"
+ "<if test='form.option==1'> "
+ " AND p.year like concat(#{year},'%') "
+ " AND p.year like concat(#{form.foyear},'%') "
+ "</if>"
+ "<if test='form.option==2'>"
+ " AND p.volume like concat(#{volume},'%') "
+ " AND p.volume like concat(#{form.volume},'%') "
+ "</if>"
+ "<if test='"+NOTBLANK+"(form.beginTime)'> "
+ "and p.uploadTime &gt;= #{form.beginTime} "
......@@ -37,8 +37,8 @@ public interface PeriodVolumeMapper extends BaseMapper<PeriodVolume> {
@Select("<script>"
+ "select p.id,p.name,p.volume,p.year,DATE_FORMAT(p.uploadTime,'%Y-%m-%d') uploadTime,p.status,p.isDelete "
+ "from res_period_volume p where 1=1 and p.isDelete = 0 "
+ "<if test='form.title != null and form.title != \"\"'>"
+ "and a.name like concat('%',#{form.title},'%') "
+ "<if test='form.name != null and form.name != \"\"'>"
+ "and p.name like concat('%',#{form.name},'%') "
+ "</if>"
+ "</script>")
List<PeriodVolumeListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm form);
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/periodical/PeriodVolumeResourceMapper.java
浏览文件 @ da3a57dd
......@@ -11,9 +11,10 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
public interface PeriodVolumeResourceMapper extends BaseMapper<PeriodVolumeResource> {
@Select("<script>"
+ "select id ,objectId,resourceId,resourceType,createTime from res_period_volume_resource "
+ "where resourceId = #{id} "
+ "select id ,objectId,name,resourceId,resourceType,createTime from res_period_volume_resource "
+ "where objectId = #{id} "
+ "<if test='resourceType != null'> and resourceType = #{resourceType}</if>"
+ "<if test='name != null'> and name like concat #{name}</if>"
+ "</script>")
List<ResourceRelationVo> queryByIdAndResourceType(QueryResourceRelationForm entity);
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/periodical/PeriodicalMapper.java
浏览文件 @ da3a57dd
......@@ -22,26 +22,26 @@ public interface PeriodicalMapper extends BaseMapper<Periodical> {
*/
@Select("<script>"
+ "SELECT "
+ " p.id,p.name,p.cn,p.issn,p.publishingPeriod,p.publishTime,dt.diytypeId,dt.diytypeId,p.isDelete FROM res_periodical p"
+ " p.id,p.name,p.cn,p.issn,p.publishingPeriod,p.publishTime,dt.dtId,p.isDelete FROM res_periodical p"
+ " LEFT JOIN res_periodical_diy_Type dt ON p.id = dt.objectId "
+ " WHERE 1 = 1 and p.isDelete=0 "
+ "<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"
+ "and dt.code like concat(#{form.diyTypeCode},'%') "
+ "<if test='form.code != null and form.code != \"\"'>"
+ "and dt.code like concat(#{form.code},'%') "
+ "</if>"
+ "<if test='form.diyTypeId != null and form.diyTypeId.size > 0'>"
+ "<if test='form.dtId != null and form.dtId.size > 0'>"
+ "and dt.dtId in "
+ " <foreach collection=\"form.diyTypeId\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">"
+ " <foreach collection=\"form.dtId\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">"
+ "#{id}"
+ "</foreach>"
+ "</if>"
+ "<if test='form.option==1'>"
+ " AND p.name like concat(#{name},'%')"
+ " AND p.name like concat(#{form.name},'%')"
+ "</if>"
+ "<if test='form.option==2'>"
+ " AND p.isbn like concat(#{isbn},'%')"
+ " AND p.isbn like concat(#{form.isbn},'%')"
+ "</if>"
+ "<if test='form.option==3'>"
+ " AND p.cn like concat(#{cn},'%')"
+ " AND p.cn like concat(#{form.cn},'%')"
+ "</if>"
+ "</script>")
List<PeriodicelListVO> page(@Param("form") QueryPeriodicalForm form);
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoLibraryMapper.java
浏览文件 @ da3a57dd
......@@ -18,7 +18,6 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
+ "select distinct a.id,a.name,a.bookName,g.price,g.sellingPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status,a.isDelete "
+ "from res_video_library a left join res_video_library_diy_type ad "
+ "on a.id = ad.objectId left JOIN res_video_goods g on a.id=g.objectId "
+ "left JOIN res_video_library_lable l on a.id=l.objectId "
+ "where 1=1 and a.isDelete = 0 "
+ "<if test='"+NOTBLANK+"(form.diyTypeCode)'>"
+ "and ad.code like concat(#{form.diyTypeCode},'%') "
......@@ -48,16 +47,14 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
List<VideoLibraryListVO> query(@Param("form")QueryVideoLibraryForm form);
@Select("<script>"
+ "select distinct a.id,a.name,a.bookName,g.price,g.sellingPrice,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status,a.isDelete "
+ "select distinct a.id,a.name,a.bookName,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status,a.isDelete "
+ "from res_video_Library a left join res_video_library_diy_type ad "
+ "on a.id = ad.objectId left JOIN res_video_goods g on a.id=g.vlid "
+ "left JOIN res_video_library_lable l on a.id=l.objectId "
+ "where 1=1 and a.isDelete = 0 "
+ "on a.id = ad.objectId where 1=1 and a.isDelete = 0 "
+ "<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"
+ "and ad.code like concat(#{form.diyTypeCode},'%') "
+ "</if>"
+ "<if test='form.title != null and form.title != \"\"'>"
+ "and a.name like concat('%',#{form.title},'%') "
+ "<if test='form.name != null and form.name != \"\"'>"
+ "and a.name like concat('%',#{form.name},'%') "
+ "</if>"
+ "</script>")
List<VideoLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoResourceMapper.java
浏览文件 @ da3a57dd
......@@ -11,9 +11,10 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
public interface VideoResourceMapper extends BaseMapper<VideoResource> {
@Select("<script>"
+ "select id ,objectId,resourceId,resourceType,createTime from res_video_resource "
+ "where resourceId = #{id} "
+ "select id ,objectId,name,resourceId,resourceType,createTime from res_video_resource "
+ "where objectId = #{id} "
+ "<if test='resourceType != null'> and resourceType = #{resourceType}</if>"
+ "<if test='name != null'> and name like concat #{name}</if>"
+ "</script>")
List<ResourceRelationVo> queryByIdAndResourceType(QueryResourceRelationForm entity);
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibrarySerivceImpl.java
浏览文件 @ da3a57dd
......@@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Date;
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.stereotype.Service;
......@@ -13,6 +14,7 @@ import org.springframework.stereotype.Service;
import com.zrqx.core.enums.ResponseCodeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.recyclebin.SaveResourceForm;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.pdffilelibrary.QueryPdfLibraryForm;
import com.zrqx.core.form.resource.bg.pdffilelibrary.SavePdfLibraryForm;
import com.zrqx.core.form.resource.bg.pdffilelibrary.SaveUpdatePdfLibraryForm;
......@@ -25,6 +27,7 @@ import com.zrqx.core.model.resource.pdffilelibrary.PdfLibraryLableDiyType;
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.pdffilelibrary.PdfLibraryListVO;
import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfGoodsMapper;
import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryDiyTypeMapper;
......@@ -73,43 +76,49 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
entity.setStatus(0);
entity.setUploadTime(new Date());
if(mapper.insert(entity)!=1){
throw new BaseException(ResponseCodeEnum.FAIL + "资源保存");
throw new BaseException(ResponseCodeEnum.FAIL + "资源");
}
//添加商品信息
PdfGoods goods = new PdfGoods();
BeanUtils.copyProperties(form, goods);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
goods.setStartDate(sdf.parse(form.getStartDate()));
goods.setEndDate(sdf.parse(form.getEndDate()));
if (form.getStartDate()!=null && form.getStartDate()!="") {
goods.setStartDate(sdf.parse(form.getStartDate()));
}
if (form.getEndDate()!=null && form.getEndDate()!="") {
goods.setEndDate(sdf.parse(form.getEndDate()));
}
} catch (ParseException e) {
e.printStackTrace();
}
goods.setObjectId(entity.getId());
if(goodsMapper.insert(goods)!=1){
throw new BaseException(ResponseCodeEnum.FAIL + "商品信息保存");
throw new BaseException(ResponseCodeEnum.FAIL + "商品信息");
}
//添加当前对象与自定义分类的关系
List<PdfLibraryDiyType> list = new ArrayList<PdfLibraryDiyType>();
for (int i = 0; i < form.getDivTypeId().size(); i++) {
PdfLibraryDiyType obj = new PdfLibraryDiyType();
obj.setId(UUIDUtil.getUUID());
obj.setObjectId(entity.getId());
obj.setDtId(form.getDivTypeId().get(i));
obj.setCode(form.getDivTypeCode().get(i));
list.add(obj);
}
pdrMapper.insertList(list);
pdrMapper.insertUuidList(list);
//添加当前对象与自定义标签的关系
List<PdfLibraryLableDiyType> list1= new ArrayList<PdfLibraryLableDiyType>();
for (int i = 0; i < form.getDivLableId().size(); i++) {
PdfLibraryLableDiyType lable=new PdfLibraryLableDiyType();
lable.setId(UUIDUtil.getUUID());
lable.setObjectId(entity.getId());
lable.setLableId(form.getDivLableId().get(i));
lable.setLabelContentId(form.getLabelContentId().get(i));
lable.setLabelContentCode(form.getLabelContentCode().get(i));
list1.add(lable);
}
pdfLibraryLableMapper.insertList(list1);
pdfLibraryLableMapper.insertUuidList(list1);
return true;
}
@Override
......@@ -138,7 +147,7 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
cr.setCode(form.getDivTypeCode().get(i));
list.add(cr);
}
pdrMapper.insertList(list);
pdrMapper.insertUuidList(list);
}
//删除当前对象与自定义分类的关系
PdfLibraryLableDiyType lable=new PdfLibraryLableDiyType();
......@@ -156,7 +165,7 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
lable1.setLabelContentCode(form.getLabelContentCode().get(i));
list1.add(lable1);
}
pdfLibraryLableMapper.insertList(list1);
pdfLibraryLableMapper.insertUuidList(list1);
}
return true;
}
......@@ -221,7 +230,7 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
//删除后的资源加入回收站
SaveResourceForm form =new SaveResourceForm();
BeanUtils.copyProperties(entity,form);
pdfLibrarySerivce.createCriteria().andEqualTo("plId" , entity.getId());
pdfLibrarySerivce.createCriteria().andEqualTo("objectId" , entity.getId());
PdfGoods goods = pdfLibrarySerivce.selectOneByCriteria();
form.setSellingPrice(goods.getSellingPrice());
form.setPriceType(goods.getPriceType());
......@@ -246,6 +255,16 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
List<PdfLibraryListVO> list = mapper.query(form);
return new PageInfo<PdfLibraryListVO>(list);
}
@Override
public PageInfo<PdfLibraryListVO> pageByTitleAndDiyType(
QueryResourceForPoPForm form, PageParam pageParam) {
if(pageParam != null && StringUtils.isNotBlank(pageParam.getOrderBy())){
pageParam.setOrderBy("uploadTime desc,id asc");
}
startPage(pageParam);
List<PdfLibraryListVO> list = mapper.queryByTileAndDiyType(form);
return new PageInfo<PdfLibraryListVO>(list);
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibraryService.java
浏览文件 @ da3a57dd
......@@ -2,6 +2,7 @@ package com.zrqx.resource.bg.service.pdffilelibrary;
import java.util.List;
import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
import com.zrqx.core.form.resource.bg.pdffilelibrary.QueryPdfLibraryForm;
import com.zrqx.core.form.resource.bg.pdffilelibrary.SavePdfLibraryForm;
import com.zrqx.core.form.resource.bg.pdffilelibrary.SaveUpdatePdfLibraryForm;
......@@ -57,4 +58,7 @@ public interface PdfLibraryService extends BaseService<PdfLibrary,Integer>{
*/
boolean update(UpdatePdfLibraryForm form);
PageInfo<PdfLibraryListVO> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/periodical/PeriodicalSerivceImpl.java
浏览文件 @ da3a57dd
......@@ -102,7 +102,7 @@ public class PeriodicalSerivceImpl extends BaseServiceImpl<Periodical,Integer> i
dt.setCode(diyTypeCodes.get(i));
dtList.add(dt);
}
pdrMapper.insertList(dtList);
pdrMapper.insertUuidList(dtList);
// 删除原有标签关系表中的关系
PeriodicalLabelDiyType ebldt = new PeriodicalLabelDiyType();
ebldt.setObjectId(periodical.getId());
......@@ -113,12 +113,12 @@ public class PeriodicalSerivceImpl extends BaseServiceImpl<Periodical,Integer> i
PeriodicalLabelDiyType ldt = new PeriodicalLabelDiyType();
ldt.setId(UUIDUtil.getUUID());
ldt.setObjectId(periodical.getId());
ldt.setLabelContentDivTypeCode(form.getLabelCountentDivTypeCode().get(i));
ldt.setLabelContentDivTypeId(form.getLabelCountentDivTypeId().get(i));
ldt.setLabelId(form.getLabelId().get(i));
ldt.setLabelContentCode(form.getLabelCountentCode().get(i));
ldt.setLabelContentId(form.getLabelCountentId().get(i));
ldtList.add(ldt);
}
PeriodicalLableMapper.insertList(ldtList);
PeriodicalLableMapper.insertUuidList(ldtList);
}
return true;
}
......@@ -143,7 +143,7 @@ public class PeriodicalSerivceImpl extends BaseServiceImpl<Periodical,Integer> i
public PageInfo<PeriodicelListVO> page(QueryPeriodicalForm form,
PageParam pageParam) {
//暂不用自定义分类id 做in查询
form.setDiyTypeId(null);
form.setDtId(null);
startPage(pageParam);
List<PeriodicelListVO> list = mapper.page(form);
return new PageInfo<PeriodicelListVO>(list);
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/recycleBin/ResourceRecycleBinSerivceImpl.java
浏览文件 @ da3a57dd
......@@ -22,6 +22,7 @@ import com.zrqx.core.model.resource.animationlibrary.AnimationLibraryDiyType;
import com.zrqx.core.model.resource.animationlibrary.AnimationLibraryLableDiyType;
import com.zrqx.core.model.resource.animationlibrary.AnimationResource;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
import com.zrqx.core.model.resource.audiolibrary.AudioGoods;
import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
import com.zrqx.core.model.resource.audiolibrary.AudioLibraryDiyType;
......@@ -52,6 +53,7 @@ import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
import com.zrqx.core.model.resource.imagelibrary.ImageLibraryDiyType;
import com.zrqx.core.model.resource.imagelibrary.ImageLibraryLableDiyType;
import com.zrqx.core.model.resource.imagelibrary.ImageResource;
import com.zrqx.core.model.resource.paperLibrary.PaperLibraryDiyType;
import com.zrqx.core.model.resource.patentLibrary.PatentGoods;
import com.zrqx.core.model.resource.patentLibrary.PatentLibrary;
import com.zrqx.core.model.resource.patentLibrary.PatentLibraryDiyType;
......@@ -62,6 +64,8 @@ import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
import com.zrqx.core.model.resource.pdffilelibrary.PdfLibraryDiyType;
import com.zrqx.core.model.resource.pdffilelibrary.PdfLibraryLableDiyType;
import com.zrqx.core.model.resource.pdffilelibrary.PdfResource;
import com.zrqx.core.model.resource.periodical.Periodical;
import com.zrqx.core.model.resource.periodical.PeriodicalDiyType;
import com.zrqx.core.model.resource.recycleBin.RecycleBinDiyType;
import com.zrqx.core.model.resource.recycleBin.ResourceRecycleBin;
import com.zrqx.core.model.resource.statuteLibrary.StatuteGoods;
......@@ -143,6 +147,8 @@ import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryMapper;
import com.zrqx.resource.bg.mapper.videolibrary.VideoResourceMapper;
import com.zrqx.resource.bg.service.achievementLibrary.AchievementLibraryDiyTypeService;
import com.zrqx.resource.bg.service.animationlibrary.AnimationLibraryDiyTypeService;
import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeSerivceImpl;
import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeService;
import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryDiyTypeService;
import com.zrqx.resource.bg.service.authorLibrary.AuthorLibraryDiytypeService;
......@@ -152,8 +158,10 @@ import com.zrqx.resource.bg.service.criterionLibrary.CriterionLibraryDiyTypeServ
import com.zrqx.resource.bg.service.ebook.BookDiyTypeService;
import com.zrqx.resource.bg.service.imagelibrary.ImageGoodsService;
import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryDiyTypeRelationService;
import com.zrqx.resource.bg.service.paperLibrary.PaperLibraryDiyTypeService;
import com.zrqx.resource.bg.service.patentLibrary.PatentLibraryDiyTypeService;
import com.zrqx.resource.bg.service.pdffilelibrary.PdfLibraryDiyTypeService;
import com.zrqx.resource.bg.service.periodical.PeriodicalDiyTypeService;
import com.zrqx.resource.bg.service.statuteLibrary.StatuteLibraryDiyTypeService;
import com.zrqx.resource.bg.service.videolibrary.VideoLibraryDiyTypeService;
......@@ -319,6 +327,12 @@ public class ResourceRecycleBinSerivceImpl extends BaseServiceImpl<ResourceRecyc
private ArticleLibraryMapper articleLibraryMapper;
@Autowired
private ArticleLibraryService articleLibraryService;
@Autowired
private ArticleLibraryDiyTypeService articleDiyTypeSerivce;
@Autowired
private PeriodicalDiyTypeService periodicalDiyTypeService;
@Autowired
private PaperLibraryDiyTypeService paperDiyTypeService;
@Override
public BaseMapper<ResourceRecycleBin> getMapper() {
......@@ -350,23 +364,23 @@ public class ResourceRecycleBinSerivceImpl extends BaseServiceImpl<ResourceRecyc
obj.setCode(diyType.getCode());
}
}else if(form.getResourceType().equals(2)){//文章
idrService.createCriteria().andEqualTo("objectId" , form.getObjectId());
List<ImageLibraryDiyType> Imagelist = idrService.selectByCriteria();
for (ImageLibraryDiyType diyType : Imagelist) {
articleDiyTypeSerivce.createCriteria().andEqualTo("objectId" , form.getObjectId());
List<ArticleLibraryDiyType> article = articleDiyTypeSerivce.selectByCriteria();
for (ArticleLibraryDiyType diyType : article) {
obj.setDtId(diyType.getDtId());
obj.setCode(diyType.getCode());
}
}else if(form.getResourceType().equals(3)){//论文
idrService.createCriteria().andEqualTo("objectId" , form.getObjectId());
List<ImageLibraryDiyType> Imagelist = idrService.selectByCriteria();
for (ImageLibraryDiyType diyType : Imagelist) {
}else if(form.getResourceType().equals(3)){//期刊
periodicalDiyTypeService.createCriteria().andEqualTo("objectId" , form.getObjectId());
List<PeriodicalDiyType> periodical = periodicalDiyTypeService.selectByCriteria();
for (PeriodicalDiyType diyType : periodical) {
obj.setDtId(diyType.getDtId());
obj.setCode(diyType.getCode());
}
}else if(form.getResourceType().equals(4)){//期刊
idrService.createCriteria().andEqualTo("objectId" , form.getObjectId());
List<ImageLibraryDiyType> Imagelist = idrService.selectByCriteria();
for (ImageLibraryDiyType diyType : Imagelist) {
}else if(form.getResourceType().equals(4)){//论文
paperDiyTypeService.createCriteria().andEqualTo("objectId" , form.getObjectId());
List<PaperLibraryDiyType> paper = paperDiyTypeService.selectByCriteria();
for (PaperLibraryDiyType diyType : paper) {
obj.setDtId(diyType.getDtId());
obj.setCode(diyType.getCode());
}
......@@ -471,6 +485,8 @@ public class ResourceRecycleBinSerivceImpl extends BaseServiceImpl<ResourceRecyc
for (ResourceRecycleBin bin : list) {
if(bin.getResourceType().equals(5)){//图片库
//删除内容
//"delete c from a inner join b on a.join_code = b.join_code inner join c on b.store_id = c.store_id
//where a.join_code=’123456’ "
ImageLibrary img=new ImageLibrary();
img.setId(bin.getObjectId());
imageLibraryMapper.deleteByPrimaryKey(img);
......@@ -510,7 +526,7 @@ public class ResourceRecycleBinSerivceImpl extends BaseServiceImpl<ResourceRecyc
videoLableMapper.delete(lable);
//删除关联资源
VideoResource resource=new VideoResource();
resource.setVideoId(bin.getObjectId());
resource.setObjectId(bin.getObjectId());
videoResourceMapper.delete(resource);
}else if(bin.getResourceType().equals(7)){//音频库
//删除分类
......@@ -766,7 +782,7 @@ public class ResourceRecycleBinSerivceImpl extends BaseServiceImpl<ResourceRecyc
videoLableMapper.delete(lable);
//删除关联资源
VideoResource resource=new VideoResource();
resource.setVideoId(bin.getObjectId());
resource.setObjectId(bin.getObjectId());
videoResourceMapper.delete(resource);
}else if(bin.getResourceType().equals(7)){//音频库
//删除分类
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java
浏览文件 @ da3a57dd
......@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -27,6 +28,7 @@ import com.zrqx.core.model.resource.videolibrary.VideoLibraryLableDiyType;
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.videolibrary.VideoLibraryListVO;
import com.zrqx.resource.bg.mapper.videolibrary.VideoGoodsMapper;
import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryDiyTypeMapper;
......@@ -95,23 +97,25 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Intege
List<VideoLibraryDiyType> list = new ArrayList<VideoLibraryDiyType>();
for (int i = 0; i < form.getDivTypeId().size(); i++) {
VideoLibraryDiyType obj = new VideoLibraryDiyType();
obj.setId(UUIDUtil.getUUID());
obj.setObjectId(entity.getId());
obj.setDtId(form.getDivTypeId().get(i));
obj.setCode(form.getDivTypeCode().get(i));
list.add(obj);
}
vdrMapper.insertList(list);
vdrMapper.insertUuidList(list);
//添加当前对象与自定义标签的关系
List<VideoLibraryLableDiyType> list1= new ArrayList<VideoLibraryLableDiyType>();
for (int i = 0; i < form.getDivLableId().size(); i++) {
VideoLibraryLableDiyType lable=new VideoLibraryLableDiyType();
lable.setId(UUIDUtil.getUUID());
lable.setObjectId(entity.getId());
lable.setLableId(form.getDivLableId().get(i));
lable.setLabelContentId(form.getLabelContentId().get(i));
lable.setLabelContentCode(form.getLabelContentCode().get(i));
list1.add(lable);
}
videoLibraryLableMapper.insertList(list1);
videoLibraryLableMapper.insertUuidList(list1);
return true;
}
@Override
......@@ -135,12 +139,13 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Intege
for(int i=0;i<form.getDivTypeId().size();i++){
//修改视频分类,视频的id数据到中间表
VideoLibraryDiyType cr = new VideoLibraryDiyType();
cr.setId(UUIDUtil.getUUID());
cr.setObjectId(entity.getId());
cr.setDtId(form.getDivTypeId().get(i));
cr.setCode(form.getDivTypeCode().get(i));
list.add(cr);
}
vdrMapper.insertList(list);
vdrMapper.insertUuidList(list);
}
//删除当前对象与自定义分类的关系
VideoLibraryLableDiyType lable=new VideoLibraryLableDiyType();
......@@ -152,13 +157,14 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Intege
List<VideoLibraryLableDiyType> list1= new ArrayList<VideoLibraryLableDiyType>();
for (int i = 0; i < form.getDivLableId().size(); i++) {
VideoLibraryLableDiyType lable1=new VideoLibraryLableDiyType();
lable.setId(UUIDUtil.getUUID());
lable1.setObjectId(entity.getId());
lable1.setLableId(form.getDivLableId().get(i));
lable1.setLabelContentId(form.getLabelContentId().get(i));
lable1.setLabelContentCode(form.getLabelContentCode().get(i));
list1.add(lable1);
}
videoLibraryLableMapper.insertList(list1);
videoLibraryLableMapper.insertUuidList(list1);
}
return true;
}
......@@ -208,7 +214,7 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Intege
* @date: 2018年11月22日 下午2:39:23
*/
@Override
public boolean batchDelete(List<Integer> ids) {
public boolean batchDelete(List<String> ids) {
if (ids.size() == 0) {
throw new BaseException("没有选中任何数据，请重新选择");
}
......@@ -224,7 +230,7 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Intege
//删除后的资源加入回收站
SaveResourceForm form =new SaveResourceForm();
BeanUtils.copyProperties(entity,form);
videoGoodsService.createCriteria().andEqualTo("vlId" , entity.getId());
videoGoodsService.createCriteria().andEqualTo("objectId" , entity.getId());
VideoGoods goods = videoGoodsService.selectOneByCriteria();
form.setSellingPrice(goods.getSellingPrice());
form.setPriceType(goods.getPriceType());
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibraryService.java
浏览文件 @ da3a57dd
......@@ -39,7 +39,7 @@ public interface VideoLibraryService extends BaseService<VideoLibrary,Integer>{
* @author yzg
* @date: 2018年11月22日 下午2:39:23
*/
boolean batchDelete(List<Integer> ids);
boolean batchDelete(List<String> ids);
/**
* 后台分页查询
* @param form
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论