会员列表

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/label/FgLabelMapper.java

@@ -2,6 +2,8 @@ package com.zrqx.resource.fg.mapper.label;
 
 import java.util.List;
 
+import com.zrqx.core.form.resource.bg.label.PageLableForm;
+import com.zrqx.core.vo.resource.label.LabelListVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -33,4 +35,22 @@ public interface FgLabelMapper extends BaseMapper<Label>{
 		    + "</if>"
 			+ "</script>")
 	List<FgLabelInfoVO> queryLabelList(@Param("form")FgQueryLabelListForm form);
+
+	/**
+	 * 前台 标签列表页查询
+	 * @param nationsType
+	 * @return
+	 */
+	@Select("<script>"
+			+ "select distinct a.id,a.name,a.englishName , createTime "
+			+ "from res_Label a  left join res_label_data_type d on a.id = d.labelId "
+			+ "where 1=1 "
+			+ "<if test='form.nationsType != null' >"
+			+ "and a.nationsType = #{form.nationsType} "
+			+ "</if>"
+			+ "<if test='form.dataType != null' >"
+			+ "and d.dataType = #{form.dataType} "
+			+ "</if>"
+			+ "</script>")
+	List<LabelListVO> queryByNationsType(@Param("form") PageLableForm form);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java

@@ -64,20 +64,20 @@ import java.util.stream.Collectors;
 public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,String> implements FgArticleLibraryService {
 
 	private static final Logger logger = LoggerFactory.getLogger(FgArticleLibrarySerivceImpl.class);
-	
+
 	@Autowired
 	private FgArticleLibraryMapper mapper;
 	@Autowired
 	private FgArticleLibraryDiyTypeMapper articleLibraryDiyTypeMapper;
-	
+
 	@Autowired
 	private FgBookMapper bookMapper;
 	@Autowired
 	private FgEbookDiyTypeMapper ebookDiyTypeMapper;
-	
+
 	@Autowired
 	private Redis redis;
-	
+
 	@Autowired
 	private FgOrderClient orderClient;
 	@Autowired
@@ -97,7 +97,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		// 查询从推荐位传的id集合，查询文章信息
 		List<FgArticleLibraryListVO> list = new ArrayList<FgArticleLibraryListVO>();
 		if(ArrayUtils.isNotEmpty(form.getIds())){
-			list = mapper.queryRecommendArticle(form);	
+			list = mapper.queryRecommendArticle(form);
 		}
 		//优先取图片不为空
 		list = list.parallelStream()
@@ -120,7 +120,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		List<FgArticleLibraryListVO> list = new ArrayList<FgArticleLibraryListVO>();
 		if(ArrayUtils.isNotEmpty(ids)){
 			startPage(pageParam);
-			list = mapper.queryRecommendArticleByIds(ids);	
+			list = mapper.queryRecommendArticleByIds(ids);
 		}
 		// 判断数量是否满足，不满足，需要补全
 		if(list.size() < pageParam.getPageSize()){
@@ -133,9 +133,9 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		this.regEx(list);
 		return new PageInfo<FgArticleLibraryListVO>(list);
 	}
-	
+
 	@Override
-	public List<FgTypeToResourceListVo> queryNationRecommendArticle(FgQueryRecommedArticleForm form){	
+	public List<FgTypeToResourceListVo> queryNationRecommendArticle(FgQueryRecommedArticleForm form){
 		if(form.getNum() != null){
 			PageHelper.startPage(1, form.getNum());
 		}
@@ -151,13 +151,13 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 				this.isPdf(v);
 				this.regEx(v);
 				vo.setResList(v);
-				
+
 				vos.add(vo);
 			});
 		}
 		return vos;
 	}
-	
+
 	@Override
 	public Map<String,Integer> getArticleNumCountByType(FgCountArticleNumForm form){
 		Map<String,Integer> map = new HashMap<String, Integer>();
@@ -178,7 +178,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		}
 		return map;
 	}
