1.统计sql修改

2.task去除无用依赖

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/KwsAlarmService.java

@@ -612,7 +612,7 @@ public class KwsAlarmService {
                 }
             }
         }
-        returnList = getProjectAlarmList(startTime, endTime, level, projectId, headerData.getMountainId(), 1);
+        returnList = getProjectAlarmList(startTime, endTime, level, projectId, headerData.getMountainId(), 2);
         if (!CollectionUtils.isEmpty(returnList)) {
             for (Map<String, Object> map : returnList) {
                 String id = map.get("projectId").toString();
@@ -730,7 +730,7 @@ public class KwsAlarmService {
                 }
             }
         }
-        returnList = getProjectAlarmList(startTime, endTime, level, projectId, headerData.getMountainId(), 2);
+        returnList = getProjectAlarmList(startTime, endTime, level, projectId, headerData.getMountainId(), 1);
         if (!CollectionUtils.isEmpty(returnList)) {
             for (Map<String, Object> map : returnList) {
                 String id = map.get("projectId").toString();

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/ProjectService.java

@@ -204,6 +204,7 @@ public class ProjectService {
         LocalDateTime now = LocalDateTime.now();
         project.setUpdateBy(headerData.getUpdateBy() == null ? null : Long.parseLong(headerData.getUpdateBy()));
         project.setUpdateTime(now);
+        project.setRemark(org.apache.commons.lang3.StringUtils.isNotBlank(projectAddDto.getRemark()) ? projectAddDto.getRemark() : null);
         projectMapper.updateById(project);
         String fence = projectAddDto.getFence();
         projectAreaMapper.update(null, new LambdaUpdateWrapper<KwsProjectArea>()

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/task/ReportTemplateTaskService.java

@@ -1,7 +1,6 @@
 package com.sckw.slope.detection.service.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sckw.core.model.constant.StringConstant;
 import com.sckw.core.model.enums.ReportTypeEnum;
 import com.sckw.excel.annotation.ExcelContext;
 import com.sckw.excel.utils.ExcelUtil;
@@ -16,12 +15,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import com.sckw.slope.detection.dao.tdengine.SlopeDataMapper;
-import java.security.MessageDigest;
 import java.io.IOException;
+import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsAlarmMapper.xml

@@ -318,7 +318,7 @@
 
     <select id="getProjectAlarmList" resultType="java.util.Map">
         SELECT project_id           as projectId,
-               COUNT(DISTINCT a.id) as alarmTotal
+               COUNT(DISTINCT b.id) as alarmTotal
         FROM kws_alarm a
                  LEFT JOIN kws_alarm_detail b ON a.id = b.alarm_id and b.del_flag = 0
         <where>