From 197a596d8787eaab061190dc66977e33b6bcee96 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 06 九月 2023 14:27:00 +0800
Subject: [PATCH] 优化电子围栏报警触发条件

---
 ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
index 8d48079..f7c00f6 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
@@ -4,6 +4,7 @@
 import com.ruoyi.app.task.domain.ArdAppTask;
 import com.ruoyi.app.task.domain.ArdAppTaskDetail;
 import com.ruoyi.app.task.domain.ArdAppTaskPic;
+import com.ruoyi.app.taskdetail.domain.ArdAppTaskDetailPic;
 
 /**
  * app浠诲姟绠＄悊Mapper鎺ュ彛
@@ -19,8 +20,14 @@
      * @param id app浠诲姟绠＄悊涓婚敭
      * @return app浠诲姟绠＄悊
      */
-    public ArdAppTask selectArdAppTaskByIdWithPic(String id);
-    public ArdAppTask selectArdAppTaskByIdWithDetail(String id);
+    public ArdAppTask selectArdAppTaskById(String id);
+    /**
+     * 閫氳繃浠诲姟璇︽儏ID鏌ヨ浠诲姟璇︽儏
+     *
+     * @param id app浠诲姟璇︽儏涓婚敭
+     * @return app浠诲姟璇︽儏
+     */
+    public ArdAppTaskDetail selectArdAppTaskDetailById(String id);
     /**
      * 鏌ヨapp浠诲姟绠＄悊鍒楄〃
      *
@@ -28,6 +35,24 @@
      * @return app浠诲姟绠＄悊闆嗗悎
      */
     public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask);
+    /**
+     * 鏌ヨapp浠诲姟绠＄悊鍒楄〃甯﹁鎯呭浘鐗�
+     *
+     * @param ardAppTask app浠诲姟绠＄悊
+     * @return app浠诲姟绠＄悊闆嗗悎
+     */
+    public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask);
+    public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask);
+    /**
+     * 鎸変换鍔d鏌ヨ浠诲姟璇︽儏鍒楄〃
+     *
+     */
+    public List<ArdAppTaskDetail> selectArdAppTaskDetailListByTaskId(String task_id);
+    /**
+     * 鎸変换鍔d鏌ヨ涓嬪彂鐨刟pp鐢ㄦ埛id鍒楄〃
+     *
+     */
+    public List<String> selectArdAppTaskDetailUserIdsByTaskId(String task_id);
 
     /**
      * 鏂板app浠诲姟绠＄悊
@@ -110,4 +135,50 @@
      * @return 缁撴灉
      */
     public int deleteArdAppTaskDetailByTaskId(String id);
+
+    /**
+     * 淇敼app浠诲姟璇︽儏
+     *
+     * @param ardAppTaskDetail app浠诲姟璇︽儏瀵硅薄
+     * @return 缁撴灉
+     */
+    public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail);
+    public int updateArdAppTaskDetailByTaskId(ArdAppTaskDetail ardAppTaskDetail);
+    /**
+     * 淇敼app浠诲姟璇︽儏鏌ョ湅
+     *
+     * @param ardAppTaskDetail app浠诲姟璇︽儏瀵硅薄
+     * @return 缁撴灉
+     */
+    public int updateArdAppTaskDetailView(ArdAppTaskDetail ardAppTaskDetail);
+    /**
+     * 鎵归噺鏂板app浠诲姟璇︽儏鍥剧墖
+     *
+     * @param ardAppTaskDetailPicList app浠诲姟璇︽儏鍥剧墖鍒楄〃
+     * @return 缁撴灉
+     */
+    public int batchArdAppTaskDetailPic(List<ArdAppTaskDetailPic> ardAppTaskDetailPicList);
+
+    /**
+     * 鎵归噺鍒犻櫎app浠诲姟璇︽儏鍥剧墖
+     *
+     * @param id 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteArdAppTaskDetailPicByTaskDetailId(String id);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛鏈�鏂扮殑浠诲姟
+     *
+     * @param userId app鐢ㄦ埛Id
+     * @return 缁撴灉
+     */
+    public ArdAppTask selectNewArdAppTaskByUserId(String userId);
+    /**
+     * 鏌ヨ宸插脊绐椾絾鏈鐨勪换鍔℃暟閲�
+     *
+     * @param userId app鐢ㄦ埛Id
+     * @return 缁撴灉
+     */
+    public int selectUnreadArdAppTaskCount(String userId);
 }

--
Gitblit v1.9.3