fix(homepage): 修复任务查询逻辑并增加调试日志

- 注释掉检查用户提交记录的NOT EXISTS子查询以解决查询性能问题 - 在任务查询方法中添加详细的请求参数和结果日志记录 - 新增logTaskList工具方法用于输出任务列表详情便于调试 - 优化维护计划明细查询的时间范围筛选条件 - 引入ArrayUtils工具类处理时间数组参数

fix(homepage): 修复任务查询逻辑并增加调试日志
- 注释掉检查用户提交记录的NOT EXISTS子查询以解决查询性能问题 - 在任务查询方法中添加详细的请求参数和结果日志记录 - 新增logTaskList工具方法用于输出任务列表详情便于调试 - 优化维护计划明细查询的时间范围筛选条件 - 引入ArrayUtils工具类处理时间数组参数
王彪总
1 parent e8e13752
Showing 3 changed files with 48 additions and 5 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.dal.mysql.maintainplan;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.collection.ArrayUtils;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanDetailPageReqVO;
@@ -33,8 +34,8 @@ public interface MaintainPlanDetailMapper extends BaseMapperX&lt;MaintainPlanDetail
                 .eqIfPresent(MaintainPlanDetailDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(MaintainPlanDetailDO::getRoadId, reqVO.getRoadId())
                 .eqIfPresent(MaintainPlanDetailDO::getSortNum, reqVO.getSortNum())
-                .betweenIfPresent(MaintainPlanDetailDO::getBeginTime, reqVO.getBeginTime())
-                .betweenIfPresent(MaintainPlanDetailDO::getEndTime, reqVO.getEndTime())
+                .geIfPresent(MaintainPlanDetailDO::getBeginTime, ArrayUtils.get(reqVO.getBeginTime(), 0))
+                .leIfPresent(MaintainPlanDetailDO::getEndTime, ArrayUtils.get(reqVO.getEndTime(), 0))
                 .eqIfPresent(MaintainPlanDetailDO::getPlanFinishNum, reqVO.getPlanFinishNum())
                 .eqIfPresent(MaintainPlanDetailDO::getFinishState, reqVO.getFinishState())
                 .likeIfPresent(MaintainPlanDetailDO::getCreatorName, reqVO.getCreatorName())
@@ -60,4 +61,4 @@ public interface MaintainPlanDetailMapper extends BaseMapperX&lt;MaintainPlanDetail
      */
     List<AppMaintainNotFinishPlanDetailRespVO> getMaintainNotFinishPlanCommitDetail(@Param("req") AppMaintainNotFinishPlanDetailReqVO reqVO);
-}
 \ No newline at end of file
+}
@@ -429,6 +429,8 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
     @Override
     public TaskDistanceSortResultVO queryTaskDetailsWithDistance(AppTaskDistanceSortReqVO req) {
+        Log.info("queryTaskDetailsWithDistance: " + JSON.toJSONString(req));
+
         // 1. 获取当前登录用户信息
         Long userId = SecurityFrameworkUtils.getLoginUserId();
         Long deptId = SecurityFrameworkUtils.getDeptId();
@@ -506,6 +508,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
                 result.add(sortVo);
             }
         }
+        logTaskList("已办SQL原始记录", result);
         Log.info("返回App参数: " + JSON.toJSONString(result));
         return result;
     }
@@ -540,6 +543,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         LocalDateTime now = LocalDateTime.now();
         List<TaskDistanceSortRespVO> allTasks = homepageSummaryMapper
                 .queryPendingTaskDetailsWithGps(roleIds, userId, deptId, now);
+        logTaskList("待办SQL原始记录(距离排序)", allTasks);
         // 分离有 GPS 和无 GPS 任务
         List<TaskDistanceSortRespVO> tasksWithGps = new ArrayList<>();
@@ -660,6 +664,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
     @Override
     public TaskDistanceSortResultVO queryTaskDetailsWithSmartSort(AppTaskSmartSortReqVO req) {
+        Log.info("queryTaskDetailsWithSmartSort: " + JSON.toJSONString(req));
         Long userId = SecurityFrameworkUtils.getLoginUserId();
         Long deptId = SecurityFrameworkUtils.getDeptId();
@@ -706,13 +711,23 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         } catch (Exception e) {
             Log.warn("读取智能排序配置失败", e);
         }
+        Log.info("智能排序配置: distWeight=" + distWeight + ", effWeight=" + effWeight
+                + ", threshold=" + threshold + ", clamp=[" + clampMin + "," + clampMax + "]");
         // 2. 查询今日待办任务
         List<TaskDistanceSortRespVO> allTasks = homepageSummaryMapper
                 .queryPendingTaskDetailsWithGps(roleIds, userId, deptId, LocalDateTime.now());
+        Log.info("待办任务总数: " + (allTasks != null ? allTasks.size() : 0) + ", userId=" + userId + ", deptId=" + deptId);
+        logTaskList("待办SQL原始记录(智能排序)", allTasks);
         // 3. 查询效率矩阵
         Map<String, UserTaskEfficiencyDO> effMap = loadEfficiencyMap(userId);
+        Log.info("效率矩阵条目数: " + effMap.size());
+        if (!effMap.isEmpty()) {
+            effMap.forEach((k, v) -> Log.info("  eff: key=" + k + ", ratio=" + v.getEfficiencyRatio()
+                    + ", userAvg=" + v.getAvgMinutes() + ", teamAvg=" + v.getTeamAvgMinutes()
+                    + ", cnt=" + v.getCompletedCount()));
+        }
         // 4. 为每个任务打分
         List<TaskDistanceSortRespVO> tasksWithGps = new ArrayList<>();
@@ -737,10 +752,20 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
                     double distScore = Math.max(0, 1 - dist / threshold);
                     task.setDistanceScore(Math.round(distScore * 100.0) / 100.0);
                     task.setCompositeScore(Math.round((distWeight * distScore + effWeight * effScore) * 100.0) / 100.0);
+                    Log.info("  score: " + task.getTaskName() + " | dist=" + (int)dist + "m"
+                            + " | distScore=" + task.getDistanceScore()
+                            + " | effScore=" + task.getEfficiencyScore()
+                            + " | eff%=" + task.getEfficiencyPercent()
+                            + " | composite=" + task.getCompositeScore()
+                            + " | type=" + task.getTaskType() + "/" + task.getTaskSubType());
                     tasksWithGps.add(task);
                 } else {
                     task.setDistanceScore(0.0);
                     task.setCompositeScore(Math.round((effWeight * effScore) * 100.0) / 100.0);
+                    Log.info("  score(无GPS): " + task.getTaskName()
+                            + " | effScore=" + task.getEfficiencyScore()
+                            + " | eff%=" + task.getEfficiencyPercent()
+                            + " | type=" + task.getTaskType() + "/" + task.getTaskSubType());
                     tasksWithoutGps.add(task);
                 }
             }
@@ -833,4 +858,21 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         if (val < min) return min;
         return val;
     }
+
+    private void logTaskList(String tag, List<TaskDistanceSortRespVO> list) {
+        if (list == null) {
+            Log.info(tag + ": null");
+            return;
+        }
+        Log.info(tag + ": 共" + list.size() + "条");
+        for (int i = 0; i < list.size(); i++) {
+            TaskDistanceSortRespVO t = list.get(i);
+            Log.info(tag + "[" + i + "] taskName=" + t.getTaskName()
+                    + ", taskType=" + t.getTaskType()
+                    + ", planNo=" + t.getPlanNo()
+                    + ", batchNo=" + t.getBatchNo()
+                    + ", distance=" + t.getDistance()
+                    + ", lat=" + t.getTaskLat() + ", lon=" + t.getTaskLon());
+        }
+    }
 }
@@ -647,7 +647,7 @@
         <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
             #{roleId}
         </foreach>
-        AND NOT EXISTS (SELECT 1 FROM garden_inspection_plan_commit ic WHERE ic.batch_no = a.batch_no AND ic.user_id = #{userId})
+<!--        AND NOT EXISTS (SELECT 1 FROM garden_inspection_plan_commit ic WHERE ic.batch_no = a.batch_no AND ic.user_id = #{userId})-->
         AND r.starting_latitude IS NOT NULL AND r.starting_latitude != ''
         UNION ALL
@@ -677,7 +677,7 @@
         <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
             #{roleId}
         </foreach>
-        AND NOT EXISTS (SELECT 1 FROM garden_maintain_plan_commit mc WHERE mc.batch_no = a.batch_no AND mc.user_id = #{userId})
+<!--        AND NOT EXISTS (SELECT 1 FROM garden_maintain_plan_commit mc WHERE mc.batch_no = a.batch_no AND mc.user_id = #{userId})-->
         AND r.starting_latitude IS NOT NULL AND r.starting_latitude != ''
         ) t
     </select>