fix:修复

wzp

2025-05-13 81e1be286fecfc279731ced211d5315b4dfee00f

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java

@@ -1,6 +1,13 @@
package com.ruoyi.web.controller.system;

import java.util.List;
import java.util.*;

import com.ruoyi.system.domain.DispatchOrd;
import com.ruoyi.system.domain.TbOrders;
import com.ruoyi.system.domain.TbVehicleOrder;
import com.ruoyi.system.service.IDispatchOrdService;
import com.ruoyi.system.service.ITbOrdersService;
import com.ruoyi.system.service.ITbVehicleOrderService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -11,6 +18,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -29,13 +38,84 @@
    @Autowired
    private IVehicleGpsService vehicleGpsService;

    /**
    @Autowired
    private ITbVehicleOrderService tbVehicleOrderService;

    @Autowired
    private IDispatchOrdService dispatchOrdService;

    @Autowired
    private ITbOrdersService tbOrdersService;

   /**
     * 查询车辆GPS坐标列表
     */
     */  
    @PreAuthorize("@ss.hasPermi('system:gps:list')")
    @GetMapping("/list")
    public TableDataInfo list(VehicleGps vehicleGps) {

        startPage();
        // 设置按时间倒序排序
        vehicleGps.setOrderByColumn("collect_time");
        vehicleGps.setIsAsc("desc");
        List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
        return getDataTable(list);
    }
    @Anonymous(needSign=true)   
    @GetMapping("/anonymousList")
    public TableDataInfo anonymousList(VehicleGps vehicleGps) {

        if(vehicleGps.getOrderId()==null)
        {
            return getDataTable(new ArrayList<>());
        }

        //查询订单
        TbVehicleOrder tbVehicleOrder = tbVehicleOrderService.selectTbVehicleOrderById(vehicleGps.getOrderId());
        if(tbVehicleOrder==null)
        {
            return getDataTable(new ArrayList<>());
        }

        if(!Objects.equals(tbVehicleOrder.getStatus(), "0"))
        {
            //非0表示订单完成了。
            try {
                TbOrders tbOrders = tbOrdersService.selectTbOrdersByOrderID(vehicleGps.getOrderId());
                if (tbOrders == null) {
                    return getDataTable(new ArrayList<>());
                }


                DispatchOrd dispatchOrd = dispatchOrdService.selectDispatchOrdByServiceOrdIDDt(tbOrders.getServiceOrdID());
                if (dispatchOrd == null) {
                    return getDataTable(new ArrayList<>());
                }

                Map<String, Object> params = new HashMap<>();
                params.put("beginTime", dispatchOrd.getDispatchOrdStartDate());
                params.put("endTime", dispatchOrd.getDispatchOrdUpdateTime());

                vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
                startPage();
                // 设置按时间倒序排序
                vehicleGps.setOrderByColumn("collect_time");
                vehicleGps.setIsAsc("desc");
                List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
                return getDataTable(list);
            }
            catch (Exception ex)
            {
                logger.error("已完成的订单查询地图异常：{}",ex.getMessage());
                return getDataTable(new ArrayList<>());
            }
        }

        vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
        startPage();
        // 设置按时间倒序排序
        vehicleGps.setOrderByColumn("collect_time");
        vehicleGps.setIsAsc("desc");
        List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
        return getDataTable(list);
    }
@@ -47,6 +127,9 @@
    @Log(title = "车辆GPS坐标", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(VehicleGps vehicleGps) {
        // 设置按时间倒序排序
        vehicleGps.setOrderByColumn("collect_time");
        vehicleGps.setIsAsc("desc");
        List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
        ExcelUtil<VehicleGps> util = new ExcelUtil<VehicleGps>(VehicleGps.class);
        return util.exportExcel(list, "车辆GPS坐标数据");