From e986bd63309fba70f7f3cfaf70aadec46220917b Mon Sep 17 00:00:00 2001 From: baizonghao <1719256278@qq.com> Date: 星期四, 30 三月 2023 20:06:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java index 35c2465..67a8d30 100644 --- a/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java +++ b/ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java @@ -1,7 +1,12 @@ package com.ycl.service.equipment; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.equipment.OrgGrid; +import com.ycl.vo.cockpit.statisticsEvents.GridMapVO; +import com.ycl.vo.equipment.HandheldTerminalVo; + +import java.util.List; /** * <p> @@ -13,4 +18,7 @@ */ public interface IOrgGridService extends IService<OrgGrid> { + IPage<OrgGrid> search(Integer pageSize, Integer current, String name); + + List<GridMapVO> statisticsGridMap(String beginTime, String endTime); } -- Gitblit v1.8.0