myselect

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

 package com.tanpu.fund.api;
 
+import com.tanpu.common.model.product.resp.Net;
+import com.tanpu.common.resp.CommonResp;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 @Api(tags = "私募基金 PC端")
 public interface ProductForPcApi {
 
+    @ApiOperation("获取私募基金最新净值")
+    @GetMapping("/get/fund/newnet")
+    CommonResp<List<Net>> getFundNewnet(@RequestParam("list") List<String> list);
+
+    @ApiOperation("获取私有基金最新净值")
+    @GetMapping("/get/privatefund/newnet")
+    CommonResp<List<Net>> getPrivatefundNewnet(@RequestParam("list") List<String> list);
+
 }

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

 package com.tanpu.fund.controller;
 
+import com.tanpu.common.model.product.resp.Net;
+import com.tanpu.common.resp.CommonResp;
 import com.tanpu.fund.api.ProductForPcApi;
+import com.tanpu.fund.service.ProductForPcService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @RestController
 @Slf4j
 public class ProductForPcController implements ProductForPcApi {
+    @Resource
+    private ProductForPcService productForPcService;
+
+    @Override
+    public CommonResp<List<Net>> getFundNewnet(List<String> list) {
+        return CommonResp.success(productForPcService.getFundNewnet(list));
+    }
 
+    @Override
+    public CommonResp<List<Net>> getPrivatefundNewnet(List<String> list) {
+        return CommonResp.success(productForPcService.getPrivatefundNewnet(list));
+    }
 }

src/main/java/com/tanpu/fund/mapper/generator/custom/FundInfoCustomMapper.java

@@ -30,13 +30,21 @@ public interface FundInfoCustomMapper {
     List<FundNav> getFundInfoLastNet(@Param("list") List<String> fundIdList);
 
     /**
-     * 获取基金最新净值
+     * 获取*私募*基金最新净值
      *
      * @param fundIdList
      * @return
      */
     List<FundNav> getFundInfoNewNet(@Param("list") List<String> fundIdList);
 
+    /**
+     * 获取*私有*基金最新净值
+     *
+     * @param fundIdList
+     * @return
+     */
+    List<FundNav> getPrivateFundInfoNewNet(@Param("list") List<String> fundIdList);
+
     @Select("select t.id as fileId,t.logical_path as previewUrl from fund_file_record t where t.id in(${list})")
     List<FilePreviewResp> getFilePreviewUrl(@Param("list") String list);
 }

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

 package com.tanpu.fund.service;
 
+import com.tanpu.common.model.product.resp.Net;
+
+import java.util.List;
+
 /**
  * @author: zyh
  */
 public interface ProductForPcService {
 
+   List<Net> getFundNewnet(List<String> list);
+
+    List<Net> getPrivatefundNewnet(List<String> list);
 }

src/main/java/com/tanpu/fund/service/impl/ProductForPcServiceImpl.java

 package com.tanpu.fund.service.impl;
 
+import com.tanpu.common.model.product.resp.Net;
+import com.tanpu.common.model.product.resp.NetBigDecimal;
+import com.tanpu.common.utils.BigDecimalUtil;
+import com.tanpu.fund.entity.generator.FundNav;
+import com.tanpu.fund.mapper.generator.custom.FundInfoCustomMapper;
 import com.tanpu.fund.service.ProductForPcService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author: zyh
  */
 @Service
 public class ProductForPcServiceImpl implements ProductForPcService {
+    @Resource
+    private FundInfoCustomMapper fundInfoCustomMapper;
 
+    @Override
+    public List<Net> getFundNewnet(List<String> list) {
+        List<FundNav> fundInfoNewNet = fundInfoCustomMapper.getFundInfoNewNet(list);
+        if (CollectionUtils.isNotEmpty(fundInfoNewNet)) {
+          return fundInfoNewNet.stream().map(item -> Net.builder()
+                    .fundId(item.getFundId())
+                    .netDate(item.getPriceDate().getTime())
+                    .netValue(BigDecimalUtil.toString(item.getNav(), 4))
+                    .cumulativeNav(BigDecimalUtil.toString(item.getCumulativeNavWithdrawal(), 4))
+                    .build()).collect(Collectors.toList());
+        }
+        return new ArrayList<>(0);
+    }
 
+    @Override
+    public List<Net> getPrivatefundNewnet(List<String> list) {
+        List<FundNav> fundInfoNewNet = fundInfoCustomMapper.getPrivateFundInfoNewNet(list);
+        if (CollectionUtils.isNotEmpty(fundInfoNewNet)) {
+            return fundInfoNewNet.stream().map(item -> Net.builder()
+                    .fundId(item.getFundId())
+                    .netDate(item.getPriceDate().getTime())
+                    .netValue(BigDecimalUtil.toString(item.getNav(), 4))
+                    .cumulativeNav(BigDecimalUtil.toString(item.getCumulativeNavWithdrawal(), 4))
+                    .build()).collect(Collectors.toList());
+        }
+        return new ArrayList<>(0);
+    }
 }

src/main/resources/mybatis/customize/FundInfoCustomMapper.xml

@@ -32,7 +32,17 @@
 
     <select id="getFundInfoNewNet" parameterType="java.lang.String" resultType="com.tanpu.fund.entity.generator.FundNav">
         select res.* from
-        (SELECT * FROM tamp_product.fund_nav WHERE fund_id in
+        (SELECT * FROM fund_nav WHERE fund_id in
+        <foreach close=")" collection="list" item="fundId" open="(" separator=",">
+            #{fundId}
+        </foreach>
+        order BY price_date desc) res
+        GROUP BY res.fund_id
+    </select>
+
+    <select id="getPrivateFundInfoNewNet" parameterType="java.lang.String" resultType="com.tanpu.fund.entity.generator.FundNav">
+        select res.* from
+        (SELECT * FROM ifa_imported_fund_nav WHERE fund_id in
         <foreach close=")" collection="list" item="fundId" open="(" separator=",">
             #{fundId}
         </foreach>