Browse Source

基本信息重构

wangzaijun 1 year ago
parent
commit
c76633dbb0
52 changed files with 193 additions and 125 deletions
  1. 6 6
      src/main/java/com/smppw/analysis/domain/dao/CompanyInformationDao.java
  2. 19 19
      src/main/java/com/smppw/analysis/domain/dao/FundInformationDao.java
  3. 4 4
      src/main/java/com/smppw/analysis/domain/dao/IndexesProfileDao.java
  4. 5 5
      src/main/java/com/smppw/analysis/domain/dao/PositionAnalysisDao.java
  5. 6 0
      src/main/java/com/smppw/analysis/domain/dao/info/AbstractInfoDao.java
  6. 14 0
      src/main/java/com/smppw/analysis/domain/dao/info/FundInfoDao.java
  7. 9 0
      src/main/java/com/smppw/analysis/domain/dao/info/InfoConstants.java
  8. 20 0
      src/main/java/com/smppw/analysis/domain/dao/info/InfoDao.java
  9. 23 0
      src/main/java/com/smppw/analysis/domain/dao/info/InfoFactory.java
  10. 0 4
      src/main/java/com/smppw/analysis/domain/dao/info/package-info.java
  11. 6 6
      src/main/java/com/smppw/analysis/domain/dao/nav/CompanyNavDao.java
  12. 4 4
      src/main/java/com/smppw/analysis/domain/dao/nav/ManagerNavDao.java
  13. 5 5
      src/main/java/com/smppw/analysis/domain/dao/nav/MarketIndexDao.java
  14. 7 7
      src/main/java/com/smppw/analysis/domain/dao/nav/PrivatelyOfferedFundNavDao.java
  15. 6 6
      src/main/java/com/smppw/analysis/domain/dao/nav/PubliclyOfferedFundNavDao.java
  16. 3 3
      src/main/java/com/smppw/analysis/domain/dao/nav/RiskOfFreeNavDao.java
  17. 6 6
      src/main/java/com/smppw/analysis/domain/dao/nav/RongzhiIndexNavDao.java
  18. 7 7
      src/main/java/com/smppw/analysis/domain/manager/position/bond/BondPositionService.java
  19. 5 5
      src/main/java/com/smppw/analysis/domain/manager/position/future/MarginalRiskContributionBizHandler.java
  20. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/BondBasicInformationDOMapper.java
  21. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/CompanyFittedCurveDoMapper.java
  22. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/CompanyFittedCurveWeeklyDoMapper.java
  23. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/CompanyInformationDoMapper.java
  24. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/DepositNavDoMapper.java
  25. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/FundFrequencyDoMapper.java
  26. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/FundInformationDoMapper.java
  27. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/FundManagerFittedCurveDoMapper.java
  28. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/FundManagerFittedCurveWeeklyDoMapper.java
  29. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/IndexesProfileDoMapper.java
  30. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/IndexesRzIndexDoMapper.java
  31. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/IndexesTradeDateDoMapper.java
  32. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/MarketIndexesDoMapper.java
  33. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/NavDoMapper.java
  34. 1 1
      src/main/java/com/smppw/analysis/domain/mapper/core/PublicNavDoMapper.java
  35. 3 3
      src/main/java/com/smppw/analysis/infrastructure/task/NonTradingDayTask.java
  36. 2 2
      src/main/java/com/smppw/analysis/infrastructure/task/RiskOfFreeIdTask.java
  37. 3 3
      src/main/java/com/smppw/analysis/infrastructure/task/TrendDateTask.java
  38. 1 1
      src/main/resources/mapping/core/BondBasicInformationDOMapper.xml
  39. 1 1
      src/main/resources/mapping/core/CompanyFittedCurveDoMapper.xml
  40. 1 1
      src/main/resources/mapping/core/CompanyFittedCurveWeeklyDoMapper.xml
  41. 1 1
      src/main/resources/mapping/core/CompanyInformationDoMapper.xml
  42. 1 1
      src/main/resources/mapping/core/DepositNavDoMapper.xml
  43. 1 1
      src/main/resources/mapping/core/FundFrequencyDoMapper.xml
  44. 1 1
      src/main/resources/mapping/core/FundInformationDoMapper.xml
  45. 1 1
      src/main/resources/mapping/core/FundManagerFittedCurveDoMapper.xml
  46. 1 1
      src/main/resources/mapping/core/FundManagerFittedCurveWeeklyDoMapper.xml
  47. 1 1
      src/main/resources/mapping/core/IndexesProfileDoMapper.xml
  48. 1 1
      src/main/resources/mapping/core/IndexesRzIndexDoMapper.xml
  49. 1 1
      src/main/resources/mapping/core/IndexesTradeDateDoMapper.xml
  50. 1 1
      src/main/resources/mapping/core/MarketIndexesDoMapper.xml
  51. 1 1
      src/main/resources/mapping/core/NavDoMapper.xml
  52. 1 1
      src/main/resources/mapping/core/PublicNavDoMapper.xml

