966120
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
wlzboy
2026-03-24 6676a35122fd9c97d1b1679c211bc8a9b97f08f2 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java


@@ -27,6 +27,7 @@


import com.ruoyi.system.domain.SysTaskVehicle;


import com.ruoyi.system.domain.SysTaskAttachment;


import com.ruoyi.system.domain.SysTaskLog;


import com.ruoyi.system.domain.SysTaskStatusHistory;


import com.ruoyi.system.domain.SysTaskEmergency;


import com.ruoyi.system.domain.SysTaskWelfare;


import com.ruoyi.system.domain.SysTaskAssignee;


@@ -56,6 +57,9 @@


    


    @Autowired


    private SysTaskLogMapper sysTaskLogMapper;




    @Autowired


    private SysTaskStatusHistoryMapper sysTaskStatusHistoryMapper;


    


    @Autowired


    private SysTaskEmergencyMapper sysTaskEmergencyMapper;


@@ -951,6 +955,15 @@


            recordTaskLog(task.getTaskId(), "FORCE_COMPLETE", "强制完成任务", 


                         oldStatus, task.getTaskStatus(), 


                         SecurityUtils.getUserId(), SecurityUtils.getUsername());


            // 写入状态变更历史记录


            recordStatusHistory(oldTask, oldStatus,


                    oldTaskStatus != null ? oldTaskStatus.getInfo() : oldStatus,


                    task.getTaskStatus(),


                    TaskStatus.getByCode(task.getTaskStatus()) != null ? TaskStatus.getByCode(task.getTaskStatus()).getInfo() : task.getTaskStatus(),


                    task.getRemark(),


                    SysTaskStatusHistory.SOURCE_APP,


                    SecurityUtils.getUserId(), SecurityUtils.getUsername(),


                    null);


            


            // 发布任务状态变更事件


            TaskStatus newTaskStatus = TaskStatus.getByCode(task.getTaskStatus());


@@ -1021,6 +1034,12 @@


            recordTaskLog(taskId, "STATUS_CHANGE", "状态变更", 


                         "状态：" + oldTaskStatus.getInfo(), 


                         "状态：" + newStatus.getInfo() + "，备注：" + remark, 


                         SecurityUtils.getUserId(), SecurityUtils.getUsername(),


                         locationLog);


            // 写入状态变更历史记录


            recordStatusHistory(oldTask, oldTaskStatus.getCode(), oldTaskStatus.getInfo(),


                    newStatus.getCode(), newStatus.getInfo(), remark,


                    SysTaskStatusHistory.SOURCE_APP,


                         SecurityUtils.getUserId(), SecurityUtils.getUsername(),


                         locationLog);


        }


@@ -1486,6 +1505,51 @@


    }




    /**


     * 记录任务状态变更历史


     *


     * @param task            任务对象（取 task_id / task_code）


     * @param fromStatus      变更前状态码


     * @param fromStatusName  变更前状态名称


     * @param toStatus        变更后状态码


     * @param toStatusName    变更后状态名称


     * @param changeReason    变更原因/备注


     * @param changeSource    触发来源（APP / ADMIN / SYSTEM / LEGACY）


     * @param operatorId      操作人 ID


     * @param operatorName    操作人姓名


     * @param locationLog     GPS 位置信息（可为 null）


     */


    private void recordStatusHistory(SysTask task,


                                     String fromStatus, String fromStatusName,


                                     String toStatus, String toStatusName,


                                     String changeReason, String changeSource,


                                     Long operatorId, String operatorName,


                                     SysTaskLog locationLog) {


        try {


            SysTaskStatusHistory history = new SysTaskStatusHistory();


            history.setTaskId(task.getTaskId());


            history.setTaskCode(task.getTaskCode());


            history.setFromStatus(fromStatus);


            history.setFromStatusName(fromStatusName);


            history.setToStatus(toStatus);


            history.setToStatusName(toStatusName);


            history.setChangeReason(changeReason);


            history.setChangeSource(changeSource != null ? changeSource : SysTaskStatusHistory.SOURCE_APP);


            history.setOperatorId(operatorId);


            history.setOperatorName(operatorName);


            history.setChangeTime(DateUtils.getNowDate());


            history.setIpAddress("127.0.0.1");


            if (locationLog != null) {


                history.setLongitude(locationLog.getLongitude());


                history.setLatitude(locationLog.getLatitude());


                history.setLocationAddress(locationLog.getLocationAddress());


            }


            sysTaskStatusHistoryMapper.insert(history);


        } catch (Exception e) {


            log.error("记录任务状态变更历史失败, taskId={}", task.getTaskId(), e);


        }


    }




    /**


     * 构建任务描述


     * 


     * @param task 任务对象


@@ -1635,6 +1699,13 @@


        }


    }




    private AjaxResult getCheckCanSuccess(){


        List<Map<String, Object>> conflicts = new ArrayList<>();


        Map<String, Object> result = new HashMap<>();


        result.put("valid", conflicts.isEmpty());


        result.put("conflicts", conflicts);


        return AjaxResult.success(result);


    }


    /**


     * 检查任务是否可以出发


     * 检查：


@@ -1646,13 +1717,18 @@


     */


    @Override


    public AjaxResult checkTaskCanDepart(Long taskId) {


        return getCheckCanSuccess();


    }




    public AjaxResult checkTaskCanDepartOld(Long taskId) {


        List<Map<String, Object>> conflicts = new ArrayList<>();


        Map<String, Object> result = new HashMap<>();




        // 获取任务详情


        SysTask task = this.getTaskDetail(taskId);


        if (task == null) {


            return AjaxResult.error("任务不存在");


        }


        


        List<Map<String, Object>> conflicts = new ArrayList<>();


        


        // 1. 检查车辆是否有未完成的任务


        List<SysTaskVehicle> taskVehicles = task.getAssignedVehicles();


@@ -1728,8 +1804,7 @@


            }


        }


        


        // 返回结果


        Map<String, Object> result = new HashMap<>();




        result.put("valid", conflicts.isEmpty());


        result.put("conflicts", conflicts);