feat:频率计算优化

service-base/src/main/resources/mapper/daq/DeletionInfoMapper.xml

@@ -177,6 +177,7 @@
     <resultMap id="BaseMap" type="com.simuwang.base.pojo.dos.FundDeletionInfoDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>
+        <result column="channel_id" property="channelId"/>
         <result column="fund_name" property="fundName"/>
         <result column="deletion_date" property="deletionDate"/>
         <result column="deletion_type" property="deletionType"/>
@@ -192,6 +193,7 @@
         SELECT
             d.id,
             d.fund_id,
+            d.channel_id,
             info.fund_name,
             d.deletion_type,
             d.deletion_date,

service-manage/src/main/java/com/simuwang/manage/service/impl/CompanyContactServiceImpl.java

@@ -83,6 +83,7 @@ public class CompanyContactServiceImpl implements CompanyContactService {
         LastCompanyContactInfoDO lastCompanyContactInfoDO = lastCompanyContactInfoMapper.getLastCompanyContactInfoDOByCompanyId(companyContactInfoVO.getCompanyId());
         if (lastCompanyContactInfoDO == null) {
             lastCompanyContactInfoDO = BeanUtil.copyProperties(companyContactInfoDO,LastCompanyContactInfoDO.class);
+            lastCompanyContactInfoDO.setContactDate(companyContactInfoDO.getContactDate());
             lastCompanyContactInfoMapper.insert(lastCompanyContactInfoDO);
         }else{
             String contactDate = companyContactInfoVO.getContactDate();

service-manage/src/main/java/com/simuwang/manage/service/impl/FileMangeServiceImpl.java

@@ -112,8 +112,13 @@ public class FileMangeServiceImpl implements FileMangeService {
     public void changeFileFundMappingInfo(List<Integer> fileIdList, String fundId) {
         try{
             FundInfoDO fundInfoDO = fundInfoMapper.searchFundDetail(fundId);
-            Integer userId = UserUtils.getLoginUser().getUserId();
-            fileManageMapper.batchUpdateFileManageInfo(fileIdList,fundInfoDO.getFundId(),fundInfoDO.getFundName(),fundInfoDO.getRegisterNumber(),FileSourceType.CUSTOM_SOURCE,userId);
+            Integer userId = null;
+            try{
+                userId = UserUtils.getLoginUser().getUserId();
+            }catch (Exception e){
+                logger.error(e.getMessage(),e);
+            }
+            fileManageMapper.batchUpdateFileManageInfo(fileIdList,fundInfoDO.getFundId(),fundInfoDO.getFundName(),fundInfoDO.getRegisterNumber(),FileSourceType.CUSTOM_SOURCE,userId==null?999999:userId);
         }catch (Exception e){
             logger.error(e.getMessage(),e);
         }

service-manage/src/main/java/com/simuwang/manage/task/NavFrequencyComputeTask.java

@@ -55,30 +55,34 @@ public class NavFrequencyComputeTask {
         List<String> fundIdList = navMapper.getAllFundId();
         String priceDate = DateUtils.getAroundToday(-35);
         for (String fundId : fundIdList) {
-            FundReportFrequencyDO fundReportFrequencyDO = fundReportFrequencyMapper.getFrequencyByFundId(fundId);
-            if(fundReportFrequencyDO != null && fundReportFrequencyDO.getCreatorId() != null){
-                continue;
-            }
-            List<NavDO> navDOList = navMapper.selectNavByFundIdAndDate(fundId,priceDate);
-            FundReportFrequencyDO fundReportFrequency = new FundReportFrequencyDO();
-            if(fundReportFrequencyDO != null){
-                fundReportFrequency.setId(fundReportFrequencyDO.getId());
-            }
-            fundReportFrequency.setFundId(fundId);
-            if(navDOList.size() >= 8){
-                fundReportFrequency.setNavFrequency(Frequency.DAY.getCode());
-            }
-            if(navDOList.size() > 2 && navDOList.size() < 8){
-                fundReportFrequency.setNavFrequency(Frequency.WEEK.getCode());
-            }
-            if(navDOList.size() >= 1 && navDOList.size() <= 2){
-                fundReportFrequency.setNavFrequency(Frequency.MONTH.getCode());
-            }
-            if(fundReportFrequency.getNavFrequency() != null){
-                fundReportFrequency.setIsvalid(1);
-                fundReportFrequency.setCreateTime(new Date());
-                fundReportFrequency.setUpdateTime(new Date());
-                fundReportFrequencyMapper.insert(fundReportFrequency);
+            try{
+                FundReportFrequencyDO fundReportFrequencyDO = fundReportFrequencyMapper.getFrequencyByFundId(fundId);
+                if(fundReportFrequencyDO != null && fundReportFrequencyDO.getCreatorId() != null){
+                    continue;
+                }
+                List<NavDO> navDOList = navMapper.selectNavByFundIdAndDate(fundId,priceDate);
+                FundReportFrequencyDO fundReportFrequency = new FundReportFrequencyDO();
+                if(fundReportFrequencyDO != null){
+                    fundReportFrequency.setId(fundReportFrequencyDO.getId());
+                }
+                fundReportFrequency.setFundId(fundId);
+                if(navDOList.size() >= 8){
+                    fundReportFrequency.setNavFrequency(Frequency.DAY.getCode());
+                }
+                if(navDOList.size() > 2 && navDOList.size() < 8){
+                    fundReportFrequency.setNavFrequency(Frequency.WEEK.getCode());
+                }
+                if(navDOList.size() >= 1 && navDOList.size() <= 2){
+                    fundReportFrequency.setNavFrequency(Frequency.MONTH.getCode());
+                }
+                if(fundReportFrequency.getNavFrequency() != null){
+                    fundReportFrequency.setIsvalid(1);
+                    fundReportFrequency.setCreateTime(new Date());
+                    fundReportFrequency.setUpdateTime(new Date());
+                    fundReportFrequencyMapper.insertOrUpdate(fundReportFrequency);
+                }
+            }catch (Exception e){
+                log.error(e.getMessage(),e);
             }
         }
         endEmailTask(emailTaskInfoDO.getId(),2);