Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

service-base/src/main/java/com/simuwang/base/common/enums/EmailCron.java

@@ -9,7 +9,7 @@ import java.util.stream.Stream;
  * Description: ${DESCRIPTION}
  */
 public enum EmailCron {
-    EVERY_HOUR(1, "0 0/1 * * * ?"), ONE_AM(2, "0 0 1 * * ?");
+    EVERY_HOUR(1, "0/1 0 * * * ?"), ONE_AM(2, "0 0 1 * * ?");
 
     private final Integer text;
     private final String cron;

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

@@ -5,9 +5,9 @@ import com.simuwang.base.components.ShiroLoginAuthAdapter;
 import com.simuwang.base.components.ShiroRsaCredentialsMatcher;
 import com.simuwang.base.components.UserAuthService;
 import com.simuwang.shiro.core.ShiroDbRealm;
-import com.simuwang.shiro.core.ShiroDbRealmImpl;
 import com.simuwang.shiro.core.adapter.LoginAuthAdapter;
 import com.simuwang.shiro.core.bridge.AuthBridgeService;
+import com.simuwang.shiro.core.ShiroDbRealmImpl;
 import com.simuwang.shiro.core.jwt.JwtContext;
 import com.simuwang.shiro.core.jwt.JwtFilter;
 import jakarta.servlet.Filter;
@@ -24,6 +24,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
 import java.util.List;
+import java.util.List;
 import java.util.Map;
 
 @Configuration

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

@@ -18,7 +18,7 @@ import java.util.List;
 @Mapper
 public interface CompanyEmailConfigMapper extends BaseMapper<CompanyEmailConfigDO> {
 
-    void deleteCompanyEmailConfig(@Param("id") Integer id);
+    void deleteCompanyEmailConfig(@Param("id") Integer id,@Param("updaterId")Integer userId);
 
     void saveCompanyEmailConfig(CompanyEmailConfigDO emailConfigDO);
 

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

@@ -24,7 +24,7 @@ public interface CompanyEmailSendHistoryMapper {
 
     void deleteEmailHistory(@Param("emailList")List<String> email);
 
-    void deleteEmailHistoryByIds(@Param("ids") List<Integer> idList);
+    void deleteEmailHistoryByIds(@Param("ids") List<Integer> idList,@Param("updaterId")Integer userId);
 
     long countCompanyEmailList(CompanyEmailPageQuery companyEmailPageQuery);
 

service-base/src/main/java/com/simuwang/base/pojo/dto/query/FundAliasPageQuery.java

@@ -18,7 +18,7 @@ public class FundAliasPageQuery extends PageQuery {
      */
     private String fundAliasName;
     /**
-     * 是否匹配基金
+     * 是否匹配基金 1-匹配，0-未匹配
      */
     private Integer isMapping;
 

service-base/src/main/resources/mapper/CompanyEmailConfigMapper.xml

@@ -42,7 +42,7 @@
     </update>
 
     <update id="deleteCompanyEmailConfig">
-        update PPW_EMAIL.company_email_config set isvalid =0,updatetime=sysdate() where id=#{id}
+        update PPW_EMAIL.company_email_config set isvalid =0,updatetime=sysdate(),updaterid=#{updaterId} where id=#{id}
     </update>
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.CompanyEmailConfigDO">
         <id column="id" property="id"/>

service-base/src/main/resources/mapper/CompanyEmailHistoryMapper.xml

@@ -27,7 +27,7 @@
         </foreach>
     </update>
     <update id="deleteEmailHistoryByIds">
-        update PPW_EMAIL.company_email_send_history set isvalid =0,updatetime=sysdate() where id in
+        update PPW_EMAIL.company_email_send_history set isvalid =0,updatetime=sysdate(),updaterid=#{userId} where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>

service-base/src/main/resources/mapper/EmailFundAssetMapper.xml

@@ -85,7 +85,7 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
-        <if test="emailId != null">
+        <if test="emailId != null and emailId !=''">
             and parse.id =#{emailId}
         </if>
         <if test="exceptionStatusList != null">
@@ -128,7 +128,7 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
-        <if test="emailId != null">
+        <if test="emailId != null and emailId !=''">
             and parse.id =#{emailId}
         </if>
         <if test="exceptionStatusList != null">

service-base/src/main/resources/mapper/EmailFundNavMapper.xml

@@ -94,8 +94,8 @@
         <if test="emailTitle != null and emailTitle != ''">
             and parse.email_title like concat('%',#{emailTitle},'%')
         </if>
-        <if test="emailId != null">
-            and parse.id=#{emailId}
+        <if test="emailId != null and emailId !=''">
+            and parse.id =#{emailId}
         </if>
         order by nav.updatetime desc
         limit #{offset},#{pageSize}

service-base/src/main/resources/mapper/EmailParseInfoMapper.xml

@@ -89,6 +89,7 @@
     <select id="searchEmailList" resultMap="BaseResultMap">
         <include refid="selectEmailParse"/>
         <include refid="sqlwhereSearch"/>
+        order by epi.parse_date desc
      limit #{offset},#{pageSize}
     </select>
     <select id="searchEmailById" resultMap="BaseResultMap">

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

@@ -53,11 +53,16 @@ public class NavEmailParser extends AbstractEmailParser {
     @Value("${email.file.path}")
     private String path;
 
+    private final ValuationEmailParser valuationEmailParser;
+
     private static final Integer ROW_DIRECTION_TYPE = 1;
     private static final Integer COLUMN_DIRECTION_TYPE = 2;
-
     private static final int MAX_COLUMN = 20;
 
+    public NavEmailParser(ValuationEmailParser valuationEmailParser) {
+        this.valuationEmailParser = valuationEmailParser;
+    }
+
     @Override
     public boolean isSupport(Integer emailType) {
         return EmailTypeConst.NAV_EMAIL_TYPE.equals(emailType);
@@ -94,6 +99,13 @@ public class NavEmailParser extends AbstractEmailParser {
         if (CollUtil.isNotEmpty(emailFundNavDTOList)) {
             emailFundNavDTOList = emailFundNavDTOList.stream().filter(super::dataFormat).collect(Collectors.toList());
         }
+        if (CollUtil.isEmpty(emailFundNavDTOList)) {
+            // 判断文件名是否包含"估值表"
+            String fileName = emailContentInfoDTO.getFileName();
+            if (StrUtil.isNotBlank(fileName) && fileName.contains("估值表")) {
+                emailFundNavDTOList = valuationEmailParser.parse(emailContentInfoDTO, emailFieldMap);
+            }
+        }
         return emailFundNavDTOList;
     }
 

service-manage/src/main/java/com/simuwang/manage/init/QuartzConfig.java

@@ -4,6 +4,7 @@ import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
 import com.alibaba.fastjson2.JSON;
 import com.simuwang.base.common.enums.OpenStatusType;
+import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.common.util.QuartzUtils;
 import com.simuwang.base.config.DaqProperties;
 import com.simuwang.base.pojo.dos.MailboxInfoDO;
@@ -45,18 +46,8 @@ public class QuartzConfig implements ApplicationRunner {
     private DaqProperties properties;
     private String JOB_CLASS="com.simuwang.manage.task.ParseSchedulerTask";
 
-    private final Boolean enableQuartz;
-
-    public QuartzConfig(DaqProperties properties) {
-        this.enableQuartz = properties.getEnableQuartz();
-    }
-
     @Override
     public void run(ApplicationArguments args){
-        // 没有开启定时任务功能时直接退出
-//        if (!enableQuartz) {
-//            return;
-//        }
         List<MailboxInfoDO> mailboxInfoDOS = emailConfigService.getAll();
         for(MailboxInfoDO mailboxInfoDO : mailboxInfoDOS){
             try{
@@ -82,6 +73,7 @@ public class QuartzConfig implements ApplicationRunner {
                 paramDTO.setProtocol(mailboxInfoDO.getProtocol());
                 quartzBean.setJobParam(JSON.toJSONString(paramDTO));
                 if(mailboxInfoDO.getOpenStatus() != null && mailboxInfoDO.getOpenStatus().equals(OpenStatusType.YES.getCode())){
+                    logger.info(quartzBean.getJobName()+":创建定时任务"+ DateUtils.getNowDate());
                     QuartzUtils.createScheduleJob(scheduler,quartzBean);
                 }
             }catch (Exception e) {

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

@@ -18,6 +18,7 @@ import com.simuwang.base.pojo.dto.ExcelDeletionInfoDTO;
 import com.simuwang.base.pojo.dto.MailboxInfoDTO;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.manage.service.CompanyEmailConfigService;
+import com.simuwang.shiro.utils.UserUtils;
 import com.smppw.common.pojo.ResultVo;
 import jakarta.annotation.Resource;
 import jakarta.mail.Message;
@@ -77,6 +78,11 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 if(!StringUtil.isNull(oldEmailConfigDO) && emailConfigVO.getId() == null){
                     msg.append(emailConfigVO.getCompanyName()+"已存在邮箱"+emailConfigVO.getEmail()).append(",");
                 }
+                if(!StringUtil.isNull(oldEmailConfigDO) && emailConfigVO.getId() != null){
+                    if(!oldEmailConfigDO.getId().equals(emailConfigVO.getId())){
+                        msg.append(emailConfigVO.getCompanyName()+"已存在邮箱"+emailConfigVO.getEmail()).append(",");
+                    }
+                }
             }
             if(StringUtil.isNotEmpty(msg.toString())){
                 vo.setMsg(msg.toString().substring(0,msg.length()-1));
@@ -90,6 +96,8 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 emailConfigDO.setEmail(emailConfigVO.getEmail());
                 emailConfigDO.setOpenStatus(emailConfigVO.getOpenStatus());
                 emailConfigDO.setRemark(emailConfigVO.getSendRemark());
+                emailConfigDO.setCreatorId(UserUtils.getLoginUser().getUserId());
+                emailConfigDO.setCreatorId(UserUtils.getLoginUser().getUserId());
                 emailConfigDO.setIsvalid(1);
                 emailConfigDO.setUpdateTime(new Date());
                 if(emailConfigVO.getId() != null){
@@ -113,6 +121,7 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
         if (configDO != null) {
             configDO.setIsvalid(0);
             configDO.setUpdateTime(new Date());
+            configDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
             companyEmailConfigMapper.updateById(configDO);
         }
     }
@@ -125,6 +134,7 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
             configDO.setCompanyId(companyEmailConfigVO.getCompanyId());
             configDO.setCompanyName(companyEmailConfigVO.getCompanyName());
             configDO.setUpdateTime(new Date());
+            configDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
             companyEmailConfigMapper.updateCompanyEmailConfig(configDO);
         }
     }

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

@@ -5,13 +5,13 @@ import com.simuwang.base.mapper.CompanyEmailConfigMapper;
 import com.simuwang.base.mapper.CompanyEmailSendHistoryMapper;
 import com.simuwang.base.pojo.dos.CompanyEmailConfigDO;
 import com.simuwang.base.pojo.dos.CompanyEmailSendHistoryDO;
-import com.simuwang.base.pojo.dos.sys.SysRoleUserDO;
 import com.simuwang.base.pojo.dto.query.CompanyEmailHistoryPageQuery;
 import com.simuwang.base.pojo.dto.query.CompanyEmailPageQuery;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
 import com.simuwang.base.pojo.vo.IdVO;
 import com.simuwang.manage.service.CompanyEmailSendHistoryService;
+import com.simuwang.shiro.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,10 +52,11 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteEmail(List<Integer> idList) {
+        Integer userId = UserUtils.getLoginUser().getUserId();
         for(Integer id : idList){
             CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectCompanyEmailConfigById(id);
             //删除配置
-            companyEmailConfigMapper.deleteCompanyEmailConfig(configDO.getId());
+            companyEmailConfigMapper.deleteCompanyEmailConfig(configDO.getId(),userId);
             //删除历史
             List<String> emailList = new ArrayList<>();
             emailList.add(configDO.getEmail());
@@ -67,7 +68,8 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
 
     @Override
     public void deleteEmailHistory(List<Integer> idList) {
-        companyEmailSendHistoryMapper.deleteEmailHistoryByIds(idList);
+        Integer userId = UserUtils.getLoginUser().getUserId();
+        companyEmailSendHistoryMapper.deleteEmailHistoryByIds(idList,userId);
     }
 
     @Override

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

@@ -186,7 +186,7 @@ public class EmailConfigServiceImpl implements EmailConfigService {
             //请求参数
             MailboxInfoDTO paramDTO = new MailboxInfoDTO();
             paramDTO.setAccount(mailboxInfoDO.getEmail());
-            paramDTO.setPassword(mailboxInfoDO.getPassword());
+            paramDTO.setPassword(getPassword(mailboxInfoDO.getPassword()));
             paramDTO.setPort(mailboxInfoDO.getPort());
             paramDTO.setHost(mailboxInfoDO.getServer());
             paramDTO.setProtocol(mailboxInfoDO.getProtocol());

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

@@ -39,9 +39,6 @@ public class ParseEmailDetailServiceImpl implements ParseEmailDetailService {
     private EmailParseInfoMapper emailParseInfoMapper;
     @Override
     public MybatisPage<EmailFundNavVO> searchNavDetail(ParseDetailPageQuery parseDetailPageQuery) {
-        if(StringUtil.isNotEmpty(parseDetailPageQuery.getPriceEndDate())){
-            parseDetailPageQuery.setPriceEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getPriceEndDate(),DateUtils.YYYY_MM_DD),1));
-        }
         if(StringUtil.isNotEmpty(parseDetailPageQuery.getUpdateEndDate())){
             parseDetailPageQuery.setUpdateEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getUpdateEndDate(),DateUtils.YYYY_MM_DD),1));
         }
@@ -60,9 +57,6 @@ public class ParseEmailDetailServiceImpl implements ParseEmailDetailService {
 
     @Override
     public MybatisPage<EmailFundAssetVO> searchAssetDetail(ParseDetailPageQuery parseDetailPageQuery) {
-        if(StringUtil.isNotEmpty(parseDetailPageQuery.getPriceEndDate())){
-            parseDetailPageQuery.setPriceEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getPriceEndDate(),DateUtils.YYYY_MM_DD),1));
-        }
         if(StringUtil.isNotEmpty(parseDetailPageQuery.getUpdateEndDate())){
             parseDetailPageQuery.setUpdateEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getUpdateEndDate(),DateUtils.YYYY_MM_DD),1));
         }

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

@@ -47,7 +47,7 @@ public class FundDeletionTask {
 
     @Autowired
     private DistributionMapper distributionMapper;
-    @Scheduled(cron = "0 0 5,12,18 * * ?")
+//    @Scheduled(cron = "0 0 5,12,18 * * ?")
     public void computeDeletion(){
         List<String> fundIdList = navMapper.getAllFundId();
         for(String fundId : fundIdList){

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

@@ -19,6 +19,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.stereotype.Component;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -30,7 +31,6 @@ import java.util.Date;
  * Date:     2024/9/17 10:48
  * Description: ${DESCRIPTION}
  */
-
 public class ParseSchedulerTask  extends QuartzJobBean {
 
     @Autowired

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

@@ -28,7 +28,7 @@ public class SendCompanyEmailTask {
 
     @Autowired
     private CompanyEmailConfigService companyEmailConfigService;
-    @Scheduled(cron = "0 0/3 * * * ?")
+//    @Scheduled(cron = "0 0/3 * * * ?")
     public void sendEmail(){
         List<CompanyEmailConfigDO> configDOList = companyEmailConfigMapper.getAllCompanyConfig();
         Map<String,List<CompanyEmailConfigDO>> companyListMap = configDOList.stream().collect(Collectors.groupingBy(e -> e.getCompanyId()));