20250126 监控修改

src/main/java/cn/cslg/pas/service/MailSendService.java

@@ -235,7 +235,7 @@ public class MailSendService {
         }
     }
 
-    public void sendSysCycleStartEmail() {
+    public void sendSysCycleStartEmail(String value) {
         LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(SystemDict::getType, "ADMIN");
         List<SystemDict> systemDictList = systemDictService.list(queryWrapper);
@@ -246,6 +246,7 @@ public class MailSendService {
         map.put("title", "监控通知");
         map.put("template", "mail/sysCycleStart.html");
         map.put("img", "/logo.png");
+        map.put("value1", value);
         if (systemDictList != null && systemDictList.size() > 0) {
             SystemDict systemDict = systemDictList.remove(0);
             map.put("email", systemDict.getValue());

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -4,6 +4,7 @@ import cn.cslg.pas.common.core.base.Cycle;
 import cn.cslg.pas.common.dto.ExportTaskDTO;
 import cn.cslg.pas.common.dto.ImportTaskDTO;
 import cn.cslg.pas.common.dto.PatentStarListDTO;
+import cn.cslg.pas.common.dto.es.EsCustomFieldDTO;
 import cn.cslg.pas.common.importTask.QuartzConditionDTO;
 import cn.cslg.pas.common.model.cronModel.Personnel;
 import cn.cslg.pas.common.model.cronModel.PersonnelVO;
@@ -25,6 +26,7 @@ import cn.cslg.pas.service.MailSendService;
 import cn.cslg.pas.service.common.FileManagerService;
 import cn.cslg.pas.service.common.PatentStarApiService;
 import cn.cslg.pas.service.importPatent.SchedulingTaskService;
+import cn.cslg.pas.service.importPatent.WebVOTransformService;
 import cn.cslg.pas.service.permissions.PermissionService;
 import cn.cslg.pas.service.query.FormatQueryService;
 import com.alibaba.fastjson.JSONArray;
@@ -89,6 +91,8 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
     private MailSendService mailSendService;
     @Autowired
     private ReportProjectService reportProjectService;
+    @Autowired
+    private WebVOTransformService webVOTransformService;
 
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
@@ -663,12 +667,19 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         importTask.setIfCreateBySys(true);
         if (importTask.getAllNum() != null && importTask.getAllNum() <= 0) {
             importTask.setState(2);
-            mailSendService.sendCycleImportTaskDoneEmail(importTask);
+            if (importTask.getAllNum() < 0) {
+                mailSendService.sendSysCycleStartEmail("任务查询专利报错，请管理员手动更正");
+            }
             importTask.insert();
         } else {
             importTask.insert();
             schedulingTaskService.startTask();
         }
+        ImportTaskAMVO importTaskAMVO = new ImportTaskAMVO();
+        importTaskAMVO.setUpdateToDate(importTask.getUpdateToDate());
+        importTaskAMVO.setUpdateCycle(updateCycle);
+        importTaskAMVO.setProjectId(project.getProjectId());
+        List<EsCustomFieldDTO> dtoList = webVOTransformService.getEsCustomFieldDTOList(importTaskAMVO);
     }
 
     public String getImportContentStr(Integer importContent, Integer taskType) {

src/main/java/cn/cslg/pas/service/quartzService/SysImportPatentJobService.java

@@ -17,6 +17,7 @@ import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -26,6 +27,7 @@ import java.util.stream.Collectors;
 
 @DisallowConcurrentExecution
 @RequiredArgsConstructor
+@Service
 public class SysImportPatentJobService extends QuartzJobBean {
     private final ImportTaskConditionService importTaskConditionService;
     private final ImportTaskService importTaskService;
@@ -35,7 +37,7 @@ public class SysImportPatentJobService extends QuartzJobBean {
     @Override
     public void executeInternal(JobExecutionContext context) throws JobExecutionException {
 
-        mailSendService.sendSysCycleStartEmail();
+        mailSendService.sendSysCycleStartEmail("系统监控任务开始");
         System.out.println("task start");
         this.addChinesePatent();
 

src/test/java/cn/cslg/pas/test/QuartzTaskTests.java

@@ -0,0 +1,39 @@
+package cn.cslg.pas.test;
+
+import cn.cslg.pas.common.utils.GenerateObjectUtil;
+import cn.cslg.pas.controller.AvoidDesignController;
+import cn.cslg.pas.service.MailSendService;
+import cn.cslg.pas.service.business.AvoidDesignService;
+import cn.cslg.pas.service.quartzService.SysImportPatentJobService;
+import cn.cslg.pas.service.test.*;
+import cn.hutool.crypto.SecureUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.checkerframework.checker.units.qual.A;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/12/5
+ */
+@SpringBootTest
+public class QuartzTaskTests {
+    @Autowired
+    private MailSendService mailSendService;
+    @Autowired
+    private SysImportPatentJobService sysImportPatentJobService;
+    @Test
+    public void testUpdate() {
+        mailSendService.sendSysCycleStartEmail("任务查询专利报错，请管理员手动更正");
+    }
+
+
+    @Test
+    public void testUpdate2() {
+        sysImportPatentJobService.addChinesePatent();
+    }
+}