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

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/1 0 * * * ?"), ONE_AM(2, "0 0 1 * * ?");
+    EVERY_HOUR(1, "0 0 0/1 * * ?"), 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

@@ -116,9 +116,7 @@ public class ShiroConfig {
         sessionManager.setSessionValidationSchedulerEnabled(false);
         sessionManager.setSessionIdCookieEnabled(true);
         sessionManager.setSessionIdCookie(simpleCookie());
-        // session 超时时间
-        long timeout = this.properties.getTokenExpire() * 60 * 1000L;
-        sessionManager.setGlobalSessionTimeout(timeout);
+        sessionManager.setGlobalSessionTimeout(3600000);
         return sessionManager;
     }
 

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

@@ -38,7 +38,9 @@ public interface FundInfoMapper {
 
     String getCompanyNameByFundId(@Param("fundId") String fundId);
 
-    String getInceptionDateByFundId(@Param("fundId")String fundId);
+    String getLiquidateDateByFundId(@Param("fundId")String fundId);
 
     List<String> getFundIdByCompanyId(@Param("companyId")String companyId);
+
+    String getInceptionDateByFundId(@Param("fundId")String fundId);
 }

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

@@ -158,12 +158,15 @@
         join PPW_EMAIL.pvn_fund_info info on info.trust_id=c.company_id
         where info.fund_id=#{fundId} and info.isvalid=1 and c.isvalid=1
     </select>
-    <select id="getInceptionDateByFundId" resultType="java.lang.String" parameterType="java.lang.String">
-        select inception_date from PPW_EMAIL.pvn_fund_info where fund_id=#{fundId} and isvalid=1
+    <select id="getLiquidateDateByFundId" resultType="java.lang.String" parameterType="java.lang.String">
+        select liquidate_date from PPW_EMAIL.pvn_fund_info where fund_id=#{fundId} and isvalid=1
     </select>
     <select id="getFundIdByCompanyId" resultType="java.lang.String" parameterType="java.lang.String">
         select info.fund_id from PPW_EMAIL.pvn_fund_info info join PPW_EMAIL.pvn_company_info c on info.trust_id=c.company_id
         where info.isvalid=1 and c.isvalid=1 and c.company_id=#{companyId}
     </select>
+    <select id="getInceptionDateByFundId" resultType="java.lang.String" parameterType="java.lang.String">
+        select inception_date from PPW_EMAIL.pvn_fund_info where fund_id=#{fundId} and isvalid=1
+    </select>
 
 </mapper>

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

@@ -73,7 +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());
+                    logger.info(quartzBean.getJobName()+":创建定时任务,cron:"+quartzBean.getCronExpression()+"--"+ DateUtils.getNowDate());
                     QuartzUtils.createScheduleJob(scheduler,quartzBean);
                 }
             }catch (Exception e) {

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

@@ -51,8 +51,12 @@ public class FundDeletionTask {
     public void computeDeletion(){
         List<String> fundIdList = navMapper.getAllFundId();
         for(String fundId : fundIdList){
+            String liquidateDate = fundInfoMapper.getLiquidateDateByFundId(fundId);
+            if(StringUtil.isNotEmpty(liquidateDate)){
+                continue;
+            }
             String inceptionDate = fundInfoMapper.getInceptionDateByFundId(fundId);
-            if(inceptionDate == null){
+            if(StringUtil.isEmpty(inceptionDate)){
                 continue;
             }
             String today = DateUtils.getAroundToday(0);