Merge remote-tracking branch 'origin/master'

zhoushihao

2025-05-26 88cbf1a8c50a15f35dd78a50adc43e71a6530775

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java

@@ -2,6 +2,8 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.RunTime;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.entity.request.TaskHistoryRequest;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

/**
@@ -36,5 +39,17 @@
        return Result.success(edgStorageDeviceTaskHistoryService.queryEdgStorageDeviceTaskHistory(request));
    }

    @ApiOperation(value = "查询本条线历史指定日期的日生产数据", notes = "查询本条线历史指定日期的日生产数据")
    @PostMapping("/queryEdgDailyProduction")
    public Result<DailyProductionVO> queryEdgDailyProduction(@RequestBody TaskHistoryRequest request) {
        return Result.success(edgStorageDeviceTaskHistoryService.queryEdgDailyProduction(request));
    }

    @ApiOperation(value = "查询生产线运行情况", notes = "查询生产线运行情况")
    @GetMapping("/queryRunTimes")
    public Result<List<RunTime>> queryRunTimes(String days) {
        return Result.success(edgStorageDeviceTaskHistoryService.queryRunTimes(days));
    }

}