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/controller/EmergencyCountController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
index 1eeab81..bd0dd04 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
@@ -8,6 +8,7 @@
import com.gkhy.safePlatform.emergency.model.dto.resp.*;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillCountQuery;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencyDrillTimeQuery;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteNumRPCReq;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteTimeRPCReq;
@@ -90,12 +91,27 @@
* 根据部门以及子级部门查询最后一次完成应急演练的时间
*/
@RequestMapping(value = "/getLastTimeByDeptIds",method = RequestMethod.POST)
- public EmergencyExecuteTimeRespDTO getLastTimeByDeptIds(@RequestBody JSONObject jsonObject){
+ public List<EmergencyExecuteDepLevelLasTimeRespDTO> getLastTimeByDeptIds(@RequestBody JSONObject jsonObject){
Long deptId = jsonObject.getLong("deptId");
return emergencyCountService.getLastTimeByDeptIds(deptId);
}
/**
+ * 根据部门id，年份月份，查询最后一次完成应急演练的时间
+ */
+ @RequestMapping(value = "/getLastTimeByDeptIdAndTime",method = RequestMethod.POST)
+ public EmergencyExecuteLastTimeRespDTO getLastTimeByDeptIdAndTime(@RequestBody EmergencyDrillTimeQuery query){
+ return emergencyCountService.getLastPracticeTimeByDeptIdAndTime(query);
+ }
+ /**
+ * 根据部门以及子级部门，年份月份，查询最后一次完成应急演练的时间
+ */
+ @RequestMapping(value = "/getLastTimeByDeptIdsAndTime",method = RequestMethod.POST)
+ public List<EmergencyExecuteDepLevelLasTimeRespDTO> getLastTimeByDeptIdsAndTime(@RequestBody EmergencyDrillTimeQuery query){
+ return emergencyCountService.getLastPracticeTimeByDeptIdsAndTime(query);
+ }
+
+ /**
* 根据指定和年份统计演练数据
* @param query
* @return
--
Gitblit v1.9.2