--no commit message

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/audiolibrary/FgAudioLibraryVO.java

@@ -96,5 +96,7 @@ public class FgAudioLibraryVO {
 	private Integer commentNum;
 	@ApiModelProperty("资源评分")
 	private Integer resourceScore;
+	@ApiModelProperty("二维码")
+	private String qrCode;
 	
 }

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/videolibrary/FgVideoLibraryVO.java

@@ -97,4 +97,6 @@ public class FgVideoLibraryVO {
 	private String videoPath;
 	@ApiModelProperty("视频图片地址")
 	private String imgPath;
+	@ApiModelProperty("二维码")
+	private String qrCode;
 }

app/resource/src/main/java/com/zrqx/resource/fg/controller/audioLibrary/FgAudioLibraryController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.resource.commons.model.audiolibrary.AudioLibrary;
+import com.zrqx.resource.commons.model.qrcode.QrCode;
 import com.zrqx.resource.commons.model.resourcerelation.RelationAuthor;
 import com.zrqx.resource.commons.vo.fg.audiolibrary.FgAudioLibraryVO;
 import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAboutEbookListVO;
@@ -26,6 +27,7 @@ import com.zrqx.resource.fg.service.FgRelationAuthorService;
 import com.zrqx.resource.fg.service.audiolibrary.FgAudioLibraryService;
 import com.zrqx.resource.fg.service.marketing.FgPromotionService;
 import com.zrqx.resource.fg.service.organmemberrecord.FgOrganMemberRecordService;
+import com.zrqx.resource.fg.service.qrcode.FgQrCodeService;
 import com.zrqx.resource.fg.service.record.FgRecordService;
 
 import io.swagger.annotations.Api;
@@ -53,6 +55,8 @@ public class FgAudioLibraryController {
 	private FgRecordService recordService;
 	@Autowired
 	private FgRelationAuthorService relationAuthorService;
+	@Autowired
+	private FgQrCodeService qrCodeService;
 	
 	@ApiOperation("根据id查找音频")
 	@GetMapping("/get/{oid}")
@@ -81,6 +85,13 @@ public class FgAudioLibraryController {
 		form.setResourceName(vo.getName());
 		form.setResourceType(vo.getResourceType());
 		fgOrganMemberRecordService.saveOrUpdateRecord(form);*/
+		//查询二维码
+		QrCode qrCode = new QrCode();
+		qrCode.setResourceId(oid);
+		QrCode qr = qrCodeService.selectOne(qrCode);
+		if(qr != null) {
+			vo.setQrCode(qr.getQrCode());
+		}
 		return CallBack.success(vo);
 	}
 	

app/resource/src/main/java/com/zrqx/resource/fg/controller/videolibrary/FgVideoLibraryController.java

@@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.zrqx.core.client.sysuser.fg.FgSysuserClient;
 import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.resource.commons.model.qrcode.QrCode;
 import com.zrqx.resource.commons.model.resourcerelation.RelationAuthor;
 import com.zrqx.resource.commons.model.videolibrary.ScheduleRecord;
 import com.zrqx.resource.commons.model.videolibrary.TimeLengthRecord;
@@ -28,6 +28,7 @@ import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryVO;
 import com.zrqx.resource.fg.service.FgRelationAuthorService;
 import com.zrqx.resource.fg.service.authorlibrary.FgAuthorLibraryService;
 import com.zrqx.resource.fg.service.courselibrary.FgCourseLibraryService;
+import com.zrqx.resource.fg.service.qrcode.FgQrCodeService;
 import com.zrqx.resource.fg.service.record.FgRecordService;
 import com.zrqx.resource.fg.service.videolibrary.FgVideoLibraryDiyTypeService;
 import com.zrqx.resource.fg.service.videolibrary.FgVideoLibraryService;
@@ -57,7 +58,7 @@ public class FgVideoLibraryController {
 	@Autowired
 	private SolrClient client;
 	@Autowired
-	private FgSysuserClient sysuserClient;
+	private FgQrCodeService qrCodeService;
 	@Autowired
 	private FgRelationAuthorService relationAuthorService;
 	
@@ -95,6 +96,13 @@ public class FgVideoLibraryController {
 		form.setResourceName(vo.getName());
 		form.setResourceType(vo.getResourceType());
 		fgOrganMemberRecordService.saveOrUpdateRecord(form);*/
+		//查询二维码
+		QrCode qrCode = new QrCode();
+		qrCode.setResourceId(oid);
+		QrCode qr = qrCodeService.selectOne(qrCode);
+		if(qr != null) {
+			vo.setQrCode(qr.getQrCode());
+		}
 		return CallBack.success(vo);
 	}