feat:接口增加appKey参数用户验签,将refId参数改为secId

src/main/java/com/smppw/analysis/application/dto/info/FundSimilarReq.java

@@ -19,7 +19,7 @@ public class FundSimilarReq extends BaseReq<FundSimilarParams> {
     /**
      * 基金id
      */
-    private String refId;
+    private String secId;
     /**
      * 管理人id
      */

src/main/java/com/smppw/analysis/application/dto/info/ManualFundManagerParams.java

@@ -1,5 +1,6 @@
 package com.smppw.analysis.application.dto.info;
 
+import com.smppw.analysis.application.dto.BaseReq;
 import lombok.Data;
 
 /**
@@ -8,16 +9,20 @@ import lombok.Data;
  * @description 公募基金的基金经理变更历史请求参数
  */
 @Data
-public class ManualFundManagerParams {
+public class ManualFundManagerParams extends BaseReq<ManualFundManagerParams> {
 
     /**
      * 基金id
      */
-    private String refId;
+    private String secId;
 
     /**
      * 基准
      */
     private String benchmarkId;
 
+    @Override
+    public ManualFundManagerParams convert() {
+        return null;
+    }
 }

src/main/java/com/smppw/analysis/application/dto/info/ManualFundNoticeReq.java

@@ -1,5 +1,6 @@
 package com.smppw.analysis.application.dto.info;
 
+import com.smppw.analysis.application.dto.BaseReq;
 import lombok.Data;
 
 /**
@@ -8,12 +9,12 @@ import lombok.Data;
  * @description 公募基金公告信息请求参数
  */
 @Data
-public class ManualFundNoticeReq {
+public class ManualFundNoticeReq extends BaseReq<ManualFundNoticeReq> {
 
     /**
      * 公募基金id
      */
-    private String refId;
+    private String secId;
 
     /**
      * 公告类型：1-发行上市, 2-定期报告, 3-业绩快报， 4-其他公告,多个类型以逗号隔开
@@ -25,4 +26,9 @@ public class ManualFundNoticeReq {
      */
     private String title;
 
+    @Override
+    public ManualFundNoticeReq convert() {
+        return null;
+    }
+
 }

src/main/java/com/smppw/analysis/application/dto/performance/BasePerformanceReq.java

@@ -17,7 +17,7 @@ public abstract class BasePerformanceReq<R extends Params> extends BaseReq<R> {
     /**
      * 标的id，包括基金、机构和经理
      */
-    private String refId;
+    private String secId;
     /**
      * 基准
      */

src/main/java/com/smppw/analysis/application/dto/performance/CorrelationReq.java

@@ -26,7 +26,7 @@ public class CorrelationReq extends BasePerformanceReq<CorrelationParams> {
     @Override
     public CorrelationParams convert() {
         CorrelationParams params = BeanUtil.copyProperties(this, CorrelationParams.class);
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/DrawdownTrendReq.java

@@ -11,7 +11,7 @@ public class DrawdownTrendReq extends BasePerformanceReq<TrendParams> {
         TrendParams params = BeanUtil.copyProperties(this, TrendParams.class);
         params.setTrendTypes(ListUtil.toList(TrendType.DrawdownTrend, TrendType.ExtraDrawdownTrend));
         params.setIndexTrendTypes(ListUtil.toList(TrendType.DrawdownTrend));
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/ImfTrendReq.java

@@ -25,7 +25,7 @@ public class ImfTrendReq extends BasePerformanceReq<TrendParams> {
         TrendParams params = BeanUtil.copyProperties(this, TrendParams.class);
         params.setTrendTypes(trendTypes);
         params.setIndexTrendTypes(indexTrendTypes);
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/IndicatorReq.java

@@ -19,7 +19,7 @@ public class IndicatorReq extends BasePerformanceReq<IndicatorParams> {
         IndicatorParams params = BeanUtil.copyProperties(this, IndicatorParams.class);
         params.setIndicators(ListUtil.toList(Indicator.INDICATOR_TYPE_ARRAY));
         params.setExtraIndicators(ListUtil.toList(Indicator.RISK_TABLE_EXCESS_INDICATOR_ARRAY));
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/IntervalReq.java

@@ -17,7 +17,7 @@ public class IntervalReq extends BasePerformanceReq<IntervalParams> {
     @Override
     public IntervalParams convert() {
         IntervalParams params = BeanUtil.copyProperties(this, IntervalParams.class);
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/RankReq.java

@@ -18,7 +18,7 @@ public class RankReq extends BasePerformanceReq<RankParams> {
     @Override
     public RankParams convert() {
         RankParams params = BeanUtil.copyProperties(this, RankParams.class);
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/RevenueReq.java

@@ -25,7 +25,7 @@ public class RevenueReq extends BasePerformanceReq<RevenueParams> {
     @Override
     public RevenueParams convert() {
         RevenueParams params = BeanUtil.copyProperties(this, RevenueParams.class);
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/RollingReq.java

@@ -17,7 +17,7 @@ public class RollingReq extends BasePerformanceReq<RollingParams> {
     @Override
     public RollingParams convert() {
         RollingParams params = BeanUtil.copyProperties(this, RollingParams.class);
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/TrendReq.java

@@ -20,7 +20,7 @@ public class TrendReq extends BasePerformanceReq<TrendParams> {
         TrendParams params = BeanUtil.copyProperties(this, TrendParams.class);
         params.setTrendTypes(trendTypes);
         params.setIndexTrendTypes(ListUtil.toList(TrendType.Ret, TrendType.OrigNav));
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/dto/performance/WinReq.java

@@ -17,7 +17,7 @@ public class WinReq extends BasePerformanceReq<WinParams> {
     @Override
     public WinParams convert() {
         WinParams params = BeanUtil.copyProperties(this, WinParams.class);
-        params.setRefIds(ListUtil.toLinkedList(this.getRefId()));
+        params.setRefIds(ListUtil.toLinkedList(this.getSecId()));
         return params;
     }
 }

src/main/java/com/smppw/analysis/application/service/info/FundInfoService.java

@@ -88,11 +88,11 @@ public class FundInfoService {
      * @return /
      */
     public List<FundSimilarVO> getFundSimilarList(FundSimilarReq req) {
-        List<String> refIds = ListUtil.toLinkedList(req.getRefId());
+        List<String> secIds = ListUtil.toLinkedList(req.getSecId());
         IStrategy strategy = StrategyHandleUtils.getStrategy(req.getStrategy());
-        Map<String, List<DateValue>> secNavMap = this.navService.getSecIdDateValueNavListMapByDb(refIds,
+        Map<String, List<DateValue>> secNavMap = this.navService.getSecIdDateValueNavListMapByDb(secIds,
                 null, null, Visibility.Both, NavType.CumulativeNav);
-        List<IndicatorCalcTimeRangeDto> secTimeRanges = IndicatorService.getInstance().getSecTimeRange(req.getRefId(), Frequency.Monthly, secNavMap);
+        List<IndicatorCalcTimeRangeDto> secTimeRanges = IndicatorService.getInstance().getSecTimeRange(req.getSecId(), Frequency.Monthly, secNavMap);
         String startDate = null;
         String endDate = null;
         if (CollUtil.isNotEmpty(secTimeRanges)) {
@@ -109,16 +109,16 @@ public class FundInfoService {
         List<FundSimilarDo> dataList = this.baseInfoService.getFundSimilarList(params);
         List<String> fundIds = dataList.stream().map(FundSimilarDo::getFundId).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(fundIds)) {
-            refIds.addAll(fundIds);
+            secIds.addAll(fundIds);
         }
-        Map<String, List<DateValue>> allNavMap = this.navService.getSecIdDateValueNavListMapByDb(refIds,
+        Map<String, List<DateValue>> allNavMap = this.navService.getSecIdDateValueNavListMapByDb(secIds,
                 startDate, endDate, Visibility.Both, NavType.CumulativeNav);
         Map<String, List<IndicatorCalcPropertyDto>> multiSecRetListNew = this.baseIndicatorServiceV2.getMultiSecRetListNew(
-                refIds, ListUtil.empty(), Frequency.Monthly, Frequency.Daily, startDate, endDate, false, params.getBenchmarkId(),
+                secIds, ListUtil.empty(), Frequency.Monthly, Frequency.Daily, startDate, endDate, false, params.getBenchmarkId(),
                 params.getRaiseType(), strategy, Visibility.Both, NavType.CumulativeNav, allNavMap);
-        List<Map<String, Object>> initRetList = NavUtil.handleNextStepNew(refIds, ListUtil.empty(), multiSecRetListNew, false);
+        List<Map<String, Object>> initRetList = NavUtil.handleNextStepNew(secIds, ListUtil.empty(), multiSecRetListNew, false);
         Map<String, Map<String, Double>> retMap = this.transfer2TwoDimensionMap(initRetList);
-        Double[][] corArr = CalcUtils.getCorrelationMatrix(retMap, ListUtil.toList(params.getRefId()), refIds);
+        Double[][] corArr = CalcUtils.getCorrelationMatrix(retMap, ListUtil.toList(params.getSecId()), secIds);
         List<FundSimilarVO> resultList = ListUtil.list(true);
         for (FundSimilarDo map : dataList) {
             FundSimilarVO similarVO = BeanUtil.copyProperties(map, FundSimilarVO.class);
@@ -162,7 +162,7 @@ public class FundInfoService {
 
     public List<ManualFundNoticeInfoVO> noticeList(ManualFundNoticeReq params) {
         Map<String, String> typeMapper = MapUtil.builder("1", "10").put("2", "20").put("3", "30").put("4", "50, 70, 90, 91").build();
-        String fundId = params.getRefId();
+        String fundId = params.getSecId();
         String title = params.getTitle();
         // type 逗号拆分 转list，直接数据库in查询
         List<String> typeList = ListUtil.list(false);
@@ -183,9 +183,9 @@ public class FundInfoService {
         return resultList;
     }
 
-    public ManualFundInvestInfoVO investInfo(String refId) {
+    public ManualFundInvestInfoVO investInfo(String secId) {
         ManualFundInvestInfoVO fundInvestInfoVO = new ManualFundInvestInfoVO();
-        FundArchivesInfoDO fundArchivesInfo = this.baseInfoService.queryFundArchives(refId);
+        FundArchivesInfoDO fundArchivesInfo = this.baseInfoService.queryFundArchives(secId);
         if (fundArchivesInfo == null) {
             return fundInvestInfoVO;
         }
@@ -195,8 +195,8 @@ public class FundInfoService {
         return fundInvestInfoVO;
     }
 
-    public FundBaseFeeVO getFundFee(String refId) {
-        FundFeeDo fundFee = this.baseInfoService.getFundFee(refId);
+    public FundBaseFeeVO getFundFee(String secId) {
+        FundFeeDo fundFee = this.baseInfoService.getFundFee(secId);
         DateFormatUtils.format(new Date(), DateConst.YYYY, TimeZone.getDefault());
         //数字格式处理
         FundFeeDo fundFees = numberFormat(fundFee);
@@ -328,9 +328,9 @@ public class FundInfoService {
         return this.handleFee(dataList, type, function).stream().findFirst().orElse(null);
     }
 
-    public List<FundManagerInfoVo> getHFManagerInfo(String refId) {
+    public List<FundManagerInfoVo> getHFManagerInfo(String secId) {
         List<FundManagerInfoVo> resultList = ListUtil.list(true);
-        List<PersonnelInformationDo> managerInfoList = this.baseInfoService.getFundManagerInfo(refId);
+        List<PersonnelInformationDo> managerInfoList = this.baseInfoService.getFundManagerInfo(secId);
         if (CollUtil.isEmpty(managerInfoList)) {
             return resultList;
         }
@@ -367,9 +367,9 @@ public class FundInfoService {
     }
 
     public List<ManualFundManagerChangeVO> managerChangeList(ManualFundManagerParams params) {
-        String refId = params.getRefId();
+        String secId = params.getSecId();
         String benchmarkId = params.getBenchmarkId();
-        List<ManualFundManagerChangeDo> dataList = this.baseInfoService.listFundManagerChangeHistory(refId);
+        List<ManualFundManagerChangeDo> dataList = this.baseInfoService.listFundManagerChangeHistory(secId);
 
         dataList = dataList.stream().filter(e -> e.getStartDate() != null).collect(Collectors.toList());
         // 按基金经理+开始任职时间分组每个经理只取一条数据
@@ -396,13 +396,13 @@ public class FundInfoService {
             vo.setEmployDayNum(DateUtil.between(DateUtil.parseDate(data.getStartDate()), date, DateUnit.DAY) + "");
             // 指标计算
             Map<String, Map<String, String>> indicatorValue =
-                    this.getIndicatorValue(refId, benchmarkId, data.getStartDate(), data.getEndDate(), indicatorList);
-            if (indicatorValue.get(refId) != null) {
-                vo.setFundRet(indicatorValue.get(refId).get(Indicator.IntervalReturn.name()));
-                vo.setAnnualRet(indicatorValue.get(refId).get(Indicator.AnnualReturn.name()));
-                vo.setMaxDrawdown(indicatorValue.get(refId).get(Indicator.MaxDrawdown.name()));
-                vo.setCalmar(indicatorValue.get(refId).get(Indicator.CalmarRatio.name()));
-                vo.setSortino(indicatorValue.get(refId).get(Indicator.SortinoRatio.name()));
+                    this.getIndicatorValue(secId, benchmarkId, data.getStartDate(), data.getEndDate(), indicatorList);
+            if (indicatorValue.get(secId) != null) {
+                vo.setFundRet(indicatorValue.get(secId).get(Indicator.IntervalReturn.name()));
+                vo.setAnnualRet(indicatorValue.get(secId).get(Indicator.AnnualReturn.name()));
+                vo.setMaxDrawdown(indicatorValue.get(secId).get(Indicator.MaxDrawdown.name()));
+                vo.setCalmar(indicatorValue.get(secId).get(Indicator.CalmarRatio.name()));
+                vo.setSortino(indicatorValue.get(secId).get(Indicator.SortinoRatio.name()));
             }
             resultList.add(vo);
         });
@@ -413,21 +413,21 @@ public class FundInfoService {
     /**
      * 计算公募基金和其基准区间内的指标
      *
-     * @param refId         公募基金
+     * @param secId         公募基金
      * @param benchmarkId   基准
      * @param startDate     开始日期
      * @param endDate       结束日期
      * @param indicatorList 计算指标
      * @return /
      */
-    private Map<String, Map<String, String>> getIndicatorValue(String refId, String benchmarkId, String startDate, String endDate, List<Indicator> indicatorList) {
+    private Map<String, Map<String, String>> getIndicatorValue(String secId, String benchmarkId, String startDate, String endDate, List<Indicator> indicatorList) {
         DateIntervalDto dateIntervalDto = DateIntervalDto.builder()
                 .id(DateIntervalType.CustomInterval.name()).startDate(startDate).endDate(endDate)
                 .dateIntervalType(DateIntervalType.CustomInterval).frequency(Frequency.Default).build();
-        Map<String, List<DateIntervalDto>> dateIntervalMap = MapUtil.builder(refId, ListUtil.of(dateIntervalDto)).build();
-        Map<String, String> benchmarkIdMap = MapUtil.builder(refId, benchmarkId).build();
+        Map<String, List<DateIntervalDto>> dateIntervalMap = MapUtil.builder(secId, ListUtil.of(dateIntervalDto)).build();
+        Map<String, String> benchmarkIdMap = MapUtil.builder(secId, benchmarkId).build();
         CalcMultipleSecMultipleTimeRangeIndicatorReq req = CalcMultipleSecMultipleTimeRangeIndicatorReq.builder()
-                .mainSecIdList(ListUtil.of(refId))
+                .mainSecIdList(ListUtil.of(secId))
                 .secBenchmarkIdMap(benchmarkIdMap)
                 .indexIdList(ListUtil.of(benchmarkId))
                 .raiseType(RaiseType.Both)
@@ -446,21 +446,21 @@ public class FundInfoService {
 
         // DateIntervalType.CustomInterval 类型下每个标的只会返回一个维度下的指标计算结果，所以只获取第一条记录的指标计算结果
         Map<String, Map<String, String>> result = MapUtil.newHashMap();
-        Map<String, String> valueMap = Optional.ofNullable(indicatorValueMap).map(e -> e.get(refId)).orElse(ListUtil.empty()).stream().findFirst()
+        Map<String, String> valueMap = Optional.ofNullable(indicatorValueMap).map(e -> e.get(secId)).orElse(ListUtil.empty()).stream().findFirst()
                 .map(IndicatorCalcPropertyDto::getSecData).map(IndicatorCalcSecDataDto::getIndicatorValueMap).orElse(MapUtil.empty());
-        Map<String, String> valueBenchmarkMap = Optional.ofNullable(indicatorValueMap).map(e -> e.get(refId)).orElse(ListUtil.empty()).stream().findFirst()
+        Map<String, String> valueBenchmarkMap = Optional.ofNullable(indicatorValueMap).map(e -> e.get(secId)).orElse(ListUtil.empty()).stream().findFirst()
                 .map(IndicatorCalcPropertyDto::getIndexData).map(IndicatorCalcIndexDataDto::getIndexIndicatorValueMap).map(e -> e.get(benchmarkId)).orElse(MapUtil.empty());
-        result.put(refId, valueMap);
+        result.put(secId, valueMap);
         result.put(benchmarkId, valueBenchmarkMap);
         return result;
     }
 
     public List<ManualFundManagerInfoVO> managerList(ManualFundManagerParams params) {
-        String refId = params.getRefId();
+        String secId = params.getSecId();
         String benchmarkId = params.getBenchmarkId();
         List<ManualFundManagerInfoVO> resultList = ListUtil.list(true);
         //1.先获取基金下的现任基金经理基本信息
-        List<PersonnelInformationDo> managerInfoList = this.baseInfoService.getFundPresentManagerInfo(refId);
+        List<PersonnelInformationDo> managerInfoList = this.baseInfoService.getFundPresentManagerInfo(secId);
         if (CollUtil.isEmpty(managerInfoList)) {
             return resultList;
         }
@@ -478,7 +478,7 @@ public class FundInfoService {
             manualFundManagerInfoDo.setAvatar2(e.getAvatar2());
             List<MfManagerFundNumDo> mfManagerFundNumDos = listMap.get(managerId);
             if (CollUtil.isNotEmpty(mfManagerFundNumDos)) {
-                mfManagerFundNumDos.stream().filter(k -> refId.equals(k.getFundId())).findFirst()
+                mfManagerFundNumDos.stream().filter(k -> secId.equals(k.getFundId())).findFirst()
                         .ifPresent(mfManagerFundNumDo -> manualFundManagerInfoDo.setStartDate(mfManagerFundNumDo.getStartDate()));
                 long publicProductNumAll = mfManagerFundNumDos.stream().filter(v -> v.getFundId().startsWith("MF")).count();
                 long publicProductNumRunning = mfManagerFundNumDos.stream().filter(w -> Objects.equals(2, w.getStatus()) && w.getEndDate() == null).count();
@@ -518,11 +518,11 @@ public class FundInfoService {
                 vo.setRunningScale(String.valueOf(total));
             }
             // 指标计算结果处理
-            Map<String, Map<String, String>> indicatorValue = this.getIndicatorValue(refId, benchmarkId, data.getStartDate(), data.getEndDate(), indicatorList);
-            if (indicatorValue.get(refId) != null) {
-                vo.setNavChange(indicatorValue.get(refId).get(Indicator.IntervalReturn.name()));
-                vo.setAnnualRet(indicatorValue.get(refId).get(Indicator.AnnualReturn.name()));
-                vo.setSharpe(indicatorValue.get(refId).get(Indicator.SharpeRatio.name()));
+            Map<String, Map<String, String>> indicatorValue = this.getIndicatorValue(secId, benchmarkId, data.getStartDate(), data.getEndDate(), indicatorList);
+            if (indicatorValue.get(secId) != null) {
+                vo.setNavChange(indicatorValue.get(secId).get(Indicator.IntervalReturn.name()));
+                vo.setAnnualRet(indicatorValue.get(secId).get(Indicator.AnnualReturn.name()));
+                vo.setSharpe(indicatorValue.get(secId).get(Indicator.SharpeRatio.name()));
             }
             if (indicatorValue.get(benchmarkId) != null) {
                 vo.setBenchmarkRet(indicatorValue.get(benchmarkId).get(Indicator.IntervalReturn.name()));

src/main/java/com/smppw/analysis/client/FundApi.java

@@ -86,46 +86,48 @@ public class FundApi {
     /**
      * 公募基金投资类信息说明
      *
-     * @param refId 基金id
+     * @param secId  基金id
+     * @param appKey 访问授权码,用于接口验签
      * @return 投资类信息说明
      */
     @GetMapping("invest-info")
-    public ResultVo<ManualFundInvestInfoVO> investInfo(@RequestParam("refId") String refId) {
-        return ResultVo.ok(service.investInfo(refId));
+    public ResultVo<ManualFundInvestInfoVO> investInfo(@RequestParam("secId") String secId, String appKey) {
+        return ResultVo.ok(service.investInfo(secId));
     }
 
     /**
      * 私募基金费率信息
      *
-     * @param refId 基金id
+     * @param secId  基金id
+     * @param appKey 访问授权码,用于接口验签
      * @return 基金费率信息
      */
     @GetMapping("fee")
-    public ResultVo<FundBaseFeeVO> fee(String refId) {
-        return ResultVo.ok(this.service.getFundFee(refId));
+    public ResultVo<FundBaseFeeVO> fee(@RequestParam("secId") String secId, String appKey) {
+        return ResultVo.ok(this.service.getFundFee(secId));
     }
 
     /**
      * 公募基金费率信息
      *
-     * @param refId 基金id
+     * @param secId  基金id
      * @return 基金费率信息
      */
     @GetMapping("mf-fee")
-    public ResultVo<ManualFundFeeInfoVO> mFFundFee(String refId) {
-        return ResultVo.ok(this.service.getMfFundFee(refId));
+    public ResultVo<ManualFundFeeInfoVO> mFFundFee(@RequestParam("secId") String secId, String appKey) {
+        return ResultVo.ok(this.service.getMfFundFee(secId));
     }
 
 
     /**
      * 私募基金详情页-基金经理
      *
-     * @param refId 基金id
+     * @param secId 基金id
      * @return 基金经理信息
      */
     @GetMapping("manager-info")
-    public ResultVo<List<FundManagerInfoVo>> managerInfo(@RequestParam("refId") String refId) {
-        return ResultVo.ok(this.service.getHFManagerInfo(refId));
+    public ResultVo<List<FundManagerInfoVo>> managerInfo(@RequestParam("secId") String secId, String appKey) {
+        return ResultVo.ok(this.service.getHFManagerInfo(secId));
     }
 
     /**

src/main/java/com/smppw/analysis/domain/dto/info/FundSimilarParams.java

@@ -17,7 +17,7 @@ public class FundSimilarParams {
     /**
      * 基金id
      */
-    private String refId;
+    private String secId;
     /**
      * 管理人id
      */

src/main/java/com/smppw/analysis/domain/service/impl/BaseInfoServiceImpl.java

@@ -290,12 +290,12 @@ public class BaseInfoServiceImpl implements BaseInfoService, ApplicationContextA
             tempList.addAll(this.fundInformationDao.getSameCompanyFundIds(req));
         } else {
             Map<String, Object> req = MapUtil.<String, Object>builder().put("strategy", strategy.getStrategyId()).put("rankNum", 50)
-                    .put("tableName", "rz_hfdb_core.fund_indicator_ranking").put("fundId", params.getRefId()).put("rankDate", rankDate).build();
+                    .put("tableName", "rz_hfdb_core.fund_indicator_ranking").put("fundId", params.getSecId()).put("rankDate", rankDate).build();
             tempList.addAll(this.fundInformationDao.getSameStrategyFundIds(req));
         }
         List<FundSimilarDo> dataList = ListUtil.list(true);
         // 过滤当前基金
-        dataList.addAll(tempList.stream().filter(e -> !params.getRefId().equals(e.getFundId())).collect(Collectors.toList()));
+        dataList.addAll(tempList.stream().filter(e -> !params.getSecId().equals(e.getFundId())).collect(Collectors.toList()));
         return dataList;
     }