+ 6 - 6
src/main/java/com/smppw/analysis/domain/dao/CompanyInformationDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.CompanyInformationDo;
-import com.smppw.analysis.domain.mapper.core.CompanyInformationDoMapper;
+import com.smppw.analysis.domain.mapper.core.CompanyInformationMapper;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -10,18 +10,18 @@ import java.util.Map;
 
 @Component
 public class CompanyInformationDao {
-    private final CompanyInformationDoMapper companyInformationDoMapper;
+    private final CompanyInformationMapper companyInformationMapper;
 
-    public CompanyInformationDao(CompanyInformationDoMapper companyInformationDoMapper) {
-        this.companyInformationDoMapper = companyInformationDoMapper;
+    public CompanyInformationDao(CompanyInformationMapper companyInformationMapper) {
+        this.companyInformationMapper = companyInformationMapper;
     }
 
     public List<CompanyInformationDo> listCompany(List<String> companyIds) {
-        return this.companyInformationDoMapper.listCompany(companyIds);
+        return this.companyInformationMapper.listCompany(companyIds);
     }
 
     public Map<String, String> getFundIdNameMap(List<String> companyIdList) {
-        List<CompanyInformationDo> fundInformationDos = companyInformationDoMapper.listCompany(companyIdList);
+        List<CompanyInformationDo> fundInformationDos = companyInformationMapper.listCompany(companyIdList);
         Map<String, String> fundIdNameMap = new HashMap<>();
         for (CompanyInformationDo fundInformationDo : fundInformationDos) {
             fundIdNameMap.put(fundInformationDo.getCompanyId(), fundInformationDo.getCompanyShortName());

+ 19 - 19
src/main/java/com/smppw/analysis/domain/dao/FundInformationDao.java

@@ -18,19 +18,19 @@ import java.util.Map;
 @Component
 public class FundInformationDao {
     private final FundAssetSizeMapper fundAssetSizeMapper;
-    private final FundFrequencyDoMapper fundFrequencyDoMapper;
-    private final FundInformationDoMapper fundInformationDoMapper;
+    private final FundFrequencyMapper fundFrequencyMapper;
+    private final FundInformationMapper fundInformationMapper;
     private final MonetaryFundProfitMapper monetaryFundProfitMapper;
     private final CompanyFundScaleRangeHistoryMapper companyFundScaleRangeHistoryMapper;
 
-    public FundInformationDao( FundAssetSizeMapper fundAssetSizeMapper,
-                               FundFrequencyDoMapper fundFrequencyDoMapper,
-                              FundInformationDoMapper fundInformationDoMapper,
+    public FundInformationDao(FundAssetSizeMapper fundAssetSizeMapper,
+                              FundFrequencyMapper fundFrequencyMapper,
+                              FundInformationMapper fundInformationMapper,
                               MonetaryFundProfitMapper monetaryFundProfitMapper,
-                               CompanyFundScaleRangeHistoryMapper companyFundScaleRangeHistoryMapper) {
+                              CompanyFundScaleRangeHistoryMapper companyFundScaleRangeHistoryMapper) {
         this.fundAssetSizeMapper = fundAssetSizeMapper;
-        this.fundFrequencyDoMapper = fundFrequencyDoMapper;
-        this.fundInformationDoMapper = fundInformationDoMapper;
+        this.fundFrequencyMapper = fundFrequencyMapper;
+        this.fundInformationMapper = fundInformationMapper;
         this.monetaryFundProfitMapper = monetaryFundProfitMapper;
         this.companyFundScaleRangeHistoryMapper = companyFundScaleRangeHistoryMapper;
     }
@@ -42,21 +42,21 @@ public class FundInformationDao {
      * @return /
      */
     public List<FundInfoDO> listFundInfo(List<String> fundIds) {
-        return this.fundInformationDoMapper.queryFundInfoList(fundIds);
+        return this.fundInformationMapper.queryFundInfoList(fundIds);
     }
 
     public FundInfoDO getFundInfoById(String fundId) {
-        List<FundInfoDO> dataList = this.fundInformationDoMapper.queryFundInfoList(ListUtil.toList(fundId));
+        List<FundInfoDO> dataList = this.fundInformationMapper.queryFundInfoList(ListUtil.toList(fundId));
         return dataList.stream().filter(e -> fundId.equals(e.getFundId())).findFirst().orElse(null);
     }
 
     public String getNavFrequencyByFundId(String secId) {
-        return this.fundFrequencyDoMapper.getNavFrequencyByFundId(secId);
+        return this.fundFrequencyMapper.getNavFrequencyByFundId(secId);
     }
 
     public Map<String, Frequency> getNavFrequency(List<String> secIdList) {
         Map<String, Frequency> secFrequencyMap = new HashMap<>();
-        List<FundFrequencyDo> fundFrequencyDos = fundFrequencyDoMapper.getNavFrequencyByFundIdList(secIdList);
+        List<FundFrequencyDo> fundFrequencyDos = fundFrequencyMapper.getNavFrequencyByFundIdList(secIdList);
         for (FundFrequencyDo fundFrequencyDo : fundFrequencyDos) {
             String frequencyStr = fundFrequencyDo.getNavFrequency();
             Frequency frequency = Frequency.Monthly;
@@ -71,7 +71,7 @@ public class FundInformationDao {
     }
 
     public Map<String, String> getMarketFundIdNameMap(List<String> fundIdList) {
-        List<FundInformationDo> fundInformationDos = fundInformationDoMapper.listFundInfo(fundIdList);
+        List<FundInformationDo> fundInformationDos = fundInformationMapper.listFundInfo(fundIdList);
         Map<String, String> fundIdNameMap = new HashMap<>();
         for (FundInformationDo fundInformationDo : fundInformationDos) {
             fundIdNameMap.put(fundInformationDo.getFundId(), fundInformationDo.getFundShortName());
@@ -89,27 +89,27 @@ public class FundInformationDao {
         params.put("rankDate", rankDate);
         params.put("indexIds", String.join("_", indexIds));
         params.put("indicator", indicator.getId());
-        return this.fundInformationDoMapper.getFundRankByCall(params);
+        return this.fundInformationMapper.getFundRankByCall(params);
     }
 
     public List<FundSimilarDo> getSameCompanyFundIds(Map<String, Object> params) {
-        return this.fundInformationDoMapper.getSameCompanyFundIds(params);
+        return this.fundInformationMapper.getSameCompanyFundIds(params);
     }
 
     public List<FundSimilarDo> getSameStrategyFundIds(Map<String, Object> params) {
-        return this.fundInformationDoMapper.getSameStrategyFundIds(params);
+        return this.fundInformationMapper.getSameStrategyFundIds(params);
     }
 
     public FundFeeDo getFundFee(String fundId) {
-        return this.fundInformationDoMapper.getFundFee(fundId);
+        return this.fundInformationMapper.getFundFee(fundId);
     }
 
     public List<ManualFundManagerChangeDo> listFundManagerChangeHistory(String fundId) {
-        return this.fundInformationDoMapper.listFundManagerChangeHistory(fundId);
+        return this.fundInformationMapper.listFundManagerChangeHistory(fundId);
     }
 
     public List<MfManagerFundNumDo> listMfManagerFundNumByManagerId(List<String> managerIdList) {
-        return this.fundInformationDoMapper.listMfManagerFundNumByManagerId(managerIdList);
+        return this.fundInformationMapper.listMfManagerFundNumByManagerId(managerIdList);
     }
 
     public String getFundLastAssetSize(String fundId) {

+ 4 - 4
src/main/java/com/smppw/analysis/domain/dao/IndexesProfileDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.IndexesProfileDo;
-import com.smppw.analysis.domain.mapper.core.IndexesProfileDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesProfileMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -13,10 +13,10 @@ import java.util.Map;
 public class IndexesProfileDao {
 
     @Autowired
-    private IndexesProfileDoMapper indexesProfileDoMapper;
+    private IndexesProfileMapper indexesProfileMapper;
 
     public Map<String, String> getFundIdNameMap(List<String> indexIdList) {
-        List<IndexesProfileDo> fundInformationDos = indexesProfileDoMapper.listFundIdAndFundShortName(indexIdList);
+        List<IndexesProfileDo> fundInformationDos = indexesProfileMapper.listFundIdAndFundShortName(indexIdList);
         Map<String, String> fundIdNameMap = new HashMap<>();
         for (IndexesProfileDo fundInformationDo : fundInformationDos) {
             fundIdNameMap.put(fundInformationDo.getIndexId(), fundInformationDo.getIndexShortName());
@@ -25,6 +25,6 @@ public class IndexesProfileDao {
     }
 
     public List<IndexesProfileDo> listInfoByIndexIdList(List<String> indexIdList) {
-        return indexesProfileDoMapper.listInfoByIndexIdList(indexIdList);
+        return indexesProfileMapper.listInfoByIndexIdList(indexIdList);
     }
 }

+ 5 - 5
src/main/java/com/smppw/analysis/domain/dao/PositionAnalysisDao.java

@@ -3,7 +3,7 @@ package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.*;
 import com.smppw.analysis.domain.mapper.core.BaseUnderlyingMapper;
-import com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesTradeDateMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -16,12 +16,12 @@ import java.util.List;
 @Service
 public class PositionAnalysisDao {
     private final BaseUnderlyingMapper baseUnderlyingMapper;
-    private final IndexesTradeDateDoMapper indexesTradeDateDoMapper;
+    private final IndexesTradeDateMapper indexesTradeDateMapper;
 
     public PositionAnalysisDao(BaseUnderlyingMapper baseUnderlyingMapper,
-                               IndexesTradeDateDoMapper indexesTradeDateDoMapper) {
+                               IndexesTradeDateMapper indexesTradeDateMapper) {
         this.baseUnderlyingMapper = baseUnderlyingMapper;
-        this.indexesTradeDateDoMapper = indexesTradeDateDoMapper;
+        this.indexesTradeDateMapper = indexesTradeDateMapper;
     }
 
     /**
@@ -31,7 +31,7 @@ public class PositionAnalysisDao {
      * @return /
      */
     public String getLatestTradeDate(String tradeDate) {
-        return this.indexesTradeDateDoMapper.queryLatestTradeDate(tradeDate);
+        return this.indexesTradeDateMapper.queryLatestTradeDate(tradeDate);
     }
 
     /**

+ 6 - 0
src/main/java/com/smppw/analysis/domain/dao/info/AbstractInfoDao.java

@@ -0,0 +1,6 @@
+package com.smppw.analysis.domain.dao.info;
+
+import com.smppw.analysis.domain.dataobject.info.BaseInfoDO;
+
+public abstract class AbstractInfoDao<R extends BaseInfoDO> implements InfoDao<R> {
+}

+ 14 - 0
src/main/java/com/smppw/analysis/domain/dao/info/FundInfoDao.java

@@ -0,0 +1,14 @@
+package com.smppw.analysis.domain.dao.info;
+
+import com.smppw.analysis.domain.dataobject.info.FundInfoDO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component(InfoConstants.FUND_INFO)
+public class FundInfoDao extends AbstractInfoDao<FundInfoDO>{
+    @Override
+    public List<FundInfoDO> list(List<String> secIds) {
+        return null;
+    }
+}

+ 9 - 0
src/main/java/com/smppw/analysis/domain/dao/info/InfoConstants.java

@@ -0,0 +1,9 @@
+package com.smppw.analysis.domain.dao.info;
+
+public final class InfoConstants {
+    public static final String FUND_INFO = "fundInfo";
+    public static final String COMPANY_INFO = "companyInfo";
+    public static final String MANAGER_INFO = "managerInfo";
+    private InfoConstants() {
+    }
+}

+ 20 - 0
src/main/java/com/smppw/analysis/domain/dao/info/InfoDao.java

@@ -0,0 +1,20 @@
+package com.smppw.analysis.domain.dao.info;
+
+import com.smppw.analysis.domain.dataobject.info.BaseInfoDO;
+
+import java.util.List;
+
+/**
+ * @author wangzaijun
+ * @date 2023/8/11 18:52
+ * @description 基本信息业务逻辑处理
+ */
+public interface InfoDao<R extends BaseInfoDO> {
+    /**
+     * 获取多个同类型标的的基本信息
+     *
+     * @param secIds 标的id集合
+     * @return /
+     */
+    List<R> list(List<String> secIds);
+}

+ 23 - 0
src/main/java/com/smppw/analysis/domain/dao/info/InfoFactory.java

@@ -0,0 +1,23 @@
+package com.smppw.analysis.domain.dao.info;
+
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.map.MapUtil;
+import com.smppw.analysis.domain.dataobject.info.BaseInfoDO;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+public class InfoFactory {
+    private static final InfoDao<? extends BaseInfoDO> DEFAULT = (InfoDao<BaseInfoDO>) secIds -> ListUtil.empty();
+    private static final Map<String, InfoDao<? extends BaseInfoDO>> INFO_DAP_MAP = MapUtil.newHashMap(8);
+
+    public InfoFactory(Map<String, InfoDao<? extends BaseInfoDO>> component) {
+        INFO_DAP_MAP.putAll(component);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <R extends BaseInfoDO> InfoDao<R> getInstance(String key) {
+        return (InfoDao<R>) INFO_DAP_MAP.getOrDefault(key, DEFAULT);
+    }
+}

+ 0 - 4
src/main/java/com/smppw/analysis/domain/dao/info/package-info.java

@@ -1,4 +0,0 @@
-package com.smppw.analysis.domain.dao.info;
-/*
-基本信息获取策略策略,区分所有标的
- */

+ 6 - 6
src/main/java/com/smppw/analysis/domain/dao/nav/CompanyNavDao.java

@@ -2,8 +2,8 @@ package com.smppw.analysis.domain.dao.nav;
 
 import com.smppw.analysis.domain.dataobject.nav.CompanyFittedCurveDo;
 import com.smppw.analysis.domain.dataobject.nav.CompanyFittedCurveWeeklyDo;
-import com.smppw.analysis.domain.mapper.core.CompanyFittedCurveDoMapper;
-import com.smppw.analysis.domain.mapper.core.CompanyFittedCurveWeeklyDoMapper;
+import com.smppw.analysis.domain.mapper.core.CompanyFittedCurveMapper;
+import com.smppw.analysis.domain.mapper.core.CompanyFittedCurveWeeklyMapper;
 import com.smppw.common.cache.CaffeineLocalCache;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.Frequency;
@@ -21,9 +21,9 @@ import java.util.Map;
 @Component(NavConstants.COMPANY_NAV)
 public class CompanyNavDao extends AbstractNavDao<CompanyFittedCurveDo> {
     @Autowired
-    private CompanyFittedCurveDoMapper companyFittedCurveDoMapper;
+    private CompanyFittedCurveMapper companyFittedCurveMapper;
     @Autowired
-    private CompanyFittedCurveWeeklyDoMapper companyFittedCurveWeeklyDoMapper;
+    private CompanyFittedCurveWeeklyMapper companyFittedCurveWeeklyMapper;
 
     @Override
     protected List<CompanyFittedCurveDo> listSecNav(List<String> secIds, Integer curveTypeId, Integer strategyId, Map<String, Frequency> secFrequencyMap) {
@@ -52,7 +52,7 @@ public class CompanyNavDao extends AbstractNavDao<CompanyFittedCurveDo> {
             if (StringUtils.isNotEmpty(startDate) && startDate.length() >= 7) {
                 startDateMonth = startDate.substring(0, 7);
             }
-            List<CompanyFittedCurveDo> navDoList = companyFittedCurveDoMapper.listNavByTimeInterval(monthSecIdList, startDateMonth, endDate, curveTypeId, strategyId, needUpdateAndCreateTime);
+            List<CompanyFittedCurveDo> navDoList = companyFittedCurveMapper.listNavByTimeInterval(monthSecIdList, startDateMonth, endDate, curveTypeId, strategyId, needUpdateAndCreateTime);
             Map<String, List<NavDto>> secMonthNavDtoMap = monthNavDoListToNavDtoMap(navDoList);
             secNavDtoMap.putAll(secMonthNavDtoMap);
         }
@@ -67,7 +67,7 @@ public class CompanyNavDao extends AbstractNavDao<CompanyFittedCurveDo> {
                 endYearWeek = CaffeineLocalCache.getYearWeekByDate(endDate);
             }
 
-            List<CompanyFittedCurveWeeklyDo> navDoList = companyFittedCurveWeeklyDoMapper.listNavByTimeInterval(weekSecIdList, startYearWeek, endYearWeek, curveTypeId, strategyId, needUpdateAndCreateTime);
+            List<CompanyFittedCurveWeeklyDo> navDoList = companyFittedCurveWeeklyMapper.listNavByTimeInterval(weekSecIdList, startYearWeek, endYearWeek, curveTypeId, strategyId, needUpdateAndCreateTime);
             Map<String, List<NavDto>> secWeekNavDtoMap = weekNavDoListToNavDtoMap(navDoList);
             secNavDtoMap.putAll(secWeekNavDtoMap);
         }

+ 4 - 4
src/main/java/com/smppw/analysis/domain/dao/nav/ManagerNavDao.java

@@ -3,8 +3,8 @@ package com.smppw.analysis.domain.dao.nav;
 
 import com.smppw.analysis.domain.dataobject.nav.FundManagerFittedCurveDo;
 import com.smppw.analysis.domain.dataobject.nav.FundManagerFittedCurveWeeklyDo;
-import com.smppw.analysis.domain.mapper.core.FundManagerFittedCurveDoMapper;
-import com.smppw.analysis.domain.mapper.core.FundManagerFittedCurveWeeklyDoMapper;
+import com.smppw.analysis.domain.mapper.core.FundManagerFittedCurveMapper;
+import com.smppw.analysis.domain.mapper.core.FundManagerFittedCurveWeeklyMapper;
 import com.smppw.common.cache.CaffeineLocalCache;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.Frequency;
@@ -22,9 +22,9 @@ import java.util.Map;
 @Component(NavConstants.MANAGER_NAV)
 public class ManagerNavDao extends AbstractNavDao<FundManagerFittedCurveDo> {
     @Autowired
-    private FundManagerFittedCurveDoMapper fundManagerFittedCurveSlave1Mapper;
+    private FundManagerFittedCurveMapper fundManagerFittedCurveSlave1Mapper;
     @Autowired
-    private FundManagerFittedCurveWeeklyDoMapper fundManagerFittedCurveWeeklySlave1Mapper;
+    private FundManagerFittedCurveWeeklyMapper fundManagerFittedCurveWeeklySlave1Mapper;
 
     @Override
     protected List<FundManagerFittedCurveDo> listSecNav(List<String> secIds, Integer curveTypeId, Integer strategyId, Map<String, Frequency> secFrequencyMap) {

+ 5 - 5
src/main/java/com/smppw/analysis/domain/dao/nav/MarketIndexDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao.nav;
 
 import com.smppw.analysis.domain.dataobject.nav.MarketIndexesDo;
-import com.smppw.analysis.domain.mapper.core.MarketIndexesDoMapper;
+import com.smppw.analysis.domain.mapper.core.MarketIndexesMapper;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.Frequency;
 import com.smppw.constants.DateConst;
@@ -15,10 +15,10 @@ import java.util.Map;
 
 @Component(NavConstants.MARKET_INDEX_NAV)
 public class MarketIndexDao extends AbstractNavDao<MarketIndexesDo> {
-    private final MarketIndexesDoMapper marketIndexesDoMapper;
+    private final MarketIndexesMapper marketIndexesMapper;
 
-    public MarketIndexDao(MarketIndexesDoMapper marketIndexesDoMapper) {
-        this.marketIndexesDoMapper = marketIndexesDoMapper;
+    public MarketIndexDao(MarketIndexesMapper marketIndexesMapper) {
+        this.marketIndexesMapper = marketIndexesMapper;
     }
 
     @Override
@@ -29,7 +29,7 @@ public class MarketIndexDao extends AbstractNavDao<MarketIndexesDo> {
 
     @Deprecated
     public Map<String, List<NavDto>> getNav(List<String> indexIdList, String startDate, String endDate, boolean needUpdateAndCreateTime) {
-        List<MarketIndexesDo> navDoList = marketIndexesDoMapper.listNavByTimeInterval(indexIdList, startDate, endDate, needUpdateAndCreateTime);
+        List<MarketIndexesDo> navDoList = marketIndexesMapper.listNavByTimeInterval(indexIdList, startDate, endDate, needUpdateAndCreateTime);
         return navDoListToNavDtoMap(navDoList);
     }
 

+ 7 - 7
src/main/java/com/smppw/analysis/domain/dao/nav/PrivatelyOfferedFundNavDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao.nav;
 
 import com.smppw.analysis.domain.dataobject.nav.NavDo;
-import com.smppw.analysis.domain.mapper.core.NavDoMapper;
+import com.smppw.analysis.domain.mapper.core.NavMapper;
 import com.smppw.analysis.infrastructure.consts.NavConst;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.Frequency;
@@ -14,15 +14,15 @@ import java.util.*;
 
 @Component(NavConstants.PRIVATELY_FUND_NAV)
 public class PrivatelyOfferedFundNavDao extends AbstractNavDao<NavDo> {
-    private final NavDoMapper navDoMapper;
+    private final NavMapper navMapper;
 
-    public PrivatelyOfferedFundNavDao(NavDoMapper navDoMapper) {
-        this.navDoMapper = navDoMapper;
+    public PrivatelyOfferedFundNavDao(NavMapper navMapper) {
+        this.navMapper = navMapper;
     }
 
     @Override
     protected List<NavDo> listSecNav(List<String> secIds, Integer curveTypeId, Integer strategyId, Map<String, Frequency> secFrequencyMap) {
-        return this.navDoMapper.listNav(secIds);
+        return this.navMapper.listNav(secIds);
     }
 
     @Deprecated
@@ -38,7 +38,7 @@ public class PrivatelyOfferedFundNavDao extends AbstractNavDao<NavDo> {
         } else if (NavType.All == navType) {
             navFieldSql = NavConst.CUMULATIVE_NAV_SQL_FIELD + "," + NavConst.NAV_SQL_FIELD + "," + NavConst.CUMULATIVE_NAV_WITHDRAWAL_SQL_FIELD;
         }
-        navDoList = navDoMapper.listNavByTimeInterval(fundIdList, startDate, endDate, navFieldSql, needUpdateAndCreateTime);
+        navDoList = navMapper.listNavByTimeInterval(fundIdList, startDate, endDate, navFieldSql, needUpdateAndCreateTime);
         Map<String, List<NavDto>> fundIdNavDtoListMap = navDoListToNavDtoMap(navDoList);
         return fundIdNavDtoListMap;
     }
@@ -93,7 +93,7 @@ public class PrivatelyOfferedFundNavDao extends AbstractNavDao<NavDo> {
      * @return 基金id列表
      */
     public List<NavDo> selectFundIdByStartTime(Date startTime) {
-        return navDoMapper.selectFundIdByStartTime(startTime);
+        return navMapper.selectFundIdByStartTime(startTime);
     }
 
 }

+ 6 - 6
src/main/java/com/smppw/analysis/domain/dao/nav/PubliclyOfferedFundNavDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao.nav;
 
 import com.smppw.analysis.domain.dataobject.nav.PublicNavDo;
-import com.smppw.analysis.domain.mapper.core.PublicNavDoMapper;
+import com.smppw.analysis.domain.mapper.core.PublicNavMapper;
 import com.smppw.analysis.infrastructure.consts.NavConst;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.Frequency;
@@ -17,10 +17,10 @@ import java.util.Map;
 
 @Component(NavConstants.PUBLICLY_FUND_NAV)
 public class PubliclyOfferedFundNavDao extends AbstractNavDao<PublicNavDo> {
-    private final PublicNavDoMapper publicNavDoMapper;
+    private final PublicNavMapper publicNavMapper;
 
-    public PubliclyOfferedFundNavDao(PublicNavDoMapper publicNavDoMapper) {
-        this.publicNavDoMapper = publicNavDoMapper;
+    public PubliclyOfferedFundNavDao(PublicNavMapper publicNavMapper) {
+        this.publicNavMapper = publicNavMapper;
     }
 
     @Deprecated
@@ -62,7 +62,7 @@ public class PubliclyOfferedFundNavDao extends AbstractNavDao<PublicNavDo> {
 
     @Override
     protected List<PublicNavDo> listSecNav(List<String> secIds, Integer curveTypeId, Integer strategyId, Map<String, Frequency> secFrequencyMap) {
-        return this.publicNavDoMapper.listNav(secIds);
+        return this.publicNavMapper.listNav(secIds);
     }
 
     @Deprecated
@@ -78,7 +78,7 @@ public class PubliclyOfferedFundNavDao extends AbstractNavDao<PublicNavDo> {
         } else if (NavType.All == navType) {
             navFieldSql = NavConst.CUMULATIVE_NAV_SQL_FIELD + "," + NavConst.NAV_SQL_FIELD + "," + NavConst.CUMULATIVE_NAV_WITHDRAWAL_SQL_FIELD;
         }
-        navDoList = publicNavDoMapper.listNavByTimeInterval(fundIdList, startDate, endDate, navFieldSql, needUpdateAndCreateTime);
+        navDoList = publicNavMapper.listNavByTimeInterval(fundIdList, startDate, endDate, navFieldSql, needUpdateAndCreateTime);
         Map<String, List<NavDto>> fundIdNavDtoListMap = convertToMap(navDoList);
         return fundIdNavDtoListMap;
     }

+ 3 - 3
src/main/java/com/smppw/analysis/domain/dao/nav/RiskOfFreeNavDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao.nav;
 
 import com.smppw.analysis.domain.dataobject.nav.DepositNavDo;
-import com.smppw.analysis.domain.mapper.core.DepositNavDoMapper;
+import com.smppw.analysis.domain.mapper.core.DepositNavMapper;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.Frequency;
 import com.smppw.constants.DateConst;
@@ -15,9 +15,9 @@ import java.util.Map;
 
 @Component(NavConstants.RISK_INDEX_NAV)
 public class RiskOfFreeNavDao extends AbstractNavDao<DepositNavDo> {
-    private final DepositNavDoMapper depositNavMasterMapper;
+    private final DepositNavMapper depositNavMasterMapper;
 
-    public RiskOfFreeNavDao(DepositNavDoMapper depositNavMasterMapper) {
+    public RiskOfFreeNavDao(DepositNavMapper depositNavMasterMapper) {
         this.depositNavMasterMapper = depositNavMasterMapper;
     }
 

+ 6 - 6
src/main/java/com/smppw/analysis/domain/dao/nav/RongzhiIndexNavDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao.nav;
 
 import com.smppw.analysis.domain.dataobject.nav.IndexesRzIndexDo;
-import com.smppw.analysis.domain.mapper.core.IndexesRzIndexDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesRzIndexMapper;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.Frequency;
 import com.smppw.constants.DateConst;
@@ -12,10 +12,10 @@ import java.util.*;
 
 @Component(NavConstants.PPW_INDEX_NAV)
 public class RongzhiIndexNavDao extends AbstractNavDao<IndexesRzIndexDo> {
-    private final IndexesRzIndexDoMapper indexesRzIndexDoMapper;
+    private final IndexesRzIndexMapper indexesRzIndexMapper;
 
-    public RongzhiIndexNavDao(IndexesRzIndexDoMapper indexesRzIndexDoMapper) {
-        this.indexesRzIndexDoMapper = indexesRzIndexDoMapper;
+    public RongzhiIndexNavDao(IndexesRzIndexMapper indexesRzIndexMapper) {
+        this.indexesRzIndexMapper = indexesRzIndexMapper;
     }
 
     @Override
@@ -30,13 +30,13 @@ public class RongzhiIndexNavDao extends AbstractNavDao<IndexesRzIndexDo> {
      * @deprecated 这个方法从净值获取里面移除
      */
     public Boolean isExist(String indexId) {
-        Integer exist = this.indexesRzIndexDoMapper.isExist(indexId);
+        Integer exist = this.indexesRzIndexMapper.isExist(indexId);
         return Objects.equals(1, exist);
     }
 
     @Deprecated
     public Map<String, List<NavDto>> getNav(List<String> indexIdList, String startDate, String endDate, boolean needUpdateAndCreateTime) {
-        List<IndexesRzIndexDo> navDoList = indexesRzIndexDoMapper.listNavByTimeInterval(indexIdList, startDate, endDate, needUpdateAndCreateTime);
+        List<IndexesRzIndexDo> navDoList = indexesRzIndexMapper.listNavByTimeInterval(indexIdList, startDate, endDate, needUpdateAndCreateTime);
         return navDoListToNavDtoMap(navDoList);
     }
 

+ 7 - 7
src/main/java/com/smppw/analysis/domain/manager/position/bond/BondPositionService.java

@@ -11,7 +11,7 @@ import com.smppw.analysis.domain.dto.position.bond.*;
 import com.smppw.analysis.domain.dto.position.stock.ConcentrationVO;
 import com.smppw.analysis.domain.dao.PubliclyFundPositionDao;
 import com.smppw.analysis.domain.dataobject.*;
-import com.smppw.analysis.domain.mapper.core.BondBasicInformationDOMapper;
+import com.smppw.analysis.domain.mapper.core.BondBasicInformationMapper;
 import com.smppw.analysis.infrastructure.utils.BinarySearchUtil;
 import com.smppw.common.pojo.ValueLabelVO;
 import com.smppw.utils.BigDecimalUtils;
@@ -132,12 +132,12 @@ public class BondPositionService {
     @Autowired
     private PubliclyFundPositionDao publiclyFundPositionDao;
     @Autowired
-    private BondBasicInformationDOMapper bondBasicInformationDOMapper;
+    private BondBasicInformationMapper bondBasicInformationMapper;
     @Autowired
     private ConcentrationBizBondHandler concentrationBizBondHandler;
 
     public Map<String, Object> getBondSortAllocation(BondSortAllocationParam param) {
-        List<BondBasicInformationDO> bondBasicInformationDOS = bondBasicInformationDOMapper.selectAllMappings();
+        List<BondBasicInformationDO> bondBasicInformationDOS = bondBasicInformationMapper.selectAllMappings();
         Map<String, Integer> collect = bondBasicInformationDOS.stream().collect(Collectors.toMap(BondBasicInformationDO::getSecId, BondBasicInformationDO::getBondNature, (p1, p2) -> p2));
         List<BondSortAssetDTO> list = CollectionUtil.newArrayList();
         List<FundPositionBaseInfoDO> fundPositionBaseInfoDOS = this.publiclyFundPositionDao.fundPositionBaseInfos(param.getFundId(),
@@ -271,14 +271,14 @@ public class BondPositionService {
         }
         Map<String, BondBasicInformationDO> collect = MapUtil.newHashMap();
         if (CollectionUtil.isNotEmpty(bondIdSet)) {
-            List<BondBasicInformationDO> bondBasicInformationDOS = bondBasicInformationDOMapper.queryBondBasicInfo(CollectionUtil.newArrayList(bondIdSet));
+            List<BondBasicInformationDO> bondBasicInformationDOS = bondBasicInformationMapper.queryBondBasicInfo(CollectionUtil.newArrayList(bondIdSet));
             collect = bondBasicInformationDOS.stream()
                     .collect(Collectors.toMap(BondBasicInformationDO::getSecId, p -> p, (p1, p2) -> p2));
         }
 
         Map<String, BondIndustryInfo> industryInfoMap = MapUtil.newHashMap();
         if (CollectionUtil.isNotEmpty(bondIdSet)) {
-            List<BondIndustryInfo> bondIndustryInfos = bondBasicInformationDOMapper.queryBondIndustry(CollectionUtil.newArrayList(bondIdSet));
+            List<BondIndustryInfo> bondIndustryInfos = bondBasicInformationMapper.queryBondIndustry(CollectionUtil.newArrayList(bondIdSet));
             if (CollectionUtil.isNotEmpty(bondIndustryInfos)) {
                 industryInfoMap = bondIndustryInfos.stream().collect(Collectors.toMap(BondIndustryInfo::getSecId, p -> p, (p1, p2) -> p2));
             }
@@ -398,7 +398,7 @@ public class BondPositionService {
         }
         Map<String, List<BondCreditGradingInfo>> collect = MapUtil.newHashMap();
         if (CollectionUtil.isNotEmpty(bondIdSet)) {
-            List<BondCreditGradingInfo> bondCreditGradingInfos = bondBasicInformationDOMapper.queryCreditGradingByBondId(CollectionUtil.newArrayList(bondIdSet));
+            List<BondCreditGradingInfo> bondCreditGradingInfos = bondBasicInformationMapper.queryCreditGradingByBondId(CollectionUtil.newArrayList(bondIdSet));
             if (CollectionUtil.isNotEmpty(bondCreditGradingInfos)) {
                 collect = bondCreditGradingInfos.stream().collect(Collectors.groupingBy(BondCreditGradingInfo::getSecId));
             }
@@ -408,7 +408,7 @@ public class BondPositionService {
         }
         Map<String, BondIndustryInfo> industryInfoMap = MapUtil.newHashMap();
         if (CollectionUtil.isNotEmpty(bondIdSet)) {
-            List<BondIndustryInfo> bondIndustryInfos = bondBasicInformationDOMapper.queryBondIndustry(CollectionUtil.newArrayList(bondIdSet));
+            List<BondIndustryInfo> bondIndustryInfos = bondBasicInformationMapper.queryBondIndustry(CollectionUtil.newArrayList(bondIdSet));
             if (CollectionUtil.isNotEmpty(bondIndustryInfos)) {
                 industryInfoMap = bondIndustryInfos.stream().collect(Collectors.toMap(BondIndustryInfo::getSecId, p -> p, (p1, p2) -> p2));
             }

+ 5 - 5
src/main/java/com/smppw/analysis/domain/manager/position/future/MarginalRiskContributionBizHandler.java

@@ -22,7 +22,7 @@ import com.smppw.analysis.domain.gateway.CacheFactory;
 import com.smppw.analysis.infrastructure.config.AnalysisProperty;
 import com.smppw.analysis.infrastructure.exception.APIException;
 import com.smppw.analysis.domain.mapper.core.BaseUnderlyingMapper;
-import com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesTradeDateMapper;
 import com.smppw.common.pojo.FundFuturesOption;
 import com.smppw.common.pojo.ValueLabelVO;
 import com.smppw.utils.BigDecimalUtils;
@@ -43,14 +43,14 @@ import java.util.stream.Collectors;
 @Component(BizHandlerConstants.MARGINAL_RISK_CONTRIBUTION)
 public class MarginalRiskContributionBizHandler extends AbstractBizHandler<MarginalRiskContributionParams, List<MarginalRiskContributionVO>> {
     private final BaseUnderlyingMapper baseUnderlyingMapper;
-    private final IndexesTradeDateDoMapper indexesTradeDateDoMapper;
+    private final IndexesTradeDateMapper indexesTradeDateMapper;
 
     public MarginalRiskContributionBizHandler(AnalysisProperty property, CacheFactory cacheFactory,
                                               BaseUnderlyingMapper baseUnderlyingMapper,
-                                              PositionLoadFactory factory, IndexesTradeDateDoMapper indexesTradeDateDoMapper) {
+                                              PositionLoadFactory factory, IndexesTradeDateMapper indexesTradeDateMapper) {
         super(property, cacheFactory, factory);
         this.baseUnderlyingMapper = baseUnderlyingMapper;
-        this.indexesTradeDateDoMapper = indexesTradeDateDoMapper;
+        this.indexesTradeDateMapper = indexesTradeDateMapper;
     }
 
     @Override
@@ -110,7 +110,7 @@ public class MarginalRiskContributionBizHandler extends AbstractBizHandler<Margi
 
     private List<String> getRetDates(String k) {
         String startDate = DateUtil.formatDate(DateUtil.offsetDay(DateUtil.parseDate(k), -90));
-        return this.indexesTradeDateDoMapper.listTradeDates(startDate, k).stream()
+        return this.indexesTradeDateMapper.listTradeDates(startDate, k).stream()
                 .sorted(Comparator.reverseOrder()).limit(31).sorted().collect(Collectors.toList());
     }
 

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/BondBasicInformationDOMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @description
  */
 @Mapper
-public interface BondBasicInformationDOMapper {
+public interface BondBasicInformationMapper {
     List<BondBasicInformationDO> selectAllMappings();
 
     List<BondBasicInformationDO> queryBondBasicInfo(@Param("idList") List<String> bondIdSet);

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/CompanyFittedCurveDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface CompanyFittedCurveDoMapper {
+public interface CompanyFittedCurveMapper {
     List<CompanyFittedCurveDo> listNavByTimeInterval(@Param("companyIdList") List<String> companyIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,
                                                      @Param("curveType") Integer curveType, @Param("strategy") Integer strategy, @Param("needUpdateAndCreateTime") boolean needUpdateAndCreateTime);
 

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/CompanyFittedCurveWeeklyDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface CompanyFittedCurveWeeklyDoMapper {
+public interface CompanyFittedCurveWeeklyMapper {
 
     List<CompanyFittedCurveWeeklyDo> listNavByTimeInterval(@Param("companyIdList") List<String> companyIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,
                                                            @Param("curveType") Integer curveType, @Param("strategy") Integer strategy, @Param("needUpdateAndCreateTime") boolean needUpdateAndCreateTime);

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/CompanyInformationDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface CompanyInformationDoMapper {
+public interface CompanyInformationMapper {
     /**
      * 批量获取机构的基本信息
      *

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/DepositNavDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface DepositNavDoMapper {
+public interface DepositNavMapper {
     List<String> listRiskOfFreeId();
 
     List<DepositNavDo> listNavByTimeInterval(@Param("indexIdList") List<String> indexIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/FundFrequencyDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface FundFrequencyDoMapper {
+public interface FundFrequencyMapper {
     String getNavFrequencyByFundId(@Param("secId") String secId);
 
     List<FundFrequencyDo> getNavFrequencyByFundIdList(@Param("secIdList") List<String> secIdList);

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/FundInformationDoMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 @Repository
-public interface FundInformationDoMapper {
+public interface FundInformationMapper {
     List<FundInfoDO> queryFundInfoList(List<String> fundIds);
 
     List<FundInformationDo> listFundInfo(@Param("fundIdList") List<String> fundIdList);

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/FundManagerFittedCurveDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface FundManagerFittedCurveDoMapper {
+public interface FundManagerFittedCurveMapper {
 
     List<FundManagerFittedCurveDo> listNavByTimeInterval(@Param("companyIdList") List<String> companyIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,
                                                          @Param("curveType") Integer curveType, @Param("strategy") Integer strategy, @Param("needUpdateAndCreateTime") boolean needUpdateAndCreateTime);

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/FundManagerFittedCurveWeeklyDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface FundManagerFittedCurveWeeklyDoMapper {
+public interface FundManagerFittedCurveWeeklyMapper {
 
     List<FundManagerFittedCurveWeeklyDo> listNavByTimeInterval(@Param("companyIdList") List<String> companyIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,
                                                                @Param("curveType") Integer curveType, @Param("strategy") Integer strategy, @Param("needUpdateAndCreateTime") boolean needUpdateAndCreateTime);

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/IndexesProfileDoMapper.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface IndexesProfileDoMapper {
+public interface IndexesProfileMapper {
 
     List<String> listThirdIndexes();
 

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/IndexesRzIndexDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface IndexesRzIndexDoMapper {
+public interface IndexesRzIndexMapper {
 
     List<IndexesRzIndexDo> listNavByTimeInterval(@Param("indexIdList") List<String> indexIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,
                                                  @Param("needUpdateAndCreateTime") boolean needUpdateAndCreateTime);

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/IndexesTradeDateDoMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @date 2023-04-24
  */
 @Mapper
-public interface IndexesTradeDateDoMapper {
+public interface IndexesTradeDateMapper {
     /**
      * 获取最近的交日期,往前找
      *

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/MarketIndexesDoMapper.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface MarketIndexesDoMapper {
+public interface MarketIndexesMapper {
 
     List<MarketIndexesDo> listNavByTimeInterval(@Param("indexIdList") List<String> indexIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,
                                                 @Param("needUpdateAndCreateTime") boolean needUpdateAndCreateTime);

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/NavDoMapper.java

@@ -8,7 +8,7 @@ import java.util.Date;
 import java.util.List;
 
 @Repository
-public interface NavDoMapper {
+public interface NavMapper {
     List<NavDo> listNav(@Param("fundIds") List<String> fundIds);
 
     List<NavDo> listNavByTimeInterval(@Param("fundIdList") List<String> fundIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,

+ 1 - 1
src/main/java/com/smppw/analysis/domain/mapper/core/PublicNavDoMapper.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface PublicNavDoMapper {
+public interface PublicNavMapper {
     List<PublicNavDo> listNav(@Param("fundIds") List<String> fundIds);
 
     List<PublicNavDo> listNavByTimeInterval(@Param("fundIdList") List<String> fundIdList, @Param("startDate") String startDate, @Param("endDate") String endDate,

+ 3 - 3
src/main/java/com/smppw/analysis/infrastructure/task/NonTradingDayTask.java

@@ -1,6 +1,6 @@
 package com.smppw.analysis.infrastructure.task;
 
-import com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesTradeDateMapper;
 import com.smppw.common.cache.CaffeineLocalCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,7 +16,7 @@ public class NonTradingDayTask {
     private static final Logger logger = LoggerFactory.getLogger(NonTradingDayTask.class);
 
     @Autowired
-    private IndexesTradeDateDoMapper indexesTradeDateDoMapper;
+    private IndexesTradeDateMapper indexesTradeDateMapper;
 
     /**
      * 将非交易日日期放入本地缓存,启动后十秒,及之后每24小时执行一次
@@ -25,7 +25,7 @@ public class NonTradingDayTask {
     @Scheduled(initialDelay = 10000, fixedRate = 24 * 3600 * 1000)
     public void cacheNonTradingDays() {
         logger.info("start cacheNonTradingDays");
-        List<String> allHolidayDays = indexesTradeDateDoMapper.listHolidays();
+        List<String> allHolidayDays = indexesTradeDateMapper.listHolidays();
 
         CaffeineLocalCache.addNonTradingDay(allHolidayDays);
         logger.info("finish cacheNonTradingDays");

+ 2 - 2
src/main/java/com/smppw/analysis/infrastructure/task/RiskOfFreeIdTask.java

@@ -1,6 +1,6 @@
 package com.smppw.analysis.infrastructure.task;
 
-import com.smppw.analysis.domain.mapper.core.DepositNavDoMapper;
+import com.smppw.analysis.domain.mapper.core.DepositNavMapper;
 import com.smppw.common.cache.CaffeineLocalCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -11,7 +11,7 @@ import java.util.List;
 @Component
 public class RiskOfFreeIdTask {
     @Autowired
-    private DepositNavDoMapper depositNavMasterMapper;
+    private DepositNavMapper depositNavMasterMapper;
 
     @Scheduled(initialDelay = 800, fixedRate = 24 * 3600 * 1000)
     private void refreshDate() {

+ 3 - 3
src/main/java/com/smppw/analysis/infrastructure/task/TrendDateTask.java

@@ -1,6 +1,6 @@
 package com.smppw.analysis.infrastructure.task;
 
-import com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesTradeDateMapper;
 import com.smppw.common.cache.CaffeineLocalCache;
 import com.smppw.common.pojo.IndexesTradeDateDo;
 import org.slf4j.Logger;
@@ -19,13 +19,13 @@ public class TrendDateTask {
     private final static Logger logger = LoggerFactory.getLogger(TrendDateTask.class);
 
     @Autowired
-    private IndexesTradeDateDoMapper indexesTradeDateDoMapper;
+    private IndexesTradeDateMapper indexesTradeDateMapper;
 
     //刷期对应的年周, 月周 进缓存
     @Scheduled(initialDelay = 1000, fixedRate = 24 * 3600 * 1000)
     public void refreshData() {
         long start = System.currentTimeMillis();
-        List<IndexesTradeDateDo> indexesTradeDateDoList = indexesTradeDateDoMapper.listNatureDays();
+        List<IndexesTradeDateDo> indexesTradeDateDoList = indexesTradeDateMapper.listNatureDays();
         refreshYearWeekAndWeekOfMonth(indexesTradeDateDoList);
         refreshYearMonth(indexesTradeDateDoList);
         long end = System.currentTimeMillis();

+ 1 - 1
src/main/resources/mapping/core/BondBasicInformationDOMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.BondBasicInformationDOMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.BondBasicInformationMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.BondBasicInformationDO">
     <!--@mbg.generated-->
     <!--@Table bond_basic_information-->

+ 1 - 1
src/main/resources/mapping/core/CompanyFittedCurveDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.CompanyFittedCurveDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.CompanyFittedCurveMapper">
     <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.CompanyFittedCurveDo">
         <!--@mbg.generated-->
         <!--@Table company_fitted_curve-->

+ 1 - 1
src/main/resources/mapping/core/CompanyFittedCurveWeeklyDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.CompanyFittedCurveWeeklyDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.CompanyFittedCurveWeeklyMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.CompanyFittedCurveWeeklyDo">
     <!--@mbg.generated-->
     <!--@Table company_fitted_curve_weekly-->

+ 1 - 1
src/main/resources/mapping/core/CompanyInformationDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.CompanyInformationDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.CompanyInformationMapper">
     <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.CompanyInformationDo">
         <!--@mbg.generated-->
         <!--@Table company_information-->

+ 1 - 1
src/main/resources/mapping/core/DepositNavDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.DepositNavDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.DepositNavMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.DepositNavDo">
     <!--@mbg.generated-->
     <!--@Table deposit_nav-->

+ 1 - 1
src/main/resources/mapping/core/FundFrequencyDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.FundFrequencyDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.FundFrequencyMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.FundFrequencyDo">
     <!--@mbg.generated-->
     <!--@Table fund_frequency-->

+ 1 - 1
src/main/resources/mapping/core/FundInformationDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.FundInformationDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.FundInformationMapper">
     <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.FundInformationDo">
         <!--@mbg.generated-->
         <!--@Table fund_information-->

+ 1 - 1
src/main/resources/mapping/core/FundManagerFittedCurveDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.FundManagerFittedCurveDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.FundManagerFittedCurveMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.FundManagerFittedCurveDo">
     <!--@mbg.generated-->
     <!--@Table fund_manager_fitted_curve-->

+ 1 - 1
src/main/resources/mapping/core/FundManagerFittedCurveWeeklyDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.FundManagerFittedCurveWeeklyDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.FundManagerFittedCurveWeeklyMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.FundManagerFittedCurveWeeklyDo">
     <!--@mbg.generated-->
     <!--@Table fund_manager_fitted_curve_weekly-->

+ 1 - 1
src/main/resources/mapping/core/IndexesProfileDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesProfileDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesProfileMapper">
     <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.IndexesProfileDo">
         <!--@mbg.generated-->
         <!--@Table indexes_profile-->

+ 1 - 1
src/main/resources/mapping/core/IndexesRzIndexDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesRzIndexDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesRzIndexMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.IndexesRzIndexDo">
     <!--@mbg.generated-->
     <!--@Table indexes_rz_index-->

+ 1 - 1
src/main/resources/mapping/core/IndexesTradeDateDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesTradeDateMapper">
     <resultMap id="BaseResultMap" type="com.smppw.common.pojo.IndexesTradeDateDo">
         <!--@mbg.generated-->
         <!--@Table indexes_trade_date-->

+ 1 - 1
src/main/resources/mapping/core/MarketIndexesDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.MarketIndexesDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.MarketIndexesMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.MarketIndexesDo">
     <!--@mbg.generated-->
     <!--@Table market_indexes-->

+ 1 - 1
src/main/resources/mapping/core/NavDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.NavDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.NavMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.NavDo">
     <!--@mbg.generated-->
     <!--@Table nav-->

+ 1 - 1
src/main/resources/mapping/core/PublicNavDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.core.PublicNavDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.PublicNavMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.nav.PublicNavDo">
     <!--@mbg.generated-->
     <!--@Table public_nav-->