指标计算去掉重复方法

src/main/java/com/smppw/core/IndicatorService.java

@@ -585,61 +585,6 @@ public class IndicatorService {
         }
     }
 
-    public Map<String, List<IndicatorCalcPropertyDto>> getMultiSecRetListNew(List<String> mainSecIdList, List<String> indexIdList, Frequency frequency,
-                                                                             Frequency rollingFrequency, String startDate, String endDate,
-                                                                             boolean ifExcessReturn, String benchmarkId, RaiseType raiseType, IStrategy strategy,
-                                                                             Visibility visibility, NavType navType, boolean isExtract, Integer userId, Map<String, List<DateValue>> allNavMap, Map<String, Frequency> secFreqMap) {
-        List<DateIntervalDto> dateIntervalDtoList = new ArrayList<>();
-        DateIntervalDto defaultIntervalDto = new DateIntervalDto();
-        defaultIntervalDto.setStartDate(startDate);
-        defaultIntervalDto.setEndDate(endDate);
-        defaultIntervalDto.setDateIntervalType(DateIntervalType.DefaultRolling);
-        defaultIntervalDto.setFrequency(rollingFrequency);
-        dateIntervalDtoList.add(defaultIntervalDto);
-
-        List<Indicator> indicatorList = new ArrayList<>();
-        List<Indicator> geoExtraIndicatorList = new ArrayList<>();
-
-        indicatorList.add(Indicator.IntervalReturn);
-        if (ifExcessReturn) {
-            geoExtraIndicatorList.add(Indicator.IntervalReturn);
-        }
-
-        Map<String, String> secBenchmarkIdMap = new HashMap<>();
-        for (String mainSecId : mainSecIdList) {
-            secBenchmarkIdMap.put(mainSecId, benchmarkId);
-        }
-
-        Map<String, List<DateIntervalDto>> secDateIntervalDtoListMap = new HashMap<>();
-        for (String mainSecId : mainSecIdList) {
-            secDateIntervalDtoListMap.put(mainSecId, dateIntervalDtoList);
-        }
-
-        CalcMultipleSecMultipleTimeRangeIndicatorReq calcMultipleSecMultipleTimeRangeIndicatorReq = new CalcMultipleSecMultipleTimeRangeIndicatorReq();
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setMainSecIdList(mainSecIdList);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setSecBenchmarkIdMap(secBenchmarkIdMap);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setIndexIdList(indexIdList);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setRaiseType(raiseType);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setStrategy(strategy);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setVisibility(visibility);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setSecDateIntervalDtoListMap(secDateIntervalDtoListMap);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setDataFrequency(frequency);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setNavType(navType);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setIndicatorList(indicatorList);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setGeoExtraindicatorList(geoExtraIndicatorList);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setRiskOfFreeId(null);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setRiskOfFreeValue(null);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setIfAnnualize(true);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setCalcIndexRetIndicatorValue(true);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setNeedRet(false);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setIfExtract(isExtract);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setUserId(userId);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setNeedExtraRet(false);
-        calcMultipleSecMultipleTimeRangeIndicatorReq.setIfConvertPerformanceConsistencyWord(true);
-
-        return calcMultipleSecMultipleTimeRangeIndicator(calcMultipleSecMultipleTimeRangeIndicatorReq, allNavMap, secFreqMap);
-    }
-
     private static class IndicatorServiceBuilder {
         public static final IndicatorService INSTANCE = new IndicatorService();
     }