From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 23 二月 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
index 2ff3ce5..06ea050 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
@@ -2,12 +2,8 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountData;
-import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo;
-import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoDetailDO;
-import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoPageDO;
+import com.gkhy.safePlatform.emergency.entity.*;
 import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery;
-import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteRPCDBQuery;
 
 import java.util.List;
 
@@ -28,7 +24,25 @@
 
     Integer selectEmergencyDrillExecuteIntervalTime();
 
-    List<EmergencyDrillExecuteCountData> selectByMouthTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery);
+    List<EmergencyDrillExecuteCountData> selectByMonthAndDept(String startTime ,String endTime ,List<Long> deptIds);
 
-    List<EmergencyDrillExecuteCountData> selectByYearTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery);
+    List<EmergencyDrillExecuteCountData> selectByYearAndDept(String startTime ,String endTime ,List<Long> deptIds);
+
+    List<EmergencyDrillExecuteCountRPC> selectByDayAndDept(String startTime, String endTime, List<Long> deptIds);
+
+    List<EmergencyDrillExecuteCountRPC> selectByMonthAndDeptForIntegerMonth(String startTime, String endTime, List<Long> deptIds);
+
+    String selectEmergencyDrillExecuteIntervalTimeByDeptId(Long deptId);
+
+    String getLastTimeByDeptId(Long deptId);
+
+    List<EmergencyDrillExecuteLastTimeDO> getLastTimeByDeptIds(List<Long> deptIdList);
+
+    List<EmergencyExecuteCountDO> getCountByDeptIdsAndTime(String startTime, String endTime, List<Long> deptId);
+    EmergencyExecuteCountDO getCountByDeptIdAndMonth(Integer year,Integer month, Long deptId);
+
+    List<EmergencyExecuteCountDO> getCountByDeptIdAndYear(Integer year, Long deptId);
+    List<EmergencyDrillExecuteLastTimeDO> getLastTimeByDeptIdsAndTime(List<Long> deptIdList,String startTime,String endTime);
+
+    String getLastTimeByDeptIdAndTime(Long deptId, String startTime, String endTime);
 }

--
Gitblit v1.9.2