--no commit message

com.zrqx.fg.resource/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

com.zrqx.fg.resource/.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

com.zrqx.fg.resource/src/main/java/com/zrqx/fg/resource/controller/ResourceController.java

@@ -29,6 +29,7 @@ import com.zrqx.core.vo.resource.fg.goods.ele.FgEleResourceInfoVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgAidPhyResourceInfoVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgMainPhyResourceInfoVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgPhyResourceVo;
+import com.zrqx.core.vo.sysuser.fg.collections.CollectionsVo;
 import com.zrqx.fg.resource.service.ResourceService;
 
 @RestController
@@ -111,6 +112,12 @@ public class ResourceController {
 		return CallBack.success(resourceService.batchGet(forms));
 	}
 	
+	@ApiOperation("根据资源id/资源类别,返回资源详情")
+	@PostMapping(ResourceRequestPath.GET + ResourceRequestPath.BATCH)
+	public CallBack<CollectionsVo> batchGet(@RequestBody FgResourceForm forms) {
+		return CallBack.success(resourceService.get(forms));
+	}
+	
 	@ApiOperation("相关资源")
 	@GetMapping(ResourceRequestPath.GET + ResourceRequestPath.RELATION)
 	public CallBack<List<FgResourceVo>> getRelation(String resourceId, String type) {

com.zrqx.fg.resource/src/main/java/com/zrqx/fg/resource/service/ResourceService.java

@@ -15,6 +15,7 @@ import com.zrqx.core.vo.resource.fg.goods.ele.FgEleResourceInfoVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgAidPhyResourceInfoVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgMainPhyResourceInfoVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgPhyResourceVo;
+import com.zrqx.core.vo.sysuser.fg.collections.CollectionsVo;
 
 public interface ResourceService {
 
@@ -147,4 +148,13 @@ public interface ResourceService {
 	 */
 	List<FgPhyResourceVo> getBindingMain(String resourceId);
 
+	/**
+	 * 根据资源id/类别，返回资源详情
+	 * @param forms
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月26日 下午1:03:46
+	 */
+	CollectionsVo get(FgResourceForm forms);
+
 }

com.zrqx.fg.resource/src/main/java/com/zrqx/fg/resource/service/impl/ResourceServiceImpl.java

@@ -49,6 +49,7 @@ import com.zrqx.core.vo.resource.fg.goods.ele.FgEleResourceVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgAidPhyResourceInfoVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgMainPhyResourceInfoVo;
 import com.zrqx.core.vo.resource.fg.goods.phy.FgPhyResourceVo;
+import com.zrqx.core.vo.sysuser.fg.collections.CollectionsVo;
 import com.zrqx.fg.resource.client.BgResourceClient;
 import com.zrqx.fg.resource.client.FgSysuserClient;
 import com.zrqx.fg.resource.mapper.comment.CommentMapper;
@@ -557,4 +558,45 @@ public class ResourceServiceImpl extends BaseModelServiceImpl<PhyResource, Strin
 		return fgPhyResourceVos;
 	}
 
+	/**
+	 * 根据id、类别查资源详情
+	 * @see com.zrqx.fg.resource.service.ResourceService#get(com.zrqx.core.form.resource.fg.goods.FgResourceForm)
+	 * @param forms
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月26日 下午1:04:56
+	 */
+	@Override
+	public CollectionsVo get(FgResourceForm forms) {
+		CollectionsVo collectionsVo = new CollectionsVo();
+		if(forms.getType().contains("1-")){
+			FgPhyResourceVo fgPhyResourceVo = new FgPhyResourceVo();
+			PhyResource phyResource  = phyResourceMapper.selectByPrimaryKey(forms.getId());
+			try {
+				BeanUtils.copyProperties(fgPhyResourceVo, phyResource);
+			} catch (Exception e) {
+				logger.error("批量查询实体资源信息-属性copy失败\n" + e.getMessage());
+			}
+			ResourceBinding record = new ResourceBinding();
+			record.setMainId(forms.getId());
+			List<ResourceBinding> resourceBindings = resourceBindingMapper.select(record);
+			fgPhyResourceVo.setIsHaveBinding(resourceBindings == null ?  "0" : "1");
+			if(resourceBindings != null){
+				List<String> otherTypes = resourceBindings.stream().map(ResourceBinding :: getOtherType).collect(Collectors.toList());
+				fgPhyResourceVo.setIsTrialReading(otherTypes.contains(GoodsTypeEnum.PDF.getCode()) ? "0" : "1");
+			}
+			collectionsVo.setFgPhyResourceVo(fgPhyResourceVo);
+		} else {
+			FgEleResourceVo fgEleResourceVo = new FgEleResourceVo();
+			EleResource eleResource = eleResourceMapper.selectByPrimaryKey(forms.getId());
+			try {
+				BeanUtils.copyProperties(fgEleResourceVo, eleResource);
+			} catch (Exception e) {
+				logger.error("批量电子实体资源信息-属性copy失败\n" + e.getMessage());
+			}
+			collectionsVo.setFgEleResourceVo(fgEleResourceVo);
+		}
+		return collectionsVo;
+	}
+
 }