-	
+
 	@Override
 	public List<FgArticleLibraryListVO> page(FgQueryArticleLibraryForm form, PageParam pageParam){
 		startPage(pageParam);
@@ -218,7 +218,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		this.regEx(list);
 		return list;
 	}
-	
+
 	/**
 	 * isStatus 是否需要判断上下架
 	 * @param oid
@@ -322,10 +322,10 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 				return vo;
 			}
 		}
-		// 所属图书无版权或者不可售 
+		// 所属图书无版权或者不可售
 		if(vo.getBookId() != null){
 			Book book = bookMapper.selectByPrimaryKey(vo.getBookId());
-			if(book != null && (BookCopyrightTypeEnum.STATUS_0.getCode().equals(book.getType()) || 
+			if(book != null && (BookCopyrightTypeEnum.STATUS_0.getCode().equals(book.getType()) ||
 					BookSaleStatusEnum.STATUS_0.getCode().equals(book.getStatus()))){
 				//if(StringUtils.isNotBlank(vo.getText())){
 				//	String text = vo.getText().replaceAll("\\<.*?>", "");
@@ -658,9 +658,9 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			vo.setMessageCode(ArticlePromptMessageEnum.STATUS_0.getCode());
 			return vo;
 		}
-		// 所属图书无版权或者不可售 
+		// 所属图书无版权或者不可售
 		if(solrDocument.get("bookId") != null){
-			if(BookCopyrightTypeEnum.STATUS_0.getCode().equals(solrDocument.get("type")) || 
+			if(BookCopyrightTypeEnum.STATUS_0.getCode().equals(solrDocument.get("type")) ||
 					BookSaleStatusEnum.STATUS_0.getCode().equals(solrDocument.get("b_status"))){
 				// 该资源暂不支持在线购买或阅读全文
 				vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_2.getCode());
@@ -710,7 +710,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_0.getCode());
 		return vo;
 	}
-	
+
 	/**
 	 * 机构会员，查询是否有查看该资源的权限
 	 * @param vo
@@ -738,7 +738,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 				vo.setAudio("无权限");
 			}
 			if(StringUtils.isNotBlank(vo.getVideo())){
-				vo.setVideo("无权限"); 
+				vo.setVideo("无权限");
 			}
 			// 阅读全文请通过个人账号购买，或者联系管理员
 			vo.setMessage(ArticlePromptMessageEnum.STATUS_3.getName());
@@ -796,7 +796,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			return ;
 		}
 	}
-	
+
 	/**
 	 * 普通会员、专家会员，判断是否购买该文章
 	 * @param vo
@@ -850,7 +850,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		vo.setMessageCode(ArticlePromptMessageEnum.STATUS_4.getCode());
 		return ;
 	}
-	
+
 	/**
 	 * 机构会员，查询是否有查看该资源的权限
 	 * @param vo
@@ -901,7 +901,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			return vo;
 		}
 	}
-	
+
 	/**
 	 * 普通会员、专家会员，判断是否购买该文章
 	 * @param vo
@@ -988,7 +988,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		});
 		return true;
 	}
-	
+
 	/**
 	 * 图书详情页-相关文章列表
 	 * @param form
@@ -1007,7 +1007,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		this.regEx(list);
 		return list;
 	}
-	
+
 	/**
 	 * 是否是pdf
 	 * @param objectList
@@ -1026,7 +1026,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			});
 		}
 	}
-	
+
 	/**
 	 * 去标签
 	 * @param list
@@ -1056,7 +1056,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			});
 		}
 	}
-	
+
 	/**
 	 * 获取pdf阅读地址
 	 * @param vo
@@ -1068,7 +1068,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			vo.setPdfReadUrl("/readFinalPath?pdfId="+vo.getPdf()+"&userId=1001&messageCode="+vo.getMessageCode());
 		}
 	}
-	
+
 	private void filterFormat(FgArticleLibraryListVO vo){
 		String name = vo.getTitle();
 		//匹配1. 2.
@@ -1131,4 +1131,4 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		this.regEx(list);
 		return list;
 	}
-}
+}
\ No newline at end of file

com.zrqx.resource/src/main/resources/bootstrap.yml

@@ -9,4 +9,4 @@ spring:
       label: master
   data:
     solr:
-      host: http://admin:admin@192.168.2.231:8984/solr/new_core
+      host: http://admin:admin@192.168.2.245:8984/solr/new_core

com.zrqx.resource/src/test/java/Test.java

 import com.zrqx.core.model.order.Order;
+import com.zrqx.core.util.datatype.DelTagsUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,22 +17,6 @@ import java.util.stream.Collectors;
  */
 public class Test {
     public static void main(String[] args) {
-        List<String> list= Arrays.asList("a", "b", "c", "d");
-        List<String> collect =list.stream().map(String::toUpperCase).collect(Collectors.toList());
-        list.forEach(v ->{
-            v = v.toUpperCase();
-        });
-        List<String> l = new ArrayList<>();
-        for (String v : list) {
-            v = v.toUpperCase();
-            l.add(v.toUpperCase());
-            System.out.println(v);
-        }
-        System.out.println("------------"+l);
-        System.out.println("********"+collect);
-        List<Order> l1 = new ArrayList();
-        Order o = new Order();
-        l1.stream().sorted(Comparator.comparing(Order::getCode));//升序
-        l1.stream().sorted(Comparator.comparing(Order::getCreateTime).reversed());//降序
+
     }
 }
