完善业务逻辑

publish.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 echo "服务开始打包"
-export JAVA_HOME=~/Library/Java/JavaVirtualMachines/corretto-17.0.11/Contents/Home
+export JAVA_HOME=~/Library/Java/JavaVirtualMachines/corretto-17.0.13/Contents/Home
 
 mvn -P prod clean package -Dmaven.test.skip=true
 

social/src/main/java/com/jiagutech/ams/mapper/JobMapper.java

@@ -23,5 +23,7 @@ public interface JobMapper extends BaseMapper<JobDTO> {
 
     List<JobDTO> inProcessJob(@Param("ew") QueryWrapper<JobDTO> queryWrapper);
 
-    List<ChartMultiItem> selectChart(@Param("level") int level, @Param("regionPath") String regionPath);
+    List<ChartMultiItem> selectChart(@Param("level") int level,
+                                     @Param("regionPath") String regionPath,
+                                     @Param("currentYear")Long currentYear);
 }

social/src/main/java/com/jiagutech/ams/service/JobServiceImpl.java

@@ -4,7 +4,6 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jiagutech.ams.event.JobFinishEvent;
@@ -20,7 +19,10 @@ import com.jiagutech.ams.model.mapping.TrackMapping;
 import com.jiagutech.ams.model.request.JobCreateRequest;
 import com.jiagutech.ams.model.request.JobPageRequest;
 import com.jiagutech.ams.model.request.JobSegmentRequest;
-import com.jiagutech.ams.model.response.*;
+import com.jiagutech.ams.model.response.ChartMultiItem;
+import com.jiagutech.ams.model.response.JobCreateResponse;
+import com.jiagutech.ams.model.response.JobItem;
+import com.jiagutech.ams.model.response.JobPolyItem;
 import com.jiagutech.ams.rest.TrackRestClient;
 import com.jiagutech.ams.utils.ExcelUtil;
 import com.jiagutech.ams.utils.LoginUtil;
@@ -29,13 +31,13 @@ import com.jiagutech.ams.utils.TrackUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Duration;
-import java.time.Instant;
+import java.time.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -322,9 +324,12 @@ public class JobServiceImpl implements JobService {
     public List<ChartMultiItem> getJobChart() {
         LoginUser loginUser = LoginUtil.getLoginUser();
         String regionPath = loginUser.getRegionPath();
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(regionPath)) {
+        if (StringUtils.isNotBlank(regionPath)) {
             int level = regionPath.split("->").length;
-            return jobMapper.selectChart(level, regionPath);
+            int currentYear = LocalDateTime.now().getYear();
+            LocalDateTime startOfYear = LocalDateTime.of(currentYear, Month.JANUARY, 1, 0, 0, 0, 0);
+            long currentYearStamp = startOfYear.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+            return jobMapper.selectChart(level, regionPath, currentYearStamp);
         }
         return Collections.emptyList();
     }

social/src/main/java/com/jiagutech/ams/service/MessageDataServiceImpl.java

@@ -111,6 +111,7 @@ public class MessageDataServiceImpl implements MessageDataService {
                     Duration duration = Duration.between(instant1, instant2);
                     job.setDuration((int) duration.toSeconds());
                     job.setFinishedType(2);
+                    job.setStatus(2);
                     job.setJobType(workRecord.getModule().intValue());
                     jobMapper.updateById(job);
                     continue;

social/src/main/resources/mapper/JobMapper.xml

@@ -131,9 +131,10 @@
             d.region_code as code,
             i.region_name as name,
             count(j.id) as count,
-            ROUND(sum(j.area), 2) as value
-            from ams_job_info j
-            left join ams_dept d on j.dept_id = d.id
+            ifnull(ROUND(sum(j.area), 2),0) as value
+            from  ams_dept d
+            left join ams_job_info j
+            on j.dept_id = d.id  and j.start_time >= #{currentYear}
             left join region_info i
             on d.region_code=i.region_code
             where d.region_path like concat(#{regionPath},'%')
@@ -144,10 +145,11 @@
             d.id as code,
             d.name,
             count(j.id) as count,
-            ROUND(sum(j.area), 2) as value
-            from ams_job_info j
-            left join ams_dept d on j.dept_id = d.id
+            ifnull(ROUND(sum(j.area), 2),0) as value
+            from ams_dept d
+            left join ams_job_info j on j.dept_id = d.id and j.start_time >= #{currentYear}
             where d.region_path like concat(#{regionPath},'%')
+
             group by d.id,d.name
         </if>
     </select>