From ed156c45cf703b45692c01015103be945f1e4447 Mon Sep 17 00:00:00 2001 From: whycxzp <glperry@163.com> Date: 星期三, 26 三月 2025 15:01:49 +0800 Subject: [PATCH] 巡检任务 --- src/main/java/com/whyc/dto/InspectionTask.java | 28 ++++++++++++++++++++++++++++ src/main/java/com/whyc/service/FireRobotService.java | 10 ++++++++++ src/main/java/com/whyc/controller/InterfaceFireRobotController.java | 11 +++++++++++ 3 files changed, 49 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/whyc/controller/InterfaceFireRobotController.java b/src/main/java/com/whyc/controller/InterfaceFireRobotController.java index ed5e418..c5c0a6f 100644 --- a/src/main/java/com/whyc/controller/InterfaceFireRobotController.java +++ b/src/main/java/com/whyc/controller/InterfaceFireRobotController.java @@ -1,10 +1,13 @@ package com.whyc.controller; +import com.github.pagehelper.PageInfo; +import com.whyc.dto.InspectionTask; import com.whyc.dto.Response; import com.whyc.dto.WmsPalletDto; import com.whyc.service.FireRobotService; import com.whyc.service.WmsService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,4 +46,12 @@ return service.specifyTask(interval,progress,direction); } + @ApiOperation("鏌ヨ鍒嗛〉-宸℃浠诲姟") + @GetMapping("getPageOfInspectionTask") + public Response<PageInfo<InspectionTask>> getPageOfInspectionTask(@RequestParam int pageNum, @RequestParam int pageSize){ + + return service.getPageOfInspectionTask(pageNum,pageSize); + } + + } diff --git a/src/main/java/com/whyc/dto/InspectionTask.java b/src/main/java/com/whyc/dto/InspectionTask.java new file mode 100644 index 0000000..8a15587 --- /dev/null +++ b/src/main/java/com/whyc/dto/InspectionTask.java @@ -0,0 +1,28 @@ +package com.whyc.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.util.Date; + +/** + * 宸℃浠诲姟 + */ +@ToString +@Data +public class InspectionTask { + + @ApiModelProperty("宸℃鏃ユ湡") + private Date date; + + @ApiModelProperty("宸℃娆℃暟") + private String num; + + @ApiModelProperty("宸℃瑙嗛url") + private String videoUrl; + + @ApiModelProperty("宸℃鏂囨。url") + private String docUrl; + +} diff --git a/src/main/java/com/whyc/service/FireRobotService.java b/src/main/java/com/whyc/service/FireRobotService.java index 7733c5c..614774b 100644 --- a/src/main/java/com/whyc/service/FireRobotService.java +++ b/src/main/java/com/whyc/service/FireRobotService.java @@ -1,6 +1,8 @@ package com.whyc.service; +import com.github.pagehelper.PageInfo; import com.google.gson.reflect.TypeToken; +import com.whyc.dto.InspectionTask; import com.whyc.dto.Response; import com.whyc.dto.WmsMaterialDto; import com.whyc.util.HttpUtil; @@ -54,4 +56,12 @@ } return response; } + + public Response<PageInfo<InspectionTask>> getPageOfInspectionTask(int pageNum, int pageSize) { + //鏌ヨ鍥哄畾浣嶇疆鐨勬枃浠舵暟 + //鍐嶉�氳繃浼犲叆鐨刾ageNum鍜宲ageSize鏉ヨ幏鍙� 鏂囦欢椤哄簭鐨勮捣姝㈠叿浣搃ndex鍊� + + PageInfo<InspectionTask> pageInfo = new PageInfo<>(); + return new Response().set(1,pageInfo); + } } -- Gitblit v1.9.1