From 9d72eb559e67e3f0bb321198fc562f3cfd9a8625 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 21 一月 2024 20:54:33 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
index 2379fb2..c884d35 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
@@ -1,11 +1,21 @@
package com.ycl.service.equipment.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.api.CommonResult;
+import com.ycl.entity.equipment.Loudspeaker;
import com.ycl.entity.equipment.OrgGrid;
import com.ycl.mapper.equipment.OrgGridMapper;
import com.ycl.service.equipment.IOrgGridService;
+import com.ycl.vo.cockpit.statisticsEvents.GridMapVO;
+import com.ycl.vo.equipment.HandheldTerminalVo;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -18,4 +28,18 @@
@Service
public class OrgGridServiceImpl extends ServiceImpl<OrgGridMapper, OrgGrid> implements IOrgGridService {
+ @Override
+ public IPage<OrgGrid> search(Integer pageSize, Integer currentPage, String name) {
+ Page<OrgGrid> page = new Page<>(currentPage, pageSize);
+ LambdaQueryWrapper<OrgGrid> queryWrapper = new LambdaQueryWrapper<OrgGrid>()
+ .like(StringUtils.isNotBlank(name), OrgGrid::getName, name)
+ .orderByDesc(OrgGrid::getId);
+
+ return baseMapper.selectPage(page, queryWrapper);
+ }
+
+ @Override
+ public List<GridMapVO> statisticsGridMap(String beginTime, String endTime) {
+ return baseMapper.statisticsGridMap(beginTime, endTime);
+ }
}
--
Gitblit v1.8.0