Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-04-01 b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89

 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteMissionServiceImpl.java

@@ -9,6 +9,8 @@
import com.ard.common.utils.uuid.IdUtils;
import com.ard.route.domain.route.ArdRouteMission;
import com.ard.route.domain.route.ArdRoutePoint;
import com.ard.route.domain.route.MissionNot;
import com.ard.route.domain.route.UpdateMission;
import com.ard.route.mapper.ArdRoutePointMapper;
import com.ard.route.websocket.utils.MiWebSocketUtils;
import com.ard.system.mapper.SysUserMapper;
@@ -17,6 +19,8 @@
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteMissionMapper;
import com.ard.route.service.IArdRouteMissionService;

import static com.ard.common.utils.SecurityUtils.getUserId;


/**
@@ -82,6 +86,7 @@
        ardRouteMission.setExecuteStatus("0");
        ardRouteMission.setIsRead("0");
        ardRouteMission.setCreateTime(DateUtils.getNowDate());
        ardRouteMission.setIssuerTime(DateUtils.getNowDate());
        ardRouteMission.setIssuerName(getUserName(ardRouteMission.getIssuerId()));
        dataProcessingRoutePoint(ardRouteMission.getMissionDetailList(),ardRouteMission.getId());
        try {
@@ -101,6 +106,7 @@
     */
    @Override
    public int updateArdRouteMission(ArdRouteMission ardRouteMission) {
        validateForCreate(ardRouteMission,"2");
        ardRouteMission.setUpdateTime(DateUtils.getNowDate());
        ardRouteMission.setIssuerName(getUserName(ardRouteMission.getIssuerId()));
        // 删除航线任务航点
@@ -134,9 +140,25 @@
     */
    @Override
    public int deleteArdRouteMissionByIds(String[] ids) {
        // 删除航线任务时只能删除自己的航线任务
        for (String id : ids) {
            ArdRouteMission ardRouteMission = ardRouteMissionMapper.selectArdRouteMissionById(id);
            validateForCreate(ardRouteMission,"1");
        }
        // 删除航线任务航点
        ardRoutePointMapper.deleteArdRoutePointByMissionId(ids[0]);
        return ardRouteMissionMapper.deleteArdRouteMissionByIds(ids);
    }

    // 验证,只有当前用户是下发人才能删除修改
    private void validateForCreate(ArdRouteMission mission,String type) {
        if (!mission.getIssuerId().equals(getUserId())){
            if ("1".equals(type)){
                throw new RuntimeException("只能删除下发自己的航线任务信息【" + mission.getMissionName() + "】，无法执行操作！");
            }else if ("2".equals(type)){
                throw new RuntimeException("只能修改下发自己的航线任务信息【" + mission.getMissionName() + "】，无法执行操作！");
            }
        }
    }

    /**
@@ -147,6 +169,10 @@
     */
    @Override
    public int deleteArdRouteMissionById(String id) {
        ArdRouteMission ardRouteMission = ardRouteMissionMapper.selectArdRouteMissionById(id);
        if (ardRouteMission != null){
            validateForCreate(ardRouteMission,"1");
        }
        ardRoutePointMapper.deleteArdRoutePointByMissionId(id);
        return ardRouteMissionMapper.deleteArdRouteMissionById(id);
    }
@@ -172,13 +198,50 @@
    /**
     * 批量修改航线任务已读状态
     *
     * @param ids 主键集合
     * @param isRead 已读状态
     * @param updateMission 批量修改已读类型实体
     * @return 结果
     */
    @Override
    public int updateIsRead(String[] ids, String isRead) {
        return ardRouteMissionMapper.updateIsRead(ids,isRead);
    public int updateIsRead(UpdateMission updateMission) {
        if (updateMission == null || updateMission.getIds() == null || updateMission.getIds().length == 0) {
            return 0;
        }
        String[] ids = updateMission.getIds();
        String isRead = updateMission.getIsRead();
        return ardRouteMissionMapper.updateIsRead(ids, isRead);
    }

    /**
     * 校验航线任务是否可以创建航线
     *
     * @param id ID
     * @return 结果
     */
    @Override
    public MissionNot selectRouteMissionNot(String id) {
        // 1. 初始化返回对象，默认允许操作
        MissionNot missionNot = new MissionNot();
        missionNot.setIsNot(true);

        // 2. 根据ID查询航线任务
        ArdRouteMission mission = ardRouteMissionMapper.selectArdRouteMissionById(id);

        // 3. 空值快速返回（任务不存在则无需校验，直接允许操作）
        if (mission == null) {
            return missionNot;
        }

        // 4. 校验任务创建者是否为当前用户
        // 增加空指针防护：避免issuerId为null导致空指针异常
        if (mission.getIssuerId() == null || !mission.getIssuerId().equals(getUserId())) {
            String errorMsg = String.format("创建航线，只能创建下发自己的航线任务信息【%s】，无法执行操作！",
                    mission.getMissionName());
            missionNot.setInformation(errorMsg);
            missionNot.setIsNot(false);
        }

        // 5. 统一返回结果
        return missionNot;
    }

}