From f53f8878d5a6cfca44b9141938d3e65bdfcd3793 Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Wed, 19 Mar 2025 09:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yq/web/controller/nologin/NoLogin.java    |  2 +-
 .../mapper/BehaviorDetectionMapper.java       |  2 +-
 .../service/IBehaviorDetectionService.java    |  2 +-
 .../impl/BehaviorDetectionServiceImpl.java    |  2 +-
 .../mapper/system/BehaviorDetectionMapper.xml | 26 +++++++++++++------
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
index 280ff91..c17b0d0 100644
--- a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
+++ b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
@@ -233,7 +233,7 @@ public class NoLogin  extends BaseController {
     }
 
     @GetMapping("/behaviorTypeCount")
-    public List<Map<String,Object>> behaviorTypeCount()
+    public Map<String,Object> behaviorTypeCount()
     {
         return behaviorDetectionService.behaviorTypeCount();
     }
diff --git a/yq-system/src/main/java/yq/system/mapper/BehaviorDetectionMapper.java b/yq-system/src/main/java/yq/system/mapper/BehaviorDetectionMapper.java
index 35fb485..9687977 100644
--- a/yq-system/src/main/java/yq/system/mapper/BehaviorDetectionMapper.java
+++ b/yq-system/src/main/java/yq/system/mapper/BehaviorDetectionMapper.java
@@ -18,7 +18,7 @@ public interface BehaviorDetectionMapper {
 
     void updateBehavior(BehaviorDetection behaviorDetection);
 
-    List<Map<String,Object>> behaviorTypeCount();
+    Map<String,Object> behaviorTypeCount();
 
     List<Map<String,Object>> behaviorCount();
 }
\ No newline at end of file
diff --git a/yq-system/src/main/java/yq/system/service/IBehaviorDetectionService.java b/yq-system/src/main/java/yq/system/service/IBehaviorDetectionService.java
index ccb5279..03a44a4 100644
--- a/yq-system/src/main/java/yq/system/service/IBehaviorDetectionService.java
+++ b/yq-system/src/main/java/yq/system/service/IBehaviorDetectionService.java
@@ -18,7 +18,7 @@ public interface IBehaviorDetectionService {
 
     void updateBehavior(BehaviorDetection behaviorDetection);
 
-    List<Map<String,Object>>behaviorTypeCount();
+    Map<String,Object>behaviorTypeCount();
 
     List<Map<String,Object>>behaviorCount();
 
diff --git a/yq-system/src/main/java/yq/system/service/impl/BehaviorDetectionServiceImpl.java b/yq-system/src/main/java/yq/system/service/impl/BehaviorDetectionServiceImpl.java
index ed92379..5b45577 100644
--- a/yq-system/src/main/java/yq/system/service/impl/BehaviorDetectionServiceImpl.java
+++ b/yq-system/src/main/java/yq/system/service/impl/BehaviorDetectionServiceImpl.java
@@ -43,7 +43,7 @@ public class BehaviorDetectionServiceImpl implements IBehaviorDetectionService {
     }
 
     @Override
-    public List<Map<String,Object>> behaviorTypeCount() {
+    public Map<String,Object> behaviorTypeCount() {
         return behaviorDetectionMapper.behaviorTypeCount();
     }
 
diff --git a/yq-system/src/main/resources/mapper/system/BehaviorDetectionMapper.xml b/yq-system/src/main/resources/mapper/system/BehaviorDetectionMapper.xml
index d316e3d..2dabae8 100644
--- a/yq-system/src/main/resources/mapper/system/BehaviorDetectionMapper.xml
+++ b/yq-system/src/main/resources/mapper/system/BehaviorDetectionMapper.xml
@@ -71,14 +71,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from behavior_detection where behavior_type = #{behaviorType}  and water_intake is null order by create_time desc limit 1
     </select>
     <select id="behaviorTypeCount" resultType="java.util.Map">
-        select behavior_type as behaviorType,
-               CASE
-                   WHEN behavior_type = 1 THEN '饮水'
-                   WHEN behavior_type = 2 THEN '睡眠'
-                   WHEN behavior_type = 3 THEN '行走'
-                   WHEN behavior_type = 4 THEN '坐姿'
-                   ELSE '未知'
-            END AS behaviorTypeName, COUNT(id)  as  behaviorCount from behavior_detection  GROUP BY   behavior_type
+
+        SELECT
+        '饮水' AS behaviorTypeName,
+        COUNT(CASE WHEN behaviorSum > 1000 THEN 1 END) AS behaviorCount,  -- 统计饮水量大于1000的数量
+        COUNT(CASE WHEN behaviorSum &lt; 1000 THEN 1 END) AS behaviorCount1  -- 统计饮水量小于1000的数量
+        FROM (
+
+        SELECT
+        face_name AS faceName,
+        SUM( id ) AS behaviorSum
+        FROM
+        behavior_detection
+        WHERE
+        behavior_type = 1
+        AND 	date_format(create_time,'%y%m%d') >= date_format(now(),'%y%m%d')
+        GROUP BY
+        face_id,face_name
+        ) b
     </select>
     <select id="behaviorCount" resultType="java.util.Map">
         select face_name as faceName,COUNT(id)  as  behaviorCount  ,