\ No newline at end of file

config-server/src/main/resources/properties/member-prod.yml

@@ -8,7 +8,7 @@ spring:
       percentage: ${default.spring-sleuth-sampler-percentage} 
   datasource:
     driver-class-name: ${default.spring-datasource-driver-class-name}
-    url: ${default.spring-datasource-url}mzyy-member
+    url: ${default.spring-datasource-url}copy_mzyy_member
     username: ${default.spring-datasource-username}
     password: ${default.spring-datasource-password}
     initialize: ${default.spring-datasource-initialize}

config-server/src/main/resources/properties/order-prod.yml

@@ -8,7 +8,7 @@ spring:
       percentage: ${default.spring-sleuth-sampler-percentage} 
   datasource:
     driver-class-name: ${default.spring-datasource-driver-class-name}
-    url: ${default.spring-datasource-url}mzyy-order
+    url: ${default.spring-datasource-url}copy_mzyy_order
     username: ${default.spring-datasource-username}
     password: ${default.spring-datasource-password}
     initialize: ${default.spring-datasource-initialize}

config-server/src/main/resources/properties/pay-prod.yml

@@ -8,7 +8,7 @@ spring:
       percentage: ${default.spring-sleuth-sampler-percentage} 
   datasource:
     driver-class-name: ${default.spring-datasource-driver-class-name}
-    url: ${default.spring-datasource-url}mzyy-pay
+    url: ${default.spring-datasource-url}copy_mzyy_pay
     username: ${default.spring-datasource-username}
     password: ${default.spring-datasource-password}
     initialize: ${default.spring-datasource-initialize}

config-server/src/main/resources/properties/resource-prod.yml

@@ -10,7 +10,8 @@ spring:
       percentage: ${default.spring-sleuth-sampler-percentage} 
   datasource:
     driver-class-name: ${default.spring-datasource-driver-class-name}
-    url: ${default.spring-datasource-url}mzyy-resource
+    url: ${default.spring-datasource-url}copy_mzyy_resource
+    //url: ${default.spring-datasource-url}mzyy-resource
     username: ${default.spring-datasource-username}
     password: ${default.spring-datasource-password}
     initialize: ${default.spring-datasource-initialize}

config-server/src/main/resources/properties/sysuser-prod.yml

@@ -8,7 +8,7 @@ spring:
       percentage: ${default.spring-sleuth-sampler-percentage} 
   datasource:
     driver-class-name: ${default.spring-datasource-driver-class-name}
-    url: ${default.spring-datasource-url}mzyy-sysuser
+    url: ${default.spring-datasource-url}copy_mzyy_sysuser
     username: ${default.spring-datasource-username}
     password: ${default.spring-datasource-password}
     initialize: ${default.spring-datasource-initialize}