From 30fb0df4a38b3ca17889f56474ad2c0e096769d6 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Wed, 19 Nov 2025 11:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/ZhkjAppletCloudApplication.java   |  1 +
 zh-module-applet/zh-applet-api/pom.xml               |  6 ++++++
 .../system/applet/client/ZhAdminFeignClient.java     | 12 ++++++++++++
 .../applet/mapper/xml/SurvAlertRecordMapper.xml      |  4 ++--
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java

diff --git a/jeecg-server-cloud/zhkj-applet-cloud-start/src/main/java/org/jeecg/ZhkjAppletCloudApplication.java b/jeecg-server-cloud/zhkj-applet-cloud-start/src/main/java/org/jeecg/ZhkjAppletCloudApplication.java
index 0021c9a..598b1cf 100644
--- a/jeecg-server-cloud/zhkj-applet-cloud-start/src/main/java/org/jeecg/ZhkjAppletCloudApplication.java
+++ b/jeecg-server-cloud/zhkj-applet-cloud-start/src/main/java/org/jeecg/ZhkjAppletCloudApplication.java
@@ -24,6 +24,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication
 @EnableScheduling
 @MapperScan("org.jeecg.system.applet.mapper")
+@EnableFeignClients
 public class ZhkjAppletCloudApplication  implements CommandLineRunner {
 
     @Autowired
diff --git a/zh-module-applet/zh-applet-api/pom.xml b/zh-module-applet/zh-applet-api/pom.xml
index 3edc4b8..a9c840f 100644
--- a/zh-module-applet/zh-applet-api/pom.xml
+++ b/zh-module-applet/zh-applet-api/pom.xml
@@ -74,6 +74,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- feign -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
     </dependencies>
 	
 </project>
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java
new file mode 100644
index 0000000..0535320
--- /dev/null
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/client/ZhAdminFeignClient.java
@@ -0,0 +1,12 @@
+package org.jeecg.system.applet.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+@FeignClient(value = "zh-applet-admin")
+public interface ZhAdminFeignClient {
+
+    @GetMapping("/inner/b/hello/{name}")
+    String callServiceB(@PathVariable("name") String name);
+}
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
index 96002e9..688f8fa 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
@@ -78,14 +78,14 @@
         SELECT
         DATE(ALERT_TIME) as date_part,
         HOUR(ALERT_TIME) as hour_part,
-        FLOOR(MINUTE(ALERT_TIME) / 5) as minute_group,
+        FLOOR(MINUTE(ALERT_TIME) / 15) as minute_group,
         MIN(ALERT_TIME) as first_time_in_interval
         FROM surv_alert_record
         WHERE ALERT_TIME &gt;= #{startDateTime} AND ALERT_TIME &lt;= #{endDateTime} AND DEPLOY_ID = #{deployId} AND ITEM_CODE = #{itemCode}
         GROUP BY date_part, hour_part, minute_group
         ) t2 ON DATE(t1.ALERT_TIME) = t2.date_part
         AND HOUR(t1.ALERT_TIME) = t2.hour_part
-        AND FLOOR(MINUTE(t1.ALERT_TIME) / 5) = t2.minute_group
+        AND FLOOR(MINUTE(t1.ALERT_TIME) / 15) = t2.minute_group
         AND t1.ALERT_TIME = t2.first_time_in_interval
         ) ad ON ad.ALERT_TIME >= ti.interval_start
         AND ad.ALERT_TIME &lt; DATE_ADD(ti.interval_start, INTERVAL 5 MINUTE)