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

zhaowenyu

2026-02-06 ffe731d748e54363c715048a03857788ee62ba21

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

@@ -9,11 +9,13 @@
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.UpdateMission;
import com.ard.route.mapper.ArdRoutePointMapper;
import com.ard.route.websocket.utils.MiWebSocketUtils;
import com.ard.system.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteMissionMapper;
import com.ard.route.service.IArdRouteMissionService;
@@ -82,6 +84,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 {
@@ -92,6 +95,25 @@
        }
        return ardRouteMissionMapper.insertArdRouteMission(ardRouteMission);
    }

//    /**
//     * 定时任务，定时发送新增航线任务消息
//     */
//    @Scheduled(fixedRate = 2000)
//    public void sendMissionMessage() {
//        ArdRouteMission ardRouteMission = new ArdRouteMission();
//        ardRouteMission.setIsRead("0");
//        // 获取所有未读的消息给
//        List<ArdRouteMission> routeMissionLs = ardRouteMissionMapper.selectArdRouteMissionList(ardRouteMission);
//        for (ArdRouteMission routeMissionL : routeMissionLs) {
//           if (routeMissionL.getIssuerId() != null){
//               List<ArdRoutePoint> missionDetailList = ardRoutePointMapper.selectArdRoutePointByMissionId(routeMissionL.getId());
//               routeMissionL.setMissionDetailList(missionDetailList);
//               MiWebSocketUtils.sendMessage(routeMissionL.getIssuerId(),JSON.toJSONString(routeMissionL));
//           }
//        }
//    }


    /**
     * 修改航线任务
@@ -172,12 +194,16 @@
    /**
     * 批量修改航线任务已读状态
     *
     * @param ids 主键集合
     * @param isRead 已读状态
     * @param updateMission 批量修改已读类型实体
     * @return 结果
     */
    @Override
    public int updateIsRead(String[] ids, String 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);
    }