Merge remote-tracking branch 'origin/v2.0.0' into dev

.factorypath

@@ -118,7 +118,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar" enabled="true" runInBatchMode="false"/>
@@ -188,8 +187,21 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/curator/curator-recipes/2.10.0/curator-recipes-2.10.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/janino/janino/3.0.6/janino-3.0.6.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/janino/commons-compiler/3.0.6/commons-compiler-3.0.6.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-collections4/4.0/commons-collections4-4.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/cn/hutool/hutool-all/5.3.9/hutool-all-5.3.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi/4.1.2/poi-4.1.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.19/commons-compress-1.19.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-validator/commons-validator/1.7/commons-validator-1.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-digester/commons-digester/2.1/commons-digester-2.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-hystrix/1.3.5.RELEASE/spring-cloud-starter-hystrix-1.3.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-core/2.1.2.RELEASE/spring-cloud-netflix-core-2.1.2.RELEASE.jar" enabled="true" runInBatchMode="false"/>

.gitignore

@@ -80,6 +80,7 @@ target
 .project
 .settings/
 .vscode/
+.history/
 src/main/java/pm/Generator.java
 
 prod-fz.sh

src/main/java/com/tanpu/fund/api/ProductApi.java

 package com.tanpu.fund.api;
 
-import com.tanpu.common.auth.mapping.TanpuInterfaceLoginAuth;
 import com.tanpu.common.model.Page;
 import com.tanpu.common.model.Pageable;
 import com.tanpu.common.model.adm.req.IfaNetImportReq;
+import com.tanpu.common.model.fund.req.FundRankReq;
+import com.tanpu.common.model.fund.resq.FundRankResp;
 import com.tanpu.common.model.privatefund.resp.FundNavMessage;
 import com.tanpu.common.model.product.req.NetReq;
 import com.tanpu.common.model.product.req.ProductInfoReq;
@@ -14,13 +15,13 @@ import com.tanpu.common.resp.CommonResp;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
@@ -169,9 +170,17 @@ public interface ProductApi {
     @ApiOperation("理财师净值导入")
     @GetMapping("/ifa/net/import")
     CommonResp<List<FundNavMessage>> importNetInfo(@RequestParam("file") MultipartFile file,
-                                                   @RequestParam("fundId") @Validated @NotEmpty String fundId);
+                                                   @RequestParam("fundId") @Valid @NotEmpty(message = "请先确定需要导入的基金") String fundId);
 
     @ApiOperation("理财师净值导入")
     @PostMapping("/ifa/net/import/check/save")
-    CommonResp<List<FundNavMessage>> importNetCheckSaveInfo(@RequestBody IfaNetImportReq req);
+    CommonResp<List<FundNavMessage>> importNetCheckSaveInfo(@RequestBody @Valid @NotEmpty(message = "请确定需要修改的信息") IfaNetImportReq req);
+
+    @ApiOperation("私募排行")
+    @PostMapping("/private/rank")
+    CommonResp<Page<FundRankResp>> getFundRankInfo(@RequestBody FundRankReq req);
+
+    @ApiOperation("私募排行统计")
+    @PostMapping("/private/rank/count")
+    CommonResp<Long> getFundRankCountInfo(@RequestBody FundRankReq req);
 }

src/main/java/com/tanpu/fund/controller/ProductController.java

@@ -4,6 +4,8 @@ import com.tanpu.common.auth.mapping.TanpuInterfaceLoginAuth;
 import com.tanpu.common.model.Page;
 import com.tanpu.common.model.Pageable;
 import com.tanpu.common.model.adm.req.IfaNetImportReq;
+import com.tanpu.common.model.fund.req.FundRankReq;
+import com.tanpu.common.model.fund.resq.FundRankResp;
 import com.tanpu.common.model.privatefund.resp.FundNavMessage;
 import com.tanpu.common.model.product.req.NetReq;
 import com.tanpu.common.model.product.req.ProductInfoReq;
@@ -221,4 +223,14 @@ public class ProductController implements ProductApi {
     public CommonResp<List<FundNavMessage>> importNetCheckSaveInfo(IfaNetImportReq req) {
         return this.productService.importNetCheckSave(req);
     }
+
+    @Override
+    public CommonResp<Page<FundRankResp>> getFundRankInfo(FundRankReq req) {
+        return CommonResp.success(this.productService.getFundRank(req));
+    }
+
+    @Override
+    public CommonResp<Long> getFundRankCountInfo(FundRankReq req) {
+        return CommonResp.success(this.productService.getFundRankCountInfo(req));
+    }
 }

src/main/java/com/tanpu/fund/feign/product/FeignForProduct.java

+package com.tanpu.fund.feign.product;
+
+import com.tanpu.common.model.tanpuroom.Type;
+import com.tanpu.common.resp.CommonResp;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+//@FeignClient(value = "service-product", url = "http://127.0.0.1:8194/product")
+@FeignClient(value = "service-product", path = "/product")
+public interface FeignForProduct {
+
+    @ApiOperation("获取私募产品列表（只返回产品名称）")
+    @GetMapping("/get/fund/info/simple")
+    CommonResp<List<Type>> getSimpleFundList(@RequestParam("list") List<String> list);
+
+}

src/main/java/com/tanpu/fund/feign/product/FeignbackForProduct.java

+package com.tanpu.fund.feign.product;
+
+import com.alibaba.fastjson.JSON;
+import com.tanpu.common.model.tanpuroom.Type;
+import com.tanpu.common.resp.CommonResp;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+public class FeignbackForProduct implements FallbackFactory<FeignForProduct> {
+
+    @Override
+    public FeignForProduct create(Throwable throwable) {
+        return new FeignForProduct() {
+
+            @Override
+            public CommonResp<List<Type>> getSimpleFundList(List<String> list) {
+                log.error("FeignClientForFund.getSimpleFundList 获取私募产品列表（只返回产品名称参数: {}", JSON.toJSONString(list));
+                log.error("FeignClientForFund.getSimpleFundList 获取私募产品列表（只返回产品名称异常", throwable);
+                return CommonResp.error("基金信息查询异常");
+            }
+        };
+    }
+}

src/main/java/com/tanpu/fund/service/ProductService.java

@@ -3,6 +3,8 @@ package com.tanpu.fund.service;
 import com.tanpu.common.model.Page;
 import com.tanpu.common.model.Pageable;
 import com.tanpu.common.model.adm.req.IfaNetImportReq;
+import com.tanpu.common.model.fund.req.FundRankReq;
+import com.tanpu.common.model.fund.resq.FundRankResp;
 import com.tanpu.common.model.privatefund.resp.FundNavMessage;
 import com.tanpu.common.model.product.req.ProductListReq;
 import com.tanpu.common.model.product.resp.DynamicRetreatVO;
@@ -79,4 +81,8 @@ public interface ProductService {
     List<Type> getSimpleFundList(List<String> list);
 
     CommonResp<List<FundNavMessage>> importNetCheckSave(IfaNetImportReq req);
+
+    Page<FundRankResp> getFundRank(FundRankReq req);
+
+    Long getFundRankCountInfo(FundRankReq req);
 }