--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/resourcelibrary/SaveUpdateResourceLibraryForm.java

@@ -2,9 +2,6 @@ package com.zrqx.core.form.resource.bg.resourcelibrary;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
 import lombok.Data;
 @Data
 @ApiModel(value="SaveUpdateResourceLibraryForm",description="修改名称")
@@ -13,6 +10,4 @@ public class SaveUpdateResourceLibraryForm {
 	private String id;
 	@ApiModelProperty(value = "标题")
 	private String title;
-	@ApiModelProperty(value = "修改时间")
-	private Date updateTime;
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ResourceLibrary.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
-import java.util.List;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/content/ResourceLibraryController.java

@@ -2,7 +2,9 @@ package com.zrqx.resource.bg.controller.content;
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,12 +23,16 @@ import com.zrqx.core.form.resource.bg.BatchImportForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.resourcelibrary.SaveImageLibraryForm;
 import com.zrqx.core.form.resource.bg.resourcelibrary.SaveUpdateResourceLibraryForm;
+import com.zrqx.core.model.resource.ArticleLibrary;
+import com.zrqx.core.model.resource.ArticleRelation;
 import com.zrqx.core.model.resource.ResourceLibrary;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.resourcelibrary.ResourceLibraryListVO;
+import com.zrqx.resource.bg.service.articlelibrary.ArticleRelationService;
 import com.zrqx.resource.bg.service.resourcelibrary.ResourceLibraryService;
+import com.zrqx.resource.bg.util.FileUtil;
 
 /**
  * 内容管理Controller
@@ -37,6 +43,11 @@ import com.zrqx.resource.bg.service.resourcelibrary.ResourceLibraryService;
 public class ResourceLibraryController {
 	@Autowired
 	private ResourceLibraryService resourceLibraryService;
+	@Autowired
+	private ArticleRelationService articleRelationService;
+	
+	
+	
 	@ApiOperation(value = "新增", notes = "新增一个")
 	@PostMapping(value = ResourceRequestPath.SAVE)
 	public CallBack<Boolean> save(@RequestBody SaveUpdateResourceLibraryForm form) {
@@ -49,6 +60,24 @@ public class ResourceLibraryController {
 		resourceLibraryService.updateByPrimaryKey(library);
 		return CallBack.success();
 	}
+	
+	@ApiOperation(value = "根据id查看", notes = "根据id查看")
+	@GetMapping(value = ResourceRequestPath.OID)
+	public CallBack<ResourceLibrary> queryById(String id) {
+		ResourceLibrary resource = resourceLibraryService.selectByPrimaryKey(id);
+		if (resource == null) {
+			throw new BaseException(ResponseCodeEnum.FAIL);
+		}
+		return CallBack.success(resource);
+	}
+	@ApiOperation(value = "删除", notes = "删除")
+	@PostMapping(value = ResourceRequestPath.DELETE)
+	public CallBack<String> deleteByIds(@RequestBody String id) {
+		ResourceLibrary resource = resourceLibraryService.selectByPrimaryKey(id);
+		resource.setIsDelete(1);
+		resourceLibraryService.updateByPrimaryKeySelective(resource);
+		return CallBack.success();
+	}
 	/**
 	 * 查询图片素材
 	 * @param pageParam

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/resourcelibrary/ResourceLibrarySerivceImpl.java

@@ -21,6 +21,7 @@ import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.resourcelibrary.ResourceLibraryListVO;
 import com.zrqx.resource.bg.mapper.resourcelibrary.ResourceLibraryMapper;
+import com.zrqx.resource.bg.util.FileUtil;
 /**
  * 图片库
  */
@@ -64,6 +65,13 @@ public class ResourceLibrarySerivceImpl extends BaseServiceImpl<ResourceLibrary,
 		pageParam.setOrderBy("uploadTime desc");
 		startPage(pageParam);
 		List<ResourceLibraryListVO> list = resourceMapper.query(resourceType);
+		if(resourceType.equals(2)){
+			for (ResourceLibraryListVO res : list) {
+				//获取视频图片第一帧
+				String imgPath = FileUtil.getVedioPic(res.getCover(), res.getId());
+				res.setCover(imgPath);
+			}
+		}
 		return new PageInfo<ResourceLibraryListVO>(list);
 	}	
 	@Override

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/util/FileUtil.java

+/**   
+ * @Title: FileUtile.java 
+ * @Package com.zdy.cms.util 
+ * @Description: TODO(用一句话描述该文件做什么) 
+ * @author 郝鹏   
+ * @date 2013-7-18 下午1:42:52 
+ * @version V5.0   
+ */
+package com.zrqx.resource.bg.util;
+
+
+/**
+ * @ClassName: FileUtile
+ * @Description: TODO(文件操作工具包)
+ * @author 郝鹏
+ * @date 2013-7-18 下午1:42:52
+ * 
+ */
+public class FileUtil {
+
+	public static String getVedioPic(String vedioPath, String id) {
+		String path = vedioPath.substring(0, vedioPath.lastIndexOf(".")==-1?vedioPath.length():vedioPath.lastIndexOf(".")) + "/1.jpg";
+		// 更换视频第一帧封面的位置
+		/*
+		 * String vedioPicName = vedioPath.substring( vedioPath.lastIndexOf("/")
+		 * + 1, vedioPath.lastIndexOf(".")); String suffixName =
+		 * vedioPath.substring(vedioPath.lastIndexOf(".") + 1); String path =
+		 * vedioPath.replace(vedioPicName, id).replace(suffixName, "jpg");
+		 */
+		return path;
+	}
+	
+	
+	
+}