feat(garden): 新增任务距离排序和智能排序功能

- 实现任务按距离排序和班组进度统计功能 - 添加任务智能排序（距离+个人效率加权）功能 - 新增GPS距离计算工具类和相关数据传输对象 - 添加出行速度配置和智能排序权重配置字典类型 - 实现用户任务效率预计算定时任务 - 优化API签名切面注解使用方式 - 添加微信公众号开放平台回调接口免登录配置

feat(garden): 新增任务距离排序和智能排序功能
- 实现任务按距离排序和班组进度统计功能 - 添加任务智能排序（距离+个人效率加权）功能 - 新增GPS距离计算工具类和相关数据传输对象 - 添加出行速度配置和智能排序权重配置字典类型 - 实现用户任务效率预计算定时任务 - 优化API签名切面注解使用方式 - 添加微信公众号开放平台回调接口免登录配置
王彪总
1 parent 61c9550c
Showing 3 changed files with 21 additions and 7 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/TaskEfficiencyCalculateJob.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/UserTaskEfficiencyMapper.xml
 package com.zteits.urbanops.module.garden.job;
+import com.zteits.urbanops.framework.quartz.core.handler.JobHandler;
 import com.zteits.urbanops.module.garden.dal.dataobject.UserTaskEfficiencyDO;
 import com.zteits.urbanops.module.garden.dal.mysql.UserTaskEfficiencyMapper;
 import jakarta.annotation.Resource;
@@ -21,12 +22,13 @@ import java.util.*;
  */
 @Slf4j
 @Component
-public class TaskEfficiencyCalculateJob {
+public class TaskEfficiencyCalculateJob implements JobHandler {
     @Resource
     private UserTaskEfficiencyMapper userTaskEfficiencyMapper;
-    public void execute() {
+    @Override
+    public String execute(String param) {
         String statPeriod = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
         log.info("TaskEfficiencyCalculateJob start, statPeriod={}", statPeriod);
         try {
@@ -44,7 +46,7 @@ public class TaskEfficiencyCalculateJob {
             if (all.isEmpty()) {
                 log.info("TaskEfficiencyCalculateJob done, no data");
-                return;
+                return "success, no data";
             }
             // 4. 计算班组均值
@@ -69,8 +71,10 @@ public class TaskEfficiencyCalculateJob {
             }
             log.info("TaskEfficiencyCalculateJob done, total={}", all.size());
+            return "success, total=" + all.size();
         } catch (Exception e) {
             log.error("TaskEfficiencyCalculateJob error", e);
+            return "error: " + e.getMessage();
         }
     }
@@ -634,6 +634,18 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
     public TaskDistanceSortResultVO queryTaskDetailsWithSmartSort(AppTaskSmartSortReqVO req) {
         Long userId = SecurityFrameworkUtils.getLoginUserId();
         Long deptId = SecurityFrameworkUtils.getDeptId();
+
+        // 已办：查询已完成任务，不走智能排序
+        if (req.getQueryType() != null && req.getQueryType() == 2) {
+            List<TaskDistanceSortRespVO> sortedTasks = queryCompletedTasksWithoutGps(userId);
+            TeamProgressVO teamProgress = buildTeamProgress(userId, deptId);
+            TaskDistanceSortResultVO result = new TaskDistanceSortResultVO();
+            result.setSortedTasks(sortedTasks);
+            result.setTeamProgress(teamProgress);
+            result.setTotalPendingTasks(sortedTasks.size());
+            return result;
+        }
+
         List<Long> roleIds = roleApi.getRoleIdsByUserId(userId);
         // 1. 从字典读取配置
@@ -29,8 +29,7 @@
                SUM(TIMESTAMPDIFF(MINUTE, d.begin_time, c.finish_time)) AS total_min,
                AVG(TIMESTAMPDIFF(MINUTE, d.begin_time, c.finish_time)) AS avg_min
         FROM garden_inspection_plan_commit c
-        INNER JOIN garden_inspection_plan_detail d ON c.batch_no = d.batch_no AND c.user_id = d.user_id
-        INNER JOIN garden_inspection_plan p ON c.batch_no = p.batch_no
+        INNER JOIN garden_inspection_plan_detail d ON c.batch_no = d.batch_no         INNER JOIN garden_inspection_plan p ON c.batch_no = p.batch_no
         INNER JOIN system_users u ON c.user_id = u.id
         WHERE c.finish_time >= #{beginTime}
           AND c.finish_time IS NOT NULL
@@ -46,8 +45,7 @@
                SUM(TIMESTAMPDIFF(MINUTE, d.begin_time, c.finish_time)) AS total_min,
                AVG(TIMESTAMPDIFF(MINUTE, d.begin_time, c.finish_time)) AS avg_min
         FROM garden_maintain_plan_commit c
-        INNER JOIN garden_maintain_plan_detail d ON c.batch_no = d.batch_no AND c.user_id = d.user_id
-        INNER JOIN garden_maintain_plan p ON c.batch_no = p.batch_no
+        INNER JOIN garden_maintain_plan_detail d ON c.batch_no = d.batch_no         INNER JOIN garden_maintain_plan p ON c.batch_no = p.batch_no
         INNER JOIN system_users u ON c.user_id = u.id
         WHERE c.finish_time >= #{beginTime}
           AND c.finish_time IS NOT NULL