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

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

feat(garden): 新增任务距离排序和智能排序功能
- 实现任务按距离排序和班组进度统计功能 - 添加任务智能排序（距离+个人效率加权）功能 - 新增GPS距离计算工具类和相关数据传输对象 - 添加出行速度配置和智能排序权重配置字典类型 - 实现用户任务效率预计算定时任务 - 优化API签名切面注解使用方式 - 添加微信公众号开放平台回调接口免登录配置
王彪总
1 parent 5618a89b
Showing 5 changed files with 19 additions and 14 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/homepage/AppHomepageSummaryController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/homepage/HomepageSummaryMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/CommonConstants.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
@@ -2,10 +2,7 @@ package com.zteits.urbanops.module.garden.controller.app.homepage;
  
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.AppHomePageSummaryPageReqVO;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.AppHomePageSummaryReqVO;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskCompletionStatusRspVo;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo;
+import com.zteits.urbanops.module.garden.controller.app.homepage.vo.*;
 import com.zteits.urbanops.module.garden.service.homepage.HomepageSummaryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -6,6 +6,7 @@ import com.zteits.urbanops.module.garden.controller.admin.homepage.vo.CommitTask
 import com.zteits.urbanops.module.garden.controller.admin.homepage.vo.CommitWorkOrderRespVo;
 import com.zteits.urbanops.module.garden.controller.admin.homepage.vo.CommitWorkOrderSourceRespVo;
 import com.zteits.urbanops.module.garden.controller.admin.homepage.vo.WorkOrderTrendRespVo;
+import com.zteits.urbanops.module.garden.controller.app.homepage.vo.AppWorkOrderSummaryVo;
 import com.zteits.urbanops.module.garden.controller.app.homepage.vo.CommonTaskStatusVo;
 import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskCompletionStatusRspVo;
 import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo;
@@ -26,4 +26,7 @@ public interface CommonConstants {
  
     /*积分来源 01:任务反馈*/
     public static final String UNIT_INTEGRAL_SOURCE_TYPE_01 = "01";
+
+    /*全域督察员角色标识*/
+    public static final String INSPECTOR_ROLE_KEY = "inspector";
 }
 package com.zteits.urbanops.module.garden.service.homepage;
  
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.AppHomePageSummaryPageReqVO;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.AppHomePageSummaryReqVO;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.AppTaskDistanceSortReqVO;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.AppTaskSmartSortReqVO;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskCompletionStatusRspVo;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo;
-import com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDistanceSortResultVO;
+import com.zteits.urbanops.module.garden.controller.app.homepage.vo.*;
  
 import java.util.List;
 import java.util.Map;
@@ -10,20 +10,28 @@ import com.zteits.urbanops.framework.common.util.date.LocalDateTimeUtils;
 import com.zteits.urbanops.framework.mybatis.core.query.QueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
 import com.zteits.urbanops.module.garden.controller.app.homepage.vo.*;
+import com.zteits.urbanops.module.garden.dal.dataobject.UserTaskEfficiencyDO;
+import com.zteits.urbanops.module.garden.enums.CommonConstants;
 import com.zteits.urbanops.module.garden.dal.dataobject.taskstatistics.TaskStatisticsDO;
+import com.zteits.urbanops.module.garden.dal.mysql.UserTaskEfficiencyMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.homepage.HomepageSummaryMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.taskstatistics.TaskStatisticsMapper;
+import com.zteits.urbanops.module.garden.util.GpsDistanceUtil;
 import com.zteits.urbanops.module.system.api.dept.DeptApi;
+import com.zteits.urbanops.module.system.api.dict.DictDataApi;
 import com.zteits.urbanops.module.system.api.permission.RoleApi;
 import com.zteits.urbanops.module.system.api.user.AdminUserApi;
 import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
+import com.zteits.urbanops.module.system.enums.DictTypeConstants;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
+import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -33,6 +41,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
  
+import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
 /**
  * @Classname HomepageSummaryServiceImpl
  * @Description 首页统计实现
@@ -66,7 +76,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
  
     @Override
     public List<TaskCompletionStatusRspVo> taskCompletionSummary(AppHomePageSummaryReqVO req) {
-        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        Long userId = getLoginUserId();
         //巡查任务和养护任务已完成，未完成数量统计
         //返回数据初始化
         List<String> days = getDays(req.getBeginTime(), req.getEndTime());
@@ -112,7 +122,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
  
     @Override
     public PageResult<TaskDetailsRspVo> queryTaskDetails(AppHomePageSummaryPageReqVO req) {
-        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        Long userId = getLoginUserId();
         IPage<TaskDetailsRspVo> mpPage = MyBatisUtils.buildPage(req);
         if (req.getQueryType() == 2) {
             //已完成
@@ -120,7 +130,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{
         } else {
             //待办
             Long deptId = SecurityFrameworkUtils.getDeptId();
-            List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+            List<Long> roleIds = roleApi.getRoleIdsByUserId(getLoginUserId());
             mpPage = homepageSummaryMapper.queryPendingTaskDetails(mpPage, roleIds, userId, deptId, LocalDateTime.now());
         }
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());