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

service-base/src/main/java/com/simuwang/base/pojo/vo/ParseParamVO.java

@@ -15,7 +15,7 @@ public class ParseParamVO {
     /**
      * 选择的ID列表
      */
-    private List<Integer> idList;
+    private Integer id;
     /**
      * 解析开始日期
      */

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

@@ -88,6 +88,7 @@
     <select id="searchEmailList" resultMap="TableResultMap">
         <include refid="selectEmailParse"/>
         <include refid="sqlwhereSearch"/>
+     limit #{offset},#{pageSize}
     </select>
     <select id="searchEmailById" resultMap="TableResultMap">
         <include refid="selectEmailParse"/>

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

@@ -1,6 +1,7 @@
 package com.simuwang.manage.init;
 
 import com.alibaba.fastjson.JSON;
+import com.simuwang.base.common.enums.OpenStatusType;
 import com.simuwang.base.common.util.QuartzUtils;
 import com.simuwang.base.pojo.dos.MailboxInfoDO;
 import com.simuwang.base.pojo.dto.MailboxInfoDTO;
@@ -57,6 +58,11 @@ public class QuartzConfig implements ApplicationRunner {
                 paramDTO.setProtocol(mailboxInfoDO.getProtocol());
                 quartzBean.setJobParam(JSON.toJSONString(paramDTO));
                 QuartzUtils.createScheduleJob(scheduler,quartzBean);
+                if(mailboxInfoDO.getOpenStatus().equals(OpenStatusType.YES.getCode())){
+                    QuartzUtils.resumeScheduleJob(scheduler,quartzBean.getJobName());
+                }else{
+                    QuartzUtils.pauseScheduleJob(scheduler,quartzBean.getJobName());
+                }
             }catch (Exception e) {
                 logger.error(e.getMessage(),e);
             }

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

@@ -181,22 +181,18 @@ public class EmailConfigServiceImpl implements EmailConfigService {
 
     @Override
     public void parseEmail(ParseParamVO parseParamVO) {
-        List<Integer> idList = parseParamVO.getIdList();
+        Integer id = parseParamVO.getId();
         String startDate = parseParamVO.getStartDate();
         String endDate = parseParamVO.getEndDate();
-        if(StringUtil.isNull(idList) || idList.size() < 1){
-            return;
-        }
-        for(Integer id : idList){
-            MailboxInfoDO mailboxInfoDO = emailConfigMapper.searchEmailConfigById(id);
-            MailboxInfoDTO mailboxInfoDTO = new MailboxInfoDTO();
-            mailboxInfoDTO.setAccount(mailboxInfoDO.getEmail());
-            mailboxInfoDTO.setPassword(mailboxInfoDO.getPassword());
-            mailboxInfoDTO.setPort(mailboxInfoDO.getPort());
-            mailboxInfoDTO.setHost(mailboxInfoDO.getServer());
-            mailboxInfoDTO.setProtocol(mailboxInfoDO.getProtocol());
-            emailParseApiService.parseEmail(mailboxInfoDTO,DateUtils.parse(startDate,DateUtils.YYYY_MM_DD),DateUtils.parse(endDate,DateUtils.YYYY_MM_DD));
-        }
+        MailboxInfoDO mailboxInfoDO = emailConfigMapper.searchEmailConfigById(id);
+        MailboxInfoDTO mailboxInfoDTO = new MailboxInfoDTO();
+        mailboxInfoDTO.setAccount(mailboxInfoDO.getEmail());
+        mailboxInfoDTO.setPassword(mailboxInfoDO.getPassword());
+        mailboxInfoDTO.setPort(mailboxInfoDO.getPort());
+        mailboxInfoDTO.setHost(mailboxInfoDO.getServer());
+        mailboxInfoDTO.setProtocol(mailboxInfoDO.getProtocol());
+        emailParseApiService.parseEmail(mailboxInfoDTO,DateUtils.parse(startDate,DateUtils.YYYY_MM_DD),DateUtils.parse(endDate,DateUtils.YYYY_MM_DD));
+
     }
 
     private MailboxInfoDO toMailboxInfoDO(MailboxInfoVO mailboxInfoVO) {

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

@@ -37,8 +37,7 @@ public class ParseSchedulerTask  extends QuartzJobBean {
     private static final Logger log = LoggerFactory.getLogger(ParseSchedulerTask.class);
     @Override
     protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
-        log.info("ParseSchedulerTask {}", context.getJobDetail().getKey());
-        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
+        log.info("ParseSchedulerTask {}", context.getJobDetail().getKey());JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
         log.info("ParseSchedulerTask jobDataMap {}", JSON.toJSONString(jobDataMap));
         String account = jobDataMap.get("account").toString();
         String port = jobDataMap.get("port").toString();
@@ -57,10 +56,10 @@ public class ParseSchedulerTask  extends QuartzJobBean {
             Date endDate = null;
             if(EmailCron.getEmailCronByCron(mailboxInfoDO.getCron()) == EmailCron.EVERY_HOUR){
                 endDate = DateUtils.getNowDate();
-                startDate = DateUtils.addHours(DateUtils.getNowDate(),-1);;
+                startDate = DateUtils.addHours(DateUtils.getNowDate(),-1);
             }else if (EmailCron.getEmailCronByCron(mailboxInfoDO.getCron()) == EmailCron.ONE_AM){
                 endDate = DateUtils.getNowDate();
-                startDate = DateUtils.addHours(DateUtils.getNowDate(),-24);;
+                startDate = DateUtils.addHours(DateUtils.getNowDate(),-24);
             }
             log.info(account+"开始执行邮件解析任务，时间："+LocalDateTime.now());
             emailParseApiService.parseEmail(paramDTO,startDate,endDate);