--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/imagelibrary/SaveUpdateImageLibraryForm.java

@@ -38,6 +38,8 @@ public class SaveUpdateImageLibraryForm {
 	private List<String> labelContentId;
 	@ApiModelProperty(value = "标签内容code")
 	private List<String> labelContentCode;
+	@ApiModelProperty("所属部门id")
+	private Integer departmentId;
 	@ApiModelProperty("所属部门")
 	private Integer department;
 	@ApiModelProperty("商品编码")

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/imagelibrary/UpdateImageLibraryForm.java

@@ -40,6 +40,8 @@ public class UpdateImageLibraryForm {
 	private List<String> labelContentId;
 	@ApiModelProperty(value = "标签内容code")
 	private List<String> labelContentCode;
+	@ApiModelProperty("所属部门id")
+	private Integer departmentId;
 	@ApiModelProperty("所属部门")
 	private Integer department;
 	@ApiModelProperty("商品编码")

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/label/SaveUpdateLabelContentForm.java

@@ -15,5 +15,5 @@ public class SaveUpdateLabelContentForm {
 	@ApiModelProperty(value = "英文名称")
 	private String englishName;
 	@ApiModelProperty(value = "父级分类id", required = true)
-	private Integer parentId;
+	private String parentId;
 }
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/label/SaveUpdateLabelForm.java

@@ -17,4 +17,6 @@ public class SaveUpdateLabelForm {
 	private String englishName;
 	@ApiModelProperty("数据类型")
 	private List<LabelDataTypeForm> dataType;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/member/StatusForm.java

@@ -9,7 +9,7 @@ import lombok.Data;
 public class StatusForm {
 	@NotNull(message = "id不能为空")
 	@ApiModelProperty("id")
-	private Integer[] id;
+	private String[] id;
 	@NotNull(message = "状态不能为空")
 	@ApiModelProperty("状态")
 	private Integer status;

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/imagelibrary/ImageLibrary.java

@@ -41,8 +41,10 @@ public class ImageLibrary {
 	private String bookId;
 	@ApiModelProperty("所属图书")
 	private String bookName;
+	@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/label/Label.java

@@ -27,5 +27,7 @@ public class Label {
 	private Date createTime;
 	@ApiModelProperty("修改时间")
 	private Date updateTime;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
 	
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/label/LabelContentDiyType.java

@@ -15,7 +15,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value="LabelContentDiyType",description="标签内容分类")
-@Table(name = "res_label_lontent_diy_type")
+@Table(name = "res_label_content_diy_type")
 public class LabelContentDiyType {
 	@Id
 	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/label/LabelDataType.java

@@ -15,7 +15,6 @@ import lombok.Data;
 @Table(name = "res_label_data_type")
 public class LabelDataType {
 	@Id
-	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
 	@ApiModelProperty("id，新增时不需要填写")
 	private String id;
 	

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/periodical/PeriodVolumeResource.java

@@ -18,6 +18,8 @@ public class PeriodVolumeResource {
 	@ApiModelProperty("关联表id")
 	private String id;
 	@ApiModelProperty("期刊id")
+	private String periodicalId;
+	@ApiModelProperty("卷期id")
 	private String objectId;
 	@ApiModelProperty("资源id")
 	private String resourceId;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/authorLibrary/AuthorLibraryController.java

@@ -84,7 +84,7 @@ public class AuthorLibraryController {
 	}
 	@ApiOperation(value = "查询", notes = "根据ID查询")
 	@GetMapping(value = ResourceRequestPath.OID)
-	public CallBack<AuthorLibraryOneVO> getById(@ApiParam(value = "会员ID", required = true) @PathVariable Integer oid) {
+	public CallBack<AuthorLibraryOneVO> getById(@ApiParam(value = "会员ID", required = true) @PathVariable String oid) {
 		AuthorLibrary authorLibrary = authorLibraryService.selectByPrimaryKey(oid);
 		AuthorLibraryOneVO vo = new AuthorLibraryOneVO();
 		BeanUtils.copyProperties(authorLibrary, vo);
@@ -145,7 +145,7 @@ public class AuthorLibraryController {
 
 	@ApiOperation(value = "删除作者", notes = "批量删除作者")
 	@PostMapping(ResourceRequestPath.BATCH_DELETE)
-	public CallBack<Boolean> deletes(@RequestBody List<Integer> ids) {
+	public CallBack<Boolean> deletes(@RequestBody List<String> ids) {
 		return CallBack.success(authorLibraryService.batchDelete(ids));
 	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/label/LabelController.java

@@ -45,7 +45,7 @@ public class LabelController {
 	private LabelDataTypeService adrService;
 	@Autowired
 	private LabelContentDiyTypeService labelContentDiyTypeService;
-
+	
 	@ApiOperation(value = "查询标签", notes = "根据ID查询")
 	@GetMapping(value = ResourceRequestPath.GET_OID)
 	public CallBack<SaveUpdateLabelForm> getById(@PathVariable String oid) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/label/LabelContentDiyTypeMapper.java

@@ -22,7 +22,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 */
 	@Select("<script>" 
 			+ "select * "
-			+ "from  res_Label_Content_Diy_Type a "
+			+ "from  res_Label_content_Diy_Type a "
 			+ "where a.id in "
 			+ " <foreach collection=\"ids\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">" 
 			+ "#{id}" 
@@ -37,7 +37,7 @@ public interface  LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
 	 */
 	@Select("<script>" 
 			+ "select distinct a.id, a.labelId, a.labelContent, a.parentId, a.englishName, a.sort, a.code, a.createTime, a.oldCode "
-			+ "from  res_Label_Content_Diy_Type a "
+			+ "from  res_Label_content_Diy_Type a "
 			+ "where a.labelId = #{labelId} "
 			+ "and a.status = 1 "
 		    + "</script>")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/authorLibrary/AuthorLibraryService.java

@@ -38,5 +38,5 @@ public interface AuthorLibraryService extends BaseService<AuthorLibrary,Integer>
 	 */
 	public Boolean update(SaveUpdateAuthorForm form);
 
-	boolean batchDelete(List<Integer> ids);
+	boolean batchDelete(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/authorLibrary/AuthorLibraryServiceImpl.java

@@ -174,7 +174,7 @@ public class AuthorLibraryServiceImpl extends BaseServiceImpl<AuthorLibrary, Int
 	}
 
 	@Override
-	public boolean batchDelete(List<Integer> ids) {
+	public boolean batchDelete(List<String> ids) {
 		// TODO Auto-generated method stub
 		if (ids.size() == 0) {
 			throw new BaseException("没有选中任何数据，请重新选择");

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/label/LabelContentDiyTypeServiceImpl.java

@@ -42,7 +42,7 @@ public class LabelContentDiyTypeServiceImpl extends BaseServiceImpl<LabelContent
 		//查询标签内容列表
 		List<LabelContentDiyType> list = mapper.queryBylabelId(oid);
 		// 获取一级分类
-		List<LabelContentDiyTypeVO> voList = Copy.copyList(list , LabelContentDiyTypeVO.class, obj -> obj.getParentId()== "0" && obj.getLabelId() == oid);
+		List<LabelContentDiyTypeVO> voList = Copy.copyList(list , LabelContentDiyTypeVO.class, obj -> obj.getParentId().equals("0") && obj.getLabelId().equals(oid));
 		tree(list,voList);
 		return new PageInfo<LabelContentDiyTypeVO>(voList);
 	}
@@ -51,6 +51,7 @@ public class LabelContentDiyTypeServiceImpl extends BaseServiceImpl<LabelContent
 	public boolean save(SaveUpdateLabelContentForm form) {
 		LabelContentDiyType entity = new LabelContentDiyType();
 		BeanUtils.copyProperties(form, entity);
+		entity.setId(UUIDUtil.getUUID());
 		if(mapper.selectOneByForm(form) != null){
 			throw new BaseException("同级已存在"+entity.getLabelContent());
 		}
@@ -61,7 +62,7 @@ public class LabelContentDiyTypeServiceImpl extends BaseServiceImpl<LabelContent
 			entity.setCode(UUIDUtil.newCode(code));
 		}else{
 			//没有查询到子分类，获取父类code 拼接 01
-			if(entity.getParentId()!= "0"){
+			if(!entity.getParentId().equals("0")){
 				entity.setCode(mapper.queryById(Arrays.asList(entity.getParentId())).get(0).getCode()+ "01");
 			}else{
 				entity.setCode("01");
@@ -69,6 +70,7 @@ public class LabelContentDiyTypeServiceImpl extends BaseServiceImpl<LabelContent
 		}
 		entity.setCreateTime(new Date());
 		entity.setStatus(1);
+		
 		return mapper.insert(entity) > 0;
 	}
 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/label/LabelSerivceImpl.java

@@ -106,7 +106,7 @@ public class LabelSerivceImpl extends BaseServiceImpl<Label,Integer> implements
 			labelDataType.setDataTypeSort(li.getDataTypeSort());
 			ldts.add(labelDataType);
 		}
-		return labelDataTypeMapper.insertList(ldts) > 0;
+		return labelDataTypeMapper.insertUuidList(ldts) > 0;
 	}
 	@Override
 	public boolean batchDelete(List<String> ids) {
@@ -120,5 +120,4 @@ public class LabelSerivceImpl extends BaseServiceImpl<Label,Integer> implements
 		labelContentDiyTypeMapper.deleteBylabelId(ids);
 		return true;
 	}
-	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/periodical/PeriodicalSerivceImpl.java

@@ -46,8 +46,6 @@ public class PeriodicalSerivceImpl extends BaseServiceImpl<Periodical,Integer> i
 	@Autowired
 	private PeriodicalGoodsService goodsService;
 	@Autowired
-	private PeriodicalGoodsService pdfLibrarySerivce;
-	@Autowired
 	private PeriodicalLabelDiyTypeMapper PeriodicalLableMapper;
 	@Autowired
 	private ResourceRecycleBinService binService;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/recycleBin/ResourceRecycleBinService.java

@@ -45,4 +45,6 @@ public interface ResourceRecycleBinService extends BaseService<ResourceRecycleBi
 	 */
 	public boolean batchDeleteAll();
 	public boolean  batchRestore(List<Integer> ids);
+	
+	public boolean deleteResource(ResourceRecycleBin bin,String type);
 }