feat: 代码结构调整

service-base/src/main/java/com/simuwang/base/common/conts/NavParseStatusConst.java

@@ -28,8 +28,14 @@ public class NavParseStatusConst {
     public final static Integer ASSET_NET_NEGATIVE = 5;
 
     /**
-     * 振幅异常
+     * 当期（单位净值）与上期（单位净值）振幅大于等于20%
      */
     public final static Integer AMPLITUDE_EXCEPTION = 6;
 
+
+    /**
+     * 当期（单位净值）与上期（单位净值）振幅大于等于100%拦截
+     */
+    public final static Integer AMPLITUDE_ERROR = 7;
+
 }

service-base/src/main/java/com/simuwang/base/components/UserAuthService.java

@@ -4,9 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.simuwang.base.common.support.dos.OnlyIdNameDO;
-import com.simuwang.base.mapper.system.SysMenuMapper;
-import com.simuwang.base.mapper.system.SysRoleMapper;
-import com.simuwang.base.mapper.system.SysUserMapper;
+import com.simuwang.base.mapper.daq.system.SysMenuMapper;
+import com.simuwang.base.mapper.daq.system.SysRoleMapper;
+import com.simuwang.base.mapper.daq.system.SysUserMapper;
 import com.simuwang.base.pojo.dos.sys.SysMenuDO;
 import com.simuwang.base.pojo.dos.sys.SysRoleDO;
 import com.simuwang.base.pojo.dos.sys.SysUserDO;

service-base/src/main/java/com/simuwang/base/config/DataSourceAutoConfig.java

@@ -22,7 +22,7 @@ import org.springframework.transaction.support.TransactionTemplate;
 import javax.sql.DataSource;
 import java.util.List;
 
-@MapperScan(value = {"com.simuwang.base.mapper"}, sqlSessionFactoryRef = "sqlSessionFactory")
+@MapperScan(value = {"com.simuwang.base.mapper.daq"}, sqlSessionFactoryRef = "sqlSessionFactory")
 @Configuration
 public class DataSourceAutoConfig {
     static final String[] MAPPER_LOCATIONS = {"classpath*:mapper/**/*.xml"};

service-base/src/main/java/com/simuwang/base/mapper/AssetMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.AssetDO;
 import com.simuwang.base.pojo.vo.FundAssetVO;

service-base/src/main/java/com/simuwang/base/mapper/CompanyEmailConfigMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.CompanyEmailConfigDO;

service-base/src/main/java/com/simuwang/base/mapper/CompanyEmailSendHistoryMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.CompanyEmailSendHistoryDO;
 import com.simuwang.base.pojo.dto.query.CompanyEmailHistoryPageQuery;

service-base/src/main/java/com/simuwang/base/mapper/CompanyInformationMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

service-base/src/main/java/com/simuwang/base/mapper/DeletionInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.DeletionInfoDO;
 import com.simuwang.base.pojo.dos.EmailDeletionInfoDO;

service-base/src/main/java/com/simuwang/base/mapper/DistributionMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.common.enums.DistributeType;
 import com.simuwang.base.pojo.dos.DistributionDO;

service-base/src/main/java/com/simuwang/base/mapper/EmailFieldMappingMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailFieldMappingDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/EmailFileInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailFileInfoDO;
 import com.simuwang.base.pojo.dos.EmailParseDetailDO;

service-base/src/main/java/com/simuwang/base/mapper/EmailFundAssetMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailFundAssetDO;
 import com.simuwang.base.pojo.dos.EmailFundNavDO;

service-base/src/main/java/com/simuwang/base/mapper/EmailFundNavMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailFundNavDO;
 import com.simuwang.base.pojo.dos.EmailParseDetailDO;

service-base/src/main/java/com/simuwang/base/mapper/EmailParseInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailParseInfoDO;
 import com.simuwang.base.pojo.dto.EmailInfoDTO;

service-base/src/main/java/com/simuwang/base/mapper/EmailTaskInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailFileInfoDO;
 import com.simuwang.base.pojo.dos.EmailParseDetailDO;

service-base/src/main/java/com/simuwang/base/mapper/EmailTemplateApplicationRuleMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailTemplateApplicationRuleDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/EmailTemplateDataRuleMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailTemplateDataRuleDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/EmailTemplateInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailTemplateInfoDO;
 import com.simuwang.base.pojo.dto.query.EmailTemplateInfoPageQuery;

service-base/src/main/java/com/simuwang/base/mapper/EmailTemplateMappingMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailTemplateInfoDO;
 import com.simuwang.base.pojo.dos.EmailTemplateMappingDO;

service-base/src/main/java/com/simuwang/base/mapper/EmailTypeRuleMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.EmailTypeRuleDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/FundAliasMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.FundAliasDO;
 import com.simuwang.base.pojo.dto.query.FundAliasPageQuery;

service-base/src/main/java/com/simuwang/base/mapper/FundInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.FundAndCompanyInfoDO;
 import com.simuwang.base.pojo.dos.FundInfoDO;

service-base/src/main/java/com/simuwang/base/mapper/FundNavAssetMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.FundNavAssetDO;
 import com.simuwang.base.pojo.dto.query.FundNavAssetPageQuery;

service-base/src/main/java/com/simuwang/base/mapper/FundPositionDetailMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.FundPositionDetailDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/FundReportFrequencyMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.FundReportFrequencyDO;

service-base/src/main/java/com/simuwang/base/mapper/MailboxInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.MailboxInfoDO;

service-base/src/main/java/com/simuwang/base/mapper/NavMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.NavDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/PdfValuationRecordMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.PdfValuationRecordDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/TradeDateMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.TradeDateDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/ValuationMarketCodeMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import org.apache.ibatis.annotations.Mapper;
 

service-base/src/main/java/com/simuwang/base/mapper/ValuationTableAttributeMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.ValuationTableAttributeDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/ValuationTableMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper;
+package com.simuwang.base.mapper.daq;
 
 import com.simuwang.base.pojo.dos.ValuationTableDO;
 import org.apache.ibatis.annotations.Mapper;

service-base/src/main/java/com/simuwang/base/mapper/report/ReportAssetAllocationMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.report;
+package com.simuwang.base.mapper.daq.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.report.ReportAssetAllocationDO;

service-base/src/main/java/com/simuwang/base/mapper/report/ReportBaseInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.report;
+package com.simuwang.base.mapper.daq.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.report.ReportBaseInfoDO;

service-base/src/main/java/com/simuwang/base/mapper/report/ReportFinancialIndicatorMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.report;
+package com.simuwang.base.mapper.daq.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.report.ReportFinancialIndicatorsDO;

service-base/src/main/java/com/simuwang/base/mapper/report/ReportFundInfoMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.report;
+package com.simuwang.base.mapper.daq.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.report.ReportFundInfoDO;

service-base/src/main/java/com/simuwang/base/mapper/report/ReportInvestmentIndustryMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.report;
+package com.simuwang.base.mapper.daq.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.report.ReportInvestmentIndustryDO;

service-base/src/main/java/com/simuwang/base/mapper/report/ReportNetReportMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.report;
+package com.simuwang.base.mapper.daq.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.report.ReportNetReportDO;

service-base/src/main/java/com/simuwang/base/mapper/report/ReportShareChangeMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.report;
+package com.simuwang.base.mapper.daq.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.report.ReportShareChangeDO;

service-base/src/main/java/com/simuwang/base/mapper/system/SysConfigMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.system;
+package com.simuwang.base.mapper.daq.system;
 
 import com.simuwang.base.pojo.dos.SysConfigDO;
 import com.simuwang.base.pojo.dto.query.ConfigPageQuery;

service-base/src/main/java/com/simuwang/base/mapper/system/SysLogMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.system;
+package com.simuwang.base.mapper.daq.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.LoggingDO;

service-base/src/main/java/com/simuwang/base/mapper/system/SysMenuMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.system;
+package com.simuwang.base.mapper.daq.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.sys.SysMenuDO;

service-base/src/main/java/com/simuwang/base/mapper/system/SysRoleMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.system;
+package com.simuwang.base.mapper.daq.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.common.support.dos.OnlyIdNameDO;

service-base/src/main/java/com/simuwang/base/mapper/system/SysUserMapper.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.mapper.system;
+package com.simuwang.base.mapper.daq.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.common.support.dos.OnlyIdNameDO;

service-base/src/main/resources/mapper/daq/AssetMapper.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.simuwang.base.mapper.AssetMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.AssetMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.AssetDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>

service-base/src/main/resources/mapper/daq/CompanyEmailConfigMapper.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.simuwang.base.mapper.CompanyEmailConfigMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.CompanyEmailConfigMapper">
     <insert id="saveCompanyEmailConfig">
         insert into company_email_config(
         <if test="companyId != null and companyId != ''">company_id,</if>

service-base/src/main/resources/mapper/daq/CompanyEmailHistoryMapper.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.simuwang.base.mapper.CompanyEmailSendHistoryMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.CompanyEmailSendHistoryMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.CompanyEmailSendHistoryDO">
         <id column="id" property="id"/>
         <result column="company_id" property="companyId"/>

service-base/src/main/resources/mapper/daq/CompanyInformationMapper.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.simuwang.base.mapper.CompanyInformationMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.CompanyInformationMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.CompanyInformationDO">
         <id column="company_id" property="companyId"/>
         <result column="is_amac_show" property="isAmacShow"/>

service-base/src/main/resources/mapper/daq/DeletionInfoMapper.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.simuwang.base.mapper.DeletionInfoMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.DeletionInfoMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.DeletionInfoDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>

service-base/src/main/resources/mapper/daq/DistributionMapper.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.simuwang.base.mapper.DistributionMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.DistributionMapper">
     <resultMap id="BaseMap" type="com.simuwang.base.pojo.dos.DistributionDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>

service-base/src/main/resources/mapper/daq/EmailFieldMappingMapper.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.simuwang.base.mapper.EmailFieldMappingMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailFieldMappingMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailFieldMappingDO">
         <id column="id" property="id"/>
         <result column="code" property="code"/>

service-base/src/main/resources/mapper/daq/EmailFileInfoMapper.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.simuwang.base.mapper.EmailFileInfoMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailFileInfoMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailFileInfoDO">
         <id column="id" property="id"/>
         <result column="email_id" property="emailId"/>

service-base/src/main/resources/mapper/daq/EmailFundAssetMapper.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.simuwang.base.mapper.EmailFundAssetMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailFundAssetMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailFundAssetDO">
         <id column="id" property="id"/>
         <result column="file_id" property="fileId"/>

service-base/src/main/resources/mapper/daq/EmailFundNavMapper.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.simuwang.base.mapper.EmailFundNavMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailFundNavMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailFundNavDO">
         <id column="id" property="id"/>
         <result column="file_id" property="fileId"/>
@@ -241,7 +241,7 @@
                nav.updatetime,
                nav.createtime
         from email_fund_nav nav
-        where nav.isvalid =1 and nav.exception_status in (1,3)
+        where nav.isvalid =1 and nav.exception_status in (1,3,6,7)
         <if test="fundName != null and fundName != ''">
             and nav.fund_name=#{fundName}
         </if>
@@ -251,7 +251,7 @@
         order by nav.updatetime desc
     </select>
     <select id="getMaxPriceDate" resultType="java.lang.String" parameterType="java.lang.String">
-        select max(nav.price_date) from email_fund_nav nav where nav.isvalid =1 and nav.exception_status in (1,3)
+        select max(nav.price_date) from email_fund_nav nav where nav.isvalid =1 and nav.exception_status in (1,3,6)
                                                                         and nav.fund_name=#{fundName}
     </select>
     <resultMap id="BaseDetailMap" type="com.simuwang.base.pojo.dos.EmailParseDetailDO">
@@ -309,7 +309,7 @@
                nav.updatetime,
                nav.createtime
         from email_fund_nav nav
-        where nav.isvalid =1 and nav.exception_status=1
+        where nav.isvalid =1 and nav.exception_status in (1,6,7)
         and nav.fund_id = #{fundId}
     </select>
     <select id="countEmailNavTotal" resultType="java.lang.Long">

service-base/src/main/resources/mapper/daq/EmailParseInfoMapper.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.simuwang.base.mapper.EmailParseInfoMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailParseInfoMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailParseInfoDO">
         <id column="id" property="id"/>
         <result column="email" property="email"/>

service-base/src/main/resources/mapper/daq/EmailTaskInfoMapper.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.simuwang.base.mapper.EmailTaskInfoMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailTaskInfoMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailTaskInfoDO">
         <id column="id" property="id"/>
         <result column="email" property="email"/>

service-base/src/main/resources/mapper/daq/EmailTemplateApplicationRuleMapper.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.simuwang.base.mapper.EmailTemplateApplicationRuleMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailTemplateApplicationRuleMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailTemplateApplicationRuleDO">
         <id column="id" property="id"/>
         <result column="template_id" property="templateId"/>

service-base/src/main/resources/mapper/daq/EmailTemplateDataRuleMapper.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.simuwang.base.mapper.EmailTemplateDataRuleMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailTemplateDataRuleMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailTemplateDataRuleDO">
         <id column="id" property="id"/>
         <result column="template_id" property="templateId"/>

service-base/src/main/resources/mapper/daq/EmailTemplateInfoMapper.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.simuwang.base.mapper.EmailTemplateInfoMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailTemplateInfoMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailTemplateInfoDO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>

service-base/src/main/resources/mapper/daq/EmailTemplateMappingMapper.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.simuwang.base.mapper.EmailTemplateMappingMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailTemplateMappingMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailTemplateMappingDO">
         <id column="id" property="id"/>
         <result column="template_id" property="templateId"/>

service-base/src/main/resources/mapper/daq/EmailTypeRuleMapper.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.simuwang.base.mapper.EmailTypeRuleMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.EmailTypeRuleMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailTypeRuleDO">
         <id column="id" property="id"/>
         <result column="nav" property="nav"/>

service-base/src/main/resources/mapper/daq/FundAliasMapper.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.simuwang.base.mapper.FundAliasMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.FundAliasMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.FundAliasDO">
         <id column="id" property="id"/>
         <result column="source_fund_name" property="sourceFundName"/>

service-base/src/main/resources/mapper/daq/FundInfoMapper.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.simuwang.base.mapper.FundInfoMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.FundInfoMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.FundInfoDO">
         <id column="id" property="id"/>
         <result column="p_fund_id" property="pFundId"/>

service-base/src/main/resources/mapper/daq/FundNavAssetMapper.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.simuwang.base.mapper.FundNavAssetMapper">
+    <mapper namespace="com.simuwang.base.mapper.daq.FundNavAssetMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.FundNavAssetDO">
         <result column="fund_id" property="fundId"/>
         <result column="fund_short_name" property="fundName"/>

service-base/src/main/resources/mapper/daq/FundPositionDetailMapper.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.simuwang.base.mapper.FundPositionDetailMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.FundPositionDetailMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.FundPositionDetailDO">
         <id column="id" property="id"/>
         <result column="valuation_id" property="valuationId"/>

service-base/src/main/resources/mapper/daq/FundReportFrequencyMapper.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.simuwang.base.mapper.FundReportFrequencyMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.FundReportFrequencyMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.FundReportFrequencyDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>

service-base/src/main/resources/mapper/daq/MailBoxInfoMapper.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.simuwang.base.mapper.MailboxInfoMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.MailboxInfoMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.MailboxInfoDO">
         <id column="id" property="id"/>
         <result column="type" property="type"/>

service-base/src/main/resources/mapper/daq/NavMapper.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.simuwang.base.mapper.NavMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.NavMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.NavDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>

service-base/src/main/resources/mapper/daq/PdfValuationRecordMapper.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.simuwang.base.mapper.PdfValuationRecordMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.PdfValuationRecordMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.PdfValuationRecordDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>

service-base/src/main/resources/mapper/daq/TradeDateMapper.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.simuwang.base.mapper.TradeDateMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.TradeDateMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.TradeDateDO">
         <id column="id" property="id"/>
         <result column="trade_date" property="tradeDate"/>

service-base/src/main/resources/mapper/daq/ValuationMarketCodeMapper.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.simuwang.base.mapper.ValuationMarketCodeMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.ValuationMarketCodeMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.ValuationMarketCodeDO">
         <id column="id" property="id"/>
         <result column="market_code" property="marketCode"/>

service-base/src/main/resources/mapper/daq/ValuationTableAttributeMapper.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.simuwang.base.mapper.ValuationTableAttributeMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.ValuationTableAttributeMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.ValuationTableAttributeDO">
         <id column="id" property="id"/>
         <result column="valuation_id" property="valuationId"/>

service-base/src/main/resources/mapper/daq/ValuationTableMapper.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.simuwang.base.mapper.ValuationTableMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.ValuationTableMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.ValuationTableDO">
         <id column="id" property="id"/>
         <result column="file_id" property="fileId"/>

service-base/src/main/resources/mapper/daq/system/SysConfigMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.simuwang.base.mapper.system.SysConfigMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.system.SysConfigMapper">
     
     <resultMap type="com.simuwang.base.pojo.dos.SysConfigDO" id="SysConfigResult">
     	<id     property="configId"      column="config_id"      />

service-base/src/main/resources/mapper/daq/system/SysLogMapper.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.simuwang.base.mapper.system.SysLogMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.system.SysLogMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.LoggingDO">
         <id column="id" property="id"/>
         <result column="title" property="title"/>

service-base/src/main/resources/mapper/daq/system/SysRoleMapper.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.simuwang.base.mapper.system.SysRoleMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.system.SysRoleMapper">
     <select id="listAssignPerms" resultType="com.simuwang.base.common.support.dos.OnlyIdNameDO">
         select sm.menu_id    as id,
                sm.menu_name  as name

service-base/src/main/resources/mapper/daq/system/SysUserMapper.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.simuwang.base.mapper.system.SysUserMapper">
+<mapper namespace="com.simuwang.base.mapper.daq.system.SysUserMapper">
     <select id="listBindRoles" resultType="com.simuwang.base.common.support.dos.OnlyIdNameDO">
         select t.role_id    as id,
                t.role_name  as name

service-daq/src/main/java/com/simuwang/daq/components/report/parser/AbstractReportParser.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dos.EmailFieldMappingDO;
 import com.simuwang.base.pojo.dto.report.BaseReportDTO;
 import com.simuwang.base.pojo.dto.report.ReportBaseInfoDTO;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/excel/AbstractExcelReportParser.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.read.builder.ExcelReaderBuilder;
 import com.simuwang.base.common.exception.ReportParseException;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dto.report.*;
 import com.simuwang.daq.components.CustomExcelMultiSheetListener;
 import com.simuwang.daq.components.ReportParseUtils;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/excel/ExcelAnnuallyReportParser.java

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.simuwang.base.common.exception.ReportParseException;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dto.report.*;
 import com.simuwang.daq.components.ReportParseUtils;
 import com.simuwang.daq.components.report.parser.ReportParserConstant;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/excel/ExcelMonthlyReportParser.java

@@ -3,7 +3,7 @@ package com.simuwang.daq.components.report.parser.excel;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
 import com.simuwang.base.common.exception.ReportParseException;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dto.report.*;
 import com.simuwang.daq.components.report.parser.ReportParserConstant;
 import org.springframework.stereotype.Component;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/excel/ExcelQuarterlyReportParser.java

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.simuwang.base.common.exception.ReportParseException;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dto.report.*;
 import com.simuwang.daq.components.ReportParseUtils;
 import com.simuwang.daq.components.report.parser.ReportParserConstant;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/pdf/AbstractPDReportParser.java

@@ -6,7 +6,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.simuwang.base.common.conts.Constants;
 import com.simuwang.base.common.exception.ReportParseException;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dto.report.*;
 import com.simuwang.daq.components.CustomPDFTextStripper;
 import com.simuwang.daq.components.ReportParseUtils;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/pdf/PDAnnuallyReportParser.java

@@ -3,7 +3,7 @@ package com.simuwang.daq.components.report.parser.pdf;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dto.report.*;
 import com.simuwang.daq.components.ReportParseUtils;
 import com.simuwang.daq.components.report.parser.ReportParserConstant;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/pdf/PDMonthlyReportParser.java

@@ -2,7 +2,7 @@ package com.simuwang.daq.components.report.parser.pdf;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dto.report.MonthlyReportData;
 import com.simuwang.base.pojo.dto.report.ReportBaseInfoDTO;
 import com.simuwang.base.pojo.dto.report.ReportFundInfoDTO;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/pdf/PDQuarterlyReportParser.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
-import com.simuwang.base.mapper.EmailFieldMappingMapper;
+import com.simuwang.base.mapper.daq.EmailFieldMappingMapper;
 import com.simuwang.base.pojo.dto.report.*;
 import com.simuwang.daq.components.ReportParseUtils;
 import com.simuwang.daq.components.report.parser.ReportParserConstant;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/py/AbstractPyReportParser.java

@@ -7,7 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.simuwang.base.common.enums.ReportType;
 import com.simuwang.base.common.exception.ReportParseException;
 import com.simuwang.base.config.DaqProperties;
-import com.simuwang.base.mapper.FundInfoMapper;
+import com.simuwang.base.mapper.daq.FundInfoMapper;
 import com.simuwang.base.pojo.dos.FundAndCompanyInfoDO;
 import com.simuwang.base.pojo.dto.report.ParseResult;
 import com.simuwang.base.pojo.dto.report.ReportData;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/py/PythonAnnuallyReportParser.java

@@ -2,7 +2,7 @@ package com.simuwang.daq.components.report.parser.py;
 
 import com.simuwang.base.common.enums.ReportType;
 import com.simuwang.base.config.DaqProperties;
-import com.simuwang.base.mapper.FundInfoMapper;
+import com.simuwang.base.mapper.daq.FundInfoMapper;
 import com.simuwang.base.pojo.dto.report.AnnuallyReportData;
 import com.simuwang.daq.components.report.parser.ReportParserConstant;
 import org.springframework.stereotype.Component;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/py/PythonMonthlyReportParser.java

@@ -2,7 +2,7 @@ package com.simuwang.daq.components.report.parser.py;
 
 import com.simuwang.base.common.enums.ReportType;
 import com.simuwang.base.config.DaqProperties;
-import com.simuwang.base.mapper.FundInfoMapper;
+import com.simuwang.base.mapper.daq.FundInfoMapper;
 import com.simuwang.base.pojo.dto.report.MonthlyReportData;
 import com.simuwang.daq.components.report.parser.ReportParserConstant;
 import org.springframework.stereotype.Component;

service-daq/src/main/java/com/simuwang/daq/components/report/parser/py/PythonQuarterlyReportParser.java

@@ -2,7 +2,7 @@ package com.simuwang.daq.components.report.parser.py;
 
 import com.simuwang.base.common.enums.ReportType;
 import com.simuwang.base.config.DaqProperties;
-import com.simuwang.base.mapper.FundInfoMapper;
+import com.simuwang.base.mapper.daq.FundInfoMapper;
 import com.simuwang.base.pojo.dto.report.QuarterlyReportData;
 import com.simuwang.daq.components.report.parser.ReportParserConstant;
 import org.springframework.stereotype.Component;

service-daq/src/main/java/com/simuwang/daq/components/report/writer/AbstractReportWriter.java

@@ -1,7 +1,7 @@
 package com.simuwang.daq.components.report.writer;
 
-import com.simuwang.base.mapper.report.ReportBaseInfoMapper;
-import com.simuwang.base.mapper.report.ReportFundInfoMapper;
+import com.simuwang.base.mapper.daq.report.ReportBaseInfoMapper;
+import com.simuwang.base.mapper.daq.report.ReportFundInfoMapper;
 import com.simuwang.base.pojo.dos.report.ReportBaseInfoDO;
 import com.simuwang.base.pojo.dos.report.ReportFundInfoDO;
 import com.simuwang.base.pojo.dto.report.ReportBaseInfoDTO;

service-daq/src/main/java/com/simuwang/daq/components/report/writer/AnnuallyReportWriter.java

@@ -1,6 +1,6 @@
 package com.simuwang.daq.components.report.writer;
 
-import com.simuwang.base.mapper.report.*;
+import com.simuwang.base.mapper.daq.report.*;
 import com.simuwang.base.pojo.dto.report.AnnuallyReportData;
 import org.springframework.stereotype.Component;
 

service-daq/src/main/java/com/simuwang/daq/components/report/writer/MonthlyReportWriter.java

@@ -1,9 +1,9 @@
 package com.simuwang.daq.components.report.writer;
 
 import cn.hutool.core.collection.CollUtil;
-import com.simuwang.base.mapper.report.ReportBaseInfoMapper;
-import com.simuwang.base.mapper.report.ReportFundInfoMapper;
-import com.simuwang.base.mapper.report.ReportNetReportMapper;
+import com.simuwang.base.mapper.daq.report.ReportBaseInfoMapper;
+import com.simuwang.base.mapper.daq.report.ReportFundInfoMapper;
+import com.simuwang.base.mapper.daq.report.ReportNetReportMapper;
 import com.simuwang.base.pojo.dos.report.ReportNetReportDO;
 import com.simuwang.base.pojo.dto.report.MonthlyReportData;
 import com.simuwang.base.pojo.dto.report.ReportNetReportDTO;

service-daq/src/main/java/com/simuwang/daq/components/report/writer/QuarterlyReportWriter.java

@@ -1,7 +1,7 @@
 package com.simuwang.daq.components.report.writer;
 
 import cn.hutool.core.collection.CollUtil;
-import com.simuwang.base.mapper.report.*;
+import com.simuwang.base.mapper.daq.report.*;
 import com.simuwang.base.pojo.dos.report.ReportAssetAllocationDO;
 import com.simuwang.base.pojo.dos.report.ReportFinancialIndicatorsDO;
 import com.simuwang.base.pojo.dos.report.ReportInvestmentIndustryDO;

service-daq/src/main/java/com/simuwang/daq/service/EmailParseApiServiceImpl.java

@@ -9,9 +9,9 @@ import com.simuwang.base.common.conts.DateConst;
 import com.simuwang.base.common.enums.TaskType;
 import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.common.util.EmailUtil;
-import com.simuwang.base.mapper.EmailFileInfoMapper;
-import com.simuwang.base.mapper.EmailParseInfoMapper;
-import com.simuwang.base.mapper.EmailTaskInfoMapper;
+import com.simuwang.base.mapper.daq.EmailFileInfoMapper;
+import com.simuwang.base.mapper.daq.EmailParseInfoMapper;
+import com.simuwang.base.mapper.daq.EmailTaskInfoMapper;
 import com.simuwang.base.pojo.dos.EmailFileInfoDO;
 import com.simuwang.base.pojo.dos.EmailParseInfoDO;
 import com.simuwang.base.pojo.dos.EmailTaskInfoDO;

service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -16,7 +16,7 @@ import com.simuwang.base.common.exception.ReportParseException;
 import com.simuwang.base.common.util.*;
 import com.simuwang.base.config.DaqProperties;
 import com.simuwang.base.config.EmailRuleConfig;
-import com.simuwang.base.mapper.*;
+import com.simuwang.base.mapper.daq.*;
 import com.simuwang.base.pojo.dos.*;
 import com.simuwang.base.pojo.dto.EmailContentInfoDTO;
 import com.simuwang.base.pojo.dto.EmailFundNavDTO;
@@ -517,48 +517,51 @@ public class EmailParseService {
                 updateNavDoList = updateNavDoList.stream().sorted(Comparator.comparing(NavDO::getPriceDate)).collect(Collectors.toList());
             }
             //因为要做振幅检测，所以不能使用批量插入的方式
+            List<NavDO> finallyNavDOList = new ArrayList<>();
             for(NavDO insertDO : insertNavDoList){
-               boolean  amplitudeException = amplitudeNav(insertDO);
-               if(amplitudeException){
-                   //超过净值振幅不能入库，同时需要修改采集库的入库状态和异常信息
-                   saveAmplitudeFundNav(insertDO,fileId);
+               BigDecimal  amplitude = amplitudeNav(insertDO);
+               if(amplitude.compareTo(BigDecimal.valueOf(1)) >= 0){
+                   //振幅超过100%不可以入库，要给出提示信息
+                   saveAmplitudeFundNav(insertDO,fileId,NavParseStatusConst.AMPLITUDE_ERROR,0);
                }else{
-                   navMapper.batchInsert(ListUtil.toList(insertDO));
+                   //振幅超过20%可以入库，但要给出提示信息
+                   if(amplitude.compareTo(BigDecimal.valueOf(0.2)) >= 0){
+                       saveAmplitudeFundNav(insertDO,fileId,NavParseStatusConst.AMPLITUDE_EXCEPTION,1);
+                   }
+                   finallyNavDOList.add(insertDO);
                }
             }
+            if(CollUtil.isEmpty(finallyNavDOList)){
+                navMapper.batchInsert(finallyNavDOList);
+            }
+            List<NavDO> finallyUpdateNavDOList = new ArrayList<>();
             for(NavDO updateDO : updateNavDoList){
-                boolean  amplitudeException = amplitudeNav(updateDO);
-                if(amplitudeException){
+                BigDecimal  amplitude = amplitudeNav(updateDO);
+                if(amplitude.compareTo(BigDecimal.valueOf(1)) >= 0){
                     //超过净值振幅不能入库，同时需要修改采集库的入库状态和异常信息
-                    saveAmplitudeFundNav(updateDO,fileId);
+                    saveAmplitudeFundNav(updateDO,fileId,NavParseStatusConst.AMPLITUDE_ERROR,0);
                 }else{
-                    navMapper.batchUpdate(ListUtil.toList(updateDO));
+                    if(amplitude.compareTo(BigDecimal.valueOf(0.2)) >= 0){
+                        saveAmplitudeFundNav(updateDO,fileId,NavParseStatusConst.AMPLITUDE_EXCEPTION,1);
+                    }
+                    finallyUpdateNavDOList.add(updateDO);
                 }
             }
-//            if (CollUtil.isNotEmpty(insertNavDoList)) {
-//                Map<Date, List<NavDO>> priceDateNavDoListMap = insertNavDoList.stream().collect(Collectors.groupingBy(NavDO::getPriceDate));
-//                boolean hasDuplicationDateData = priceDateNavDoListMap.values().stream().map(List::size).anyMatch(e -> e > 1);
-//                if (!hasDuplicationDateData) {
-//                    navMapper.batchInsert(insertNavDoList);
-//                }
-//                // 要插入的数据中存在相同日期的数据 -> 只能一条一条的插入数据了
-//                insertNavDoList.forEach(e -> saveNavDo(ListUtil.toList(e)));
-//            }
-//            if (CollUtil.isNotEmpty(updateNavDoList)) {
-//                navMapper.batchUpdate(updateNavDoList);
-//            }
+            if(CollUtil.isEmpty(finallyNavDOList)){
+                navMapper.batchUpdate(finallyUpdateNavDOList);
+            }
         }
     }
 
-    private void saveAmplitudeFundNav(NavDO insertDO,Integer fileId) {
+    private void saveAmplitudeFundNav(NavDO insertDO,Integer fileId,Integer exceptionStatus,Integer isStored) {
         EmailFundNavDO fundNavDO = new EmailFundNavDO();
         fundNavDO.setFundId(insertDO.getFundId());
         fundNavDO.setNav(insertDO.getNav());
         fundNavDO.setPriceDate(insertDO.getPriceDate());
         fundNavDO.setCumulativeNavWithdrawal(insertDO.getCumulativeNavWithdrawal());
         fundNavDO.setFileId(fileId);
-        fundNavDO.setExceptionStatus(NavParseStatusConst.AMPLITUDE_EXCEPTION);
-        fundNavDO.setIsStored(0);
+        fundNavDO.setExceptionStatus(exceptionStatus);
+        fundNavDO.setIsStored(isStored);
         fundNavDO.setUpdateTime(new Date());
         emailFundNavMapper.update(fundNavDO);
     }
@@ -747,20 +750,17 @@ public class EmailParseService {
         fundNavDTO.setParseStatus(NavParseStatusConst.SUCCESS);
     }
     //振幅检测
-    private boolean amplitudeNav(NavDO navDO) {
+    private BigDecimal amplitudeNav(NavDO navDO) {
         String fundId = navDO.getFundId();
         String priceDate = DateUtils.format(navDO.getPriceDate(), DateUtils.YYYY_MM_DD);
         //上一期单位净值
         NavDO preNavDO = navMapper.queryNavByFundIdDate(fundId,priceDate);
         if(preNavDO == null){
-            return false;
+            return BigDecimal.valueOf(0);
         }
-        //|（当期-上期）/ 上期 | >= 0.2
+        //|（当期-上期）/ 上期 |
         BigDecimal amplitudeRate = navDO.getNav().subtract(preNavDO.getNav()).divide(preNavDO.getNav(),4, BigDecimal.ROUND_HALF_UP);
-        if(amplitudeRate.abs().compareTo(new BigDecimal(0.2)) > 0 ){
-            return true;
-        }
-        return false;
+        return amplitudeRate.abs();
     }
 
     private void saveFundAlias(String fundName, String registerNumber, List<String> fundIdList) {

service-daq/src/main/java/com/simuwang/daq/service/EmailTemplateService.java

@@ -13,9 +13,9 @@ import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.common.util.ExcelUtil;
 import com.simuwang.base.common.util.NavDataUtil;
 import com.simuwang.base.common.util.StringUtil;
-import com.simuwang.base.mapper.EmailTemplateApplicationRuleMapper;
-import com.simuwang.base.mapper.EmailTemplateDataRuleMapper;
-import com.simuwang.base.mapper.EmailTemplateMappingMapper;
+import com.simuwang.base.mapper.daq.EmailTemplateApplicationRuleMapper;
+import com.simuwang.base.mapper.daq.EmailTemplateDataRuleMapper;
+import com.simuwang.base.mapper.daq.EmailTemplateMappingMapper;
 import com.simuwang.base.pojo.dto.EmailFileContentDTO;
 import com.simuwang.base.pojo.dos.EmailTemplateApplicationRuleDO;
 import com.simuwang.base.pojo.dos.EmailTemplateDataRuleDO;

service-daq/src/main/java/com/simuwang/daq/service/FundService.java

@@ -2,8 +2,8 @@ package com.simuwang.daq.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.simuwang.base.mapper.FundAliasMapper;
-import com.simuwang.base.mapper.FundInfoMapper;
+import com.simuwang.base.mapper.daq.FundAliasMapper;
+import com.simuwang.base.mapper.daq.FundInfoMapper;
 import com.simuwang.base.pojo.dos.FundAliasDO;
 import com.simuwang.base.pojo.dos.FundInfoDO;
 import org.springframework.stereotype.Service;

service-daq/src/main/java/com/simuwang/daq/service/ValuationParseService.java

@@ -9,7 +9,7 @@ import cn.hutool.core.util.StrUtil;
 import com.simuwang.base.common.util.ValuationBusinessUtils;
 import com.simuwang.base.common.util.ValuationDataUtils;
 import com.simuwang.base.common.util.ValuationTableParseUtil;
-import com.simuwang.base.mapper.*;
+import com.simuwang.base.mapper.daq.*;
 import com.simuwang.base.pojo.dos.*;
 import com.simuwang.base.pojo.valuation.*;
 import com.smppw.utils.BigDecimalUtils;