--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/client/course/CourseClient.java

+package com.zrqx.sysuser.fg.client.course;
+
+import java.util.List;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.zrqx.core.constant.resource.ResourceRequestPath;
+import com.zrqx.core.model.resource.courcelibrary.CourseLibrary;
+import com.zrqx.core.util.response.CallBack;
+
+/**
+ * 作者远程调用
+ * @author ycw
+ * @date 2018年12月19日上午11:33:44
+ */
+@FeignClient(value="resource",fallback=CourseClientHystric.class)
+public interface CourseClient {
+
+	/**
+	 * 查询课程
+	 * @param ids
+	 * @return
+	 * @author ycw
+	 * @date: 2019年1月28日 下午5:49:11
+	 */
+	@GetMapping(value = ResourceRequestPath.FG + ResourceRequestPath.COURSE_LIBRARY + ResourceRequestPath.IDLIST)
+	CallBack<List<CourseLibrary>> getListByIds(@RequestParam(value = "ids") List<String> ids);
+
+	/**
+	 * 查询课程
+	 * @param oid
+	 * @return
+	 * @author ycw
+	 * @date: 2019年1月28日 下午5:49:11
+	 */
+	@GetMapping(value = ResourceRequestPath.FG + ResourceRequestPath.COURSE_LIBRARY + ResourceRequestPath.OID)
+	CallBack<CourseLibrary> getOneById(@PathVariable(value = "oid") String oid);
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/client/course/CourseClientHystric.java

+package com.zrqx.sysuser.fg.client.course;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.zrqx.core.model.resource.courcelibrary.CourseLibrary;
+import com.zrqx.core.util.response.CallBack;
+
+@Component
+public class CourseClientHystric implements CourseClient {
+
+	private static final Logger logger = LoggerFactory.getLogger(CourseClientHystric.class);
+
+	@Override
+	public CallBack<List<CourseLibrary>> getListByIds(List<String> ids){
+		logger.info("通过id集合调用课程服务失败");
+		return CallBack.fail();
+	}
+	
+	@Override
+	public CallBack<CourseLibrary> getOneById(String oid){
+		logger.info("通过id："+ oid+ "调用课程服务失败");
+		return CallBack.fail();
+	}
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/client/image/ImageClient.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.zrqx.core.constant.resource.ResourceRequestPath;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.resource.fg.imagelibrary.FgImageLibraryVO;
 
 /**
  * 图片远程调用
@@ -37,7 +38,7 @@ public interface ImageClient {
 	 * @date: 2019年1月28日 下午5:49:11
 	 */
 	@GetMapping(value = ResourceRequestPath.FG + ResourceRequestPath.IMAGE_LIBRARY + ResourceRequestPath.OID)
-	CallBack<ImageLibrary> getOneById(@PathVariable(value = "oid") String oid);
+	CallBack<FgImageLibraryVO> getOneById(@PathVariable(value = "oid") String oid);
 
 	
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/client/image/ImageClientHystric.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
 
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.resource.fg.imagelibrary.FgImageLibraryVO;
 
 @Component
 public class ImageClientHystric implements ImageClient {
@@ -21,7 +22,7 @@ public class ImageClientHystric implements ImageClient {
 	}
 	
 	@Override
-	public CallBack<ImageLibrary> getOneById(String oid){
+	public CallBack<FgImageLibraryVO> getOneById(String oid){
 		logger.info("通过id："+ oid+ "调用图片服务失败");
 		return CallBack.fail();
 	}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/comment/FgCommentServiceImpl.java

@@ -27,6 +27,7 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.annexlibrary.AnnexLibrary;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
+import com.zrqx.core.model.resource.courcelibrary.CourseLibrary;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
 import com.zrqx.core.model.sysuser.comment.Comment;
@@ -38,6 +39,7 @@ 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.fg.ebook.FgEbookVO;
+import com.zrqx.core.vo.resource.fg.imagelibrary.FgImageLibraryVO;
 import com.zrqx.core.vo.sysuser.fg.comment.FgCommentDetailsVo;
 import com.zrqx.core.vo.sysuser.fg.comment.FgCommentListVo;
 import com.zrqx.core.vo.sysuser.fg.comment.FgCommentNumAndScoreVo;
@@ -46,6 +48,7 @@ import com.zrqx.sysuser.commons.redis.Redis;
 import com.zrqx.sysuser.fg.client.annex.AnnexClient;
 import com.zrqx.sysuser.fg.client.article.ArticleClient;
 import com.zrqx.sysuser.fg.client.audio.AudioClient;
+import com.zrqx.sysuser.fg.client.course.CourseClient;
 import com.zrqx.sysuser.fg.client.ebook.EbookClient;
 import com.zrqx.sysuser.fg.client.image.ImageClient;
 import com.zrqx.sysuser.fg.client.video.VideoClient;
@@ -75,6 +78,8 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
 	@Autowired
 	private AnnexClient annexClient;
 	@Autowired
+	private CourseClient courseClient;
+	@Autowired
 	private Redis redisManage;
 	
 	@Override
@@ -417,7 +422,7 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
 				comment.setResourceName(result.getData().getName());
 			}
 			if(AllResourceTypeEnum.IMAGE.getCode().toString().equals(f.getGoodsForm().getType())){
-				CallBack<ImageLibrary> result = imageClient.getOneById(f.getGoodsForm().getId());
+				CallBack<FgImageLibraryVO> result = imageClient.getOneById(f.getGoodsForm().getId());
 				if (result == null || !result.isStatus() || result.getData() == null) {
 					logger.info("图片服务调用失败");
 					throw new BusinessValidateException("操作失败");
@@ -452,6 +457,15 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
 				comment.setResourceType(AllResourceTypeEnum.ANNEX.getCode());
 				comment.setResourceName(result.getData().getName());
 			}
+			if(AllResourceTypeEnum.COURSE.getCode().toString().equals(f.getGoodsForm().getType())){
+				CallBack<CourseLibrary> result = courseClient.getOneById(f.getGoodsForm().getId());
+				if (result == null || !result.isStatus() || result.getData() == null) {
+					logger.info("课程服务调用失败");
+					throw new BusinessValidateException("操作失败");
+				}
+				comment.setResourceType(AllResourceTypeEnum.COURSE.getCode());
+				comment.setResourceName(result.getData().getName());
+			}
 			LoginMemberInfo member = redisManage.getMember();
 			comment.setUserId(member.getId().toString());
 			comment.setUserName(member.getAccount());