From c96f661e27bc08029af99908e287528af09efb30 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Fri, 7 Jun 2024 11:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=80=9F=E4=BB=AA=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anemometer/AnemometerController.java           | 14 ++++++++++++++
 .../anemometer/AnemometerLocalMapper.java          |  3 +++
 .../announcement/AnemometerLocalService.java       |  3 +++
 .../impl/AnemometerLocalServiceImpl.java           |  6 ++++++
 .../anemometer/AnemometerLocalMapper.xml           | 13 +++++++++++++
 5 files changed, 39 insertions(+)

diff --git a/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java b/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java
index 1497587e..b05d2f77 100644
--- a/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java
+++ b/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java
@@ -11,6 +11,7 @@ import com.zcloud.service.gatemachine.GateAreaService;
 import com.zcloud.util.DateUtil;
 import com.zcloud.util.ReturnMap;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -147,4 +148,17 @@ public class AnemometerController extends BaseController {
         returnMap.put("varList",dataList);
         return returnMap;
     }
+
+
+    @RequestMapping(value = "/listInfoPage")
+    @ResponseBody
+    public ReturnMap listInfoPage(Page page) {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pageData = this.getPageData();
+        page.setPd(pageData);
+        List<PageData> data = anemometerLocalService.getInfolistpage(page);
+        returnMap.put("varList", data);
+        returnMap.put("page", page);
+        return returnMap;
+    }
 }
diff --git a/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerLocalMapper.java b/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerLocalMapper.java
index 4c811256..b68d8cb9 100644
--- a/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerLocalMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/anemometer/AnemometerLocalMapper.java
@@ -1,5 +1,6 @@
 package com.zcloud.mapper.datasource.anemometer;
 
+import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 
 import java.util.List;
@@ -43,4 +44,6 @@ public interface AnemometerLocalMapper {
     void BatchinsertInfo(List<PageData> listPd);
 
 
+    List<PageData> getInfolistPage(Page page);
+
 }
diff --git a/src/main/java/com/zcloud/service/announcement/AnemometerLocalService.java b/src/main/java/com/zcloud/service/announcement/AnemometerLocalService.java
index b8d256bb..7fd6e4d7 100644
--- a/src/main/java/com/zcloud/service/announcement/AnemometerLocalService.java
+++ b/src/main/java/com/zcloud/service/announcement/AnemometerLocalService.java
@@ -1,5 +1,6 @@
 package com.zcloud.service.announcement;
 
+import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 
 import java.util.List;
@@ -41,4 +42,6 @@ public interface AnemometerLocalService {
      * @throws Exception
      */
     public void BatchinsertInfo(List<PageData> listPd);
+
+    public List<PageData> getInfolistpage(Page page);
 }
diff --git a/src/main/java/com/zcloud/service/announcement/impl/AnemometerLocalServiceImpl.java b/src/main/java/com/zcloud/service/announcement/impl/AnemometerLocalServiceImpl.java
index 2e6ab7f0..0c6d72e3 100644
--- a/src/main/java/com/zcloud/service/announcement/impl/AnemometerLocalServiceImpl.java
+++ b/src/main/java/com/zcloud/service/announcement/impl/AnemometerLocalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zcloud.service.announcement.impl;
 
+import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.datasource.anemometer.AnemometerLocalMapper;
 import com.zcloud.service.announcement.AnemometerLocalService;
@@ -50,4 +51,9 @@ public class AnemometerLocalServiceImpl implements AnemometerLocalService {
     public void BatchinsertInfo(List<PageData> listPd) {
         anemometerLocalMapper.BatchinsertInfo(listPd);
     }
+
+    @Override
+    public List<PageData> getInfolistpage(Page page) {
+        return anemometerLocalMapper.getInfolistPage(page);
+    }
 }
diff --git a/src/main/resources/mybatis/datasource/anemometer/AnemometerLocalMapper.xml b/src/main/resources/mybatis/datasource/anemometer/AnemometerLocalMapper.xml
index 80fd72de..347e2cbb 100644
--- a/src/main/resources/mybatis/datasource/anemometer/AnemometerLocalMapper.xml
+++ b/src/main/resources/mybatis/datasource/anemometer/AnemometerLocalMapper.xml
@@ -104,6 +104,19 @@
 		where
 		f.FNAME = #{FNAME}
 	</select>
+
+
+	<select id="getInfolistPage" parameterType="page" resultType="pd">
+		SELECT
+			r.*
+		FROM
+			bus_anemometer_machine f
+		LEFT JOIN bus_anemometer_local r ON f.FNAME = r.FNAME
+		WHERE
+			f.FNAME = #{pd.FNAME}
+		ORDER BY
+		    r.FTIME DESC
+	</select>
 </mapper>