--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/recommend/FgRecommendResourceServiceImpl.java

@@ -6,9 +6,12 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.sun.org.apache.regexp.internal.RE;
+import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.enums.resource.special.SpecialStatusEnum;
 import com.zrqx.core.exception.ParameterValidateException;
 import com.zrqx.core.form.national.QueryNationalIndexForm;
+import com.zrqx.core.form.resource.bg.recommend.RecommendResourceForm;
 import com.zrqx.core.form.resource.fg.authorLibrary.FgQueryRecommedAuthorForm;
 import com.zrqx.core.form.resource.fg.recommend.FgQueryRecommendForm;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
@@ -24,6 +27,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.national.FgNationalIndexVo;
+import com.zrqx.core.vo.resource.fg.recommend.FgRecommendResourcePageVo;
 import com.zrqx.core.vo.resource.fg.recommend.RecommendResourceListVo;
 import com.zrqx.resource.fg.client.sysuser.FgSysuserClient;
 import com.zrqx.resource.fg.mapper.articlelibrary.FgArticleLibraryDiyTypeMapper;
@@ -307,4 +311,28 @@ public class FgRecommendResourceServiceImpl extends BaseServiceImpl<RecommendRes
 		}
 		return resultList;
 	}
+
+	@Override
+	public List<FgRecommendResourcePageVo> nationsPage(RecommendResourceForm query) {
+		List<FgRecommendResourcePageVo> voList = new ArrayList<FgRecommendResourcePageVo>();
+		CallBack<List<NationalModuleRelation>> callBack = client.getNational(query.getNationsType(), query.getPageStatus());
+		if (callBack.isStatus()) {
+			List<NationalModuleRelation> listData = callBack.getData();
+			listData.forEach(v -> {
+				query.setModuleId(v.getId());
+				List<FgRecommendResourcePageVo> list = recommendResourceMapper.queryRecommendResource1(query);
+				list.parallelStream().forEach(vo -> {
+					if (StringUtils.isNotEmpty(vo.getText())) {
+						String text = DelTagsUtils.getTextFromHtml(vo.getText());
+						vo.setText(text);
+					}
+					FgRecommendResourcePageVo recommendResourcePageVo = new FgRecommendResourcePageVo();
+					BeanUtils.copyProperties(vo, recommendResourcePageVo);
+					recommendResourcePageVo.setResType_zh(AllResourceTypeEnum.getName(vo.getResType().toString()));
+				});
+				voList.addAll(list);
+			});
+		}
+		return voList;
+	}
 }