--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/content/SignLanguageMapper.java

@@ -19,36 +19,24 @@ import com.zrqx.core.vo.sysuser.bg.content.SignLanguageRelationListVo;
 @Mapper
 public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
 	/** 分页查询*/
-/*	@Select("<script>" 
-			+ "SELECT distinct s.id,s.title,s.founder,s.distributor,s.complete,s.status,"
-			+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"
-			+ "DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime,c.text as content FROM sys_sign_language s "
-			+ "LEFT JOIN sys_content_relation el on s.id=el.objectid LEFT JOIN sys_content c on el.contentId=c.id "
-			+ "</script>")*/
 	@Select("<script>" 
 			+ "SELECT distinct s.id,s.title,s.founder,s.distributor,s.complete,s.status,"
 			+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"
 			+ "DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime FROM sys_sign_language s "
 			+ "<if test='"+ NOTBLANK +"(form.title)'>"
-    		+ " and s.title like concat('%',#{form.title},'%')  "
+    		+ " and (s.title like concat('%',#{form.title},'%') or s.content like concat('%',#{form.title},'%') "
     		+ "</if>"
 			+ "</script>")
 	List<SignLanguageListVo> page(@Param("form")LanguageORUserSelectForm form);
-	/*@Select("<script>" 
-			+ "SELECT distinct s.id,s.title,s.founder,s.distributor,s.complete,sl.status,"
-			+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"
-			+ "DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime FROM sys_sign_language s "
-			+ "INNER JOIN sys_sign_language_user_relation sl on sl.objectId=s.id where 1=1 and sl.status!=1"
-			+ "<if test='"+ NOTBLANK +"(userId)'>"
-    		+ " and sl.userId = #{userId} "
-    		+ "</if>"
-			+ "</script>")*/
 	@Select("<script>" 
 			+ "SELECT distinct s.id,s.title,s.founder,s.distributor,s.complete,re.status,"  
 			+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"  
 			+ "DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime FROM sys_sign_language s " 
 			+ "LEFT JOIN sys_sign_language_user_relation sl on sl.objectId=s.id "
 			+ "LEFT JOIN sys_sign_language_relation re on re.objectId=s.id where 1=1 and re.status!=1"
+			+ "<if test='"+ NOTBLANK +"(form.title)'>"
+    		+ " and (s.title like concat('%',#{form.title},'%') or s.content like concat('%',#{form.title},'%') "
+    		+ "</if>"
 			+ "<if test='"+ NOTBLANK +"(userId)'>"
     		+ " and re.userId = #{userId} "
     		+ "</if>"

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/content/FgSignLanguageController.java

@@ -14,7 +14,6 @@ import com.zrqx.core.enums.sysuser.SignStatusEnum;
 import com.zrqx.core.form.sysuser.fg.FgLanguageSelectForm;
 import com.zrqx.core.form.sysuser.fg.comment.FgQueryCommentForm;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
-import com.zrqx.core.model.sysuser.content.Content;
 import com.zrqx.core.model.sysuser.content.SignLanguage;
 import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
@@ -53,7 +52,7 @@ public class FgSignLanguageController {
 	@GetMapping(value = SysUserRequestPath.PAGE)
 	public CallBack<PageInfo<FgSignLanguageVo>> page(FgLanguageSelectForm form, PageParam pageParam) {
 		return CallBack.success(service.page(form,pageParam));
-	}
+	}	
 	
 	@ApiOperation(value = "采集内容列表", notes = "采集内容列表")
 	@GetMapping(value = SysUserRequestPath.LIST)

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/content/FgSignLanguageMapper.java

@@ -14,16 +14,6 @@ import com.zrqx.core.vo.sysuser.fg.FgSignLanguageVo;
 @Mapper
 public interface FgSignLanguageMapper extends BaseMapper<SignLanguage> {
 	/** 分页查询*/
-	/*@Select("<script>" 
-			+ "SELECT distinct s.id,s.title,s.status,DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime "
-			+ "FROM sys_sign_language s where 1=1 "
-			+ "<if test='status==1'>"
-    		+ " and s.status = 2 "
-    		+ "</if>"
-    		+ "<if test='status==2'>"
-    		+ " and s.status !=1 and s.status !=2"
-    		+ "</if>"
-			+ "</script>")*/
 	@Select("<script>" //前台查询区域用户分发给录制人的状态
 			+ "SELECT distinct s.id,s.title,s.status,DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime FROM sys_sign_language s "
 			+ "LEFT JOIN sys_sign_language_user_relation sl on sl.objectId=s.id where 1=1 "

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/contribute/FgContributeServiceImpl.java

 package com.zrqx.sysuser.fg.service.contribute;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.zrqx.core.enums.sysuser.UserTypeEnum;
@@ -16,10 +18,13 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.datatype.ArrayUtils;
 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.sysuser.bg.contribute.ContributeListVo;
+import com.zrqx.core.vo.sysuser.fg.FgContentVideoVo;
 import com.zrqx.core.vo.sysuser.fg.contribute.FgContributeListVo;
 import com.zrqx.sysuser.bg.mapper.contribute.ContributeMapper;
 import com.zrqx.sysuser.commons.redis.Redis;
+import com.zrqx.sysuser.fg.client.file.FgFileInfoClient;
 import com.zrqx.sysuser.fg.mapper.contribute.FgContributeMapper;
 
 
@@ -30,7 +35,10 @@ public class FgContributeServiceImpl extends BaseServiceImpl<Contribute, String>
 	private FgContributeMapper mapper;
 	@Autowired
 	private Redis redis;
-	
+	@Autowired
+	private FgFileInfoClient fileInfoClient;
+	@Value("${file-root-path}")
+	private String rootPath;
 	@Override
 	public BaseMapper<Contribute> getMapper() {
 		return mapper;
@@ -85,6 +93,13 @@ public class FgContributeServiceImpl extends BaseServiceImpl<Contribute, String>
 		String userId = redis.getMember().getUserId();
 		/*String userId = "b9c91b3f172d11eaa1a00050569033dc";*/
 		List<FgContributeListVo> list = mapper.page(userId);
+		List<String> fileNameList = list.stream().map(FgContributeListVo :: getVideo).collect(Collectors.toList());
+		CallBack<List<String>> result = fileInfoClient.getFilePath(fileNameList);
+		if (result.hasEntity() && ArrayUtils.isNotEmpty(result.getData())) {
+			for(int i =0; i < list.size(); i++) {
+				list.get(i).setVideo(result.getData().get(i));
+			}
+		}
 		list.stream().forEach(li -> li.setStatus_zh(ContributeEnum.getName(li.getStatus())));
 		return new PageInfo<FgContributeListVo>(list);
 	}

com.zrqx.sysuser/src/main/resources/application.properties

@@ -36,4 +36,4 @@ feign.hystrix.enabled=ture
 #spring.cloud.stream.bindings.test.consumer.partitioned=false
 
 #默认密码
-default-password=123456
\ No newline at end of file
+default-password=123456