Merge remote-tracking branch 'origin/master'

jiangping

2024-12-23 d70d789667434c1ba80b281f398137d66d68aa6d

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java

@@ -2,6 +2,7 @@

import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
@@ -71,6 +72,13 @@
        BoardCarsListVO data = boardService.platformJobCarsList();
        return ApiResponse.success(data);
    }
    @LoginNoRequired
    @ApiOperation("汽车告警事件集合数据")
    @GetMapping("/carsEventList")
    public ApiResponse<List<CarsAlarmResultListResponse>> carsEventList() {
        List<CarsAlarmResultListResponse> data = boardService.carsEventList();
        return ApiResponse.success(data);
    }

    @LoginNoRequired
    @ApiOperation("根据车牌号查询作业信息和合同信息集合")
@@ -102,7 +110,7 @@
                                ,Constants.PlatformJobStatus.WORKING.getKey()
                                ,Constants.PlatformJobStatus.TRANSFERING.getKey()
                                ,Constants.PlatformJobStatus.EXCEPTION.getKey()
                                ,Constants.PlatformJobStatus.DONE.getKey()
//                                ,Constants.PlatformJobStatus.DONE.getKey()
                        )
                        .orderByDesc(PlatformJob::getSignNum)
                        .last(" limit 20 ")