From b02213e3e6e73b2f436c3205a634145100503cb0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 10:18:02 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java            |    7 +++++++
 zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml                           |    6 ++++++
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java          |    5 +++++
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java    |    1 +
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java |   10 +++++++++-
 5 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
index 676d87b..67493d1 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
@@ -32,6 +32,7 @@
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<Agv, BaseParam> pageParam = new PageParam<>(baseParam, Agv.class);
         return R.ok().add(agvService.page(pageParam, pageParam.buildWrapper(true)));
+//        return R.ok().add(agvService.pageRel(pageParam));
     }
 
     @PreAuthorize("hasAuthority('manager:agv:list')")
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java
index e0e974f..5d412b6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/AgvMapper.java
@@ -1,7 +1,12 @@
 package com.zy.acs.manager.manager.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zy.acs.manager.manager.entity.Agv;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * AgvMapper
@@ -11,4 +16,6 @@
  */
 public interface AgvMapper extends BaseMapper<Agv> {
 
+    List<Agv> selectPageRel(@Param("page") IPage<Agv> page, @Param("param") Map<String, Object> param);
+
 }
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java
index 4552e70..25ef445 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvService.java
@@ -2,6 +2,9 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zy.acs.common.utils.JudgeSupport;
+import com.zy.acs.manager.common.domain.BaseParam;
+import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.domain.PageResult;
 import com.zy.acs.manager.core.domain.VehicleDto;
 import com.zy.acs.manager.manager.entity.Agv;
 import com.zy.acs.manager.manager.entity.AgvDetail;
@@ -17,6 +20,8 @@
  */
 public interface AgvService extends IService<Agv> {
 
+    PageResult<Agv> pageRel(PageParam<Agv, BaseParam> pageParam);
+
     Agv selectByUuid(String uuid);
 
     Agv queryIdle(Task task);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index bf4fd1e..fd096dd 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -6,13 +6,16 @@
 import com.zy.acs.common.enums.AgvStatusType;
 import com.zy.acs.common.utils.JudgeSupport;
 import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.common.domain.BaseParam;
+import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.domain.PageResult;
 import com.zy.acs.manager.core.domain.VehicleDto;
 import com.zy.acs.manager.manager.entity.*;
 import com.zy.acs.manager.manager.enums.SegmentStateType;
 import com.zy.acs.manager.manager.mapper.AgvMapper;
 import com.zy.acs.manager.manager.service.*;
 import com.zy.acs.manager.system.service.ConfigService;
-import com.zy.acs.framework.common.Cools;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +47,11 @@
     private SegmentService segmentService;
 
     @Override
+    public PageResult<Agv> pageRel(PageParam<Agv, BaseParam> pageParam) {
+        return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
+    }
+
+    @Override
     public Agv selectByUuid(String uuid) {
         return this.getOne(new LambdaQueryWrapper<Agv>().eq(Agv::getUuid, uuid));
     }
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
index 4a00516..d4ea109 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
@@ -35,4 +35,10 @@
         </where>
     </sql>
 
+    <select id="selectPageRel" resultType="com.zy.acs.manager.manager.entity.Agv">
+        select
+        *
+        from man_agv
+    </select>
+
 </mapper>

--
Gitblit v1.9.1