From 8219cdfcb825b6d75c3a235a7e5195c8cac9a2ea Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 06 九月 2022 11:32:14 +0800
Subject: [PATCH] 统计接口rpc
---
incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java | 4
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 31 +++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 47 +++++++----
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteCountRPC.java | 25 ++++++
/dev/null | 25 ------
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java | 10 --
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCountRPC.java | 6
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java | 29 ++++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java | 7 +
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java | 2
incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java | 8 +-
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java | 10 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java | 4
14 files changed, 130 insertions(+), 82 deletions(-)
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/EmergencyDrillExecuteCountData.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/EmergencyDrillExecuteCountData.java
deleted file mode 100644
index c209a72..0000000
--- a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/EmergencyDrillExecuteCountData.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gkhy.safePlatform.emergency.rpc.api.model;
-
-
-public class EmergencyDrillExecuteCountData {
-
- private Integer num ;
-
- private String name ;
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java
index 80a18b3..4171cc1 100644
--- a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java
@@ -1,8 +1,6 @@
package com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp;
-import com.gkhy.safePlatform.emergency.rpc.api.model.EmergencyDrillExecuteCountData;
-
import java.util.List;
import java.util.Map;
@@ -17,8 +15,8 @@
// 部门级别
private Integer deptLevel;
- // 名称+数据
- private List<Map<String ,String>> data;
+ // 名称+数据 1如果为查询的是年：返回的name为月份 2如果查询的是月，返回的name为天
+ private List<Map<String ,Integer>> data;
public Long getDeptId() {
return deptId;
@@ -44,11 +42,11 @@
this.deptLevel = deptLevel;
}
- public List<Map<String, String>> getData() {
+ public List<Map<String, Integer>> getData() {
return data;
}
- public void setData(List<Map<String, String>> data) {
+ public void setData(List<Map<String, Integer>> data) {
this.data = data;
}
}
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java
index d0a02b1..c171595 100644
--- a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java
@@ -15,9 +15,6 @@
//上次演练的时间
private String lastTime;
- // 距离上次演练的天数
- private Integer days;
-
public Long getDeptId() {
return deptId;
}
@@ -50,11 +47,4 @@
this.lastTime = lastTime;
}
- public Integer getDays() {
- return days;
- }
-
- public void setDays(Integer days) {
- this.days = days;
- }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteCountRPC.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteCountRPC.java
new file mode 100644
index 0000000..e05b433
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteCountRPC.java
@@ -0,0 +1,25 @@
+package com.gkhy.safePlatform.emergency.entity;
+
+
+public class EmergencyDrillExecuteCountRPC {
+
+ private Integer num ;
+
+ private Integer name ;
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public Integer getName() {
+ return name;
+ }
+
+ public void setName(Integer name) {
+ this.name = name;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
index 6461374..35b5ee0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
@@ -30,7 +30,9 @@
List<EmergencyDrillExecuteCountData> selectByYearAndDept(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds);
- List<EmergencyDrillExecuteCountData> selectByDayAndDept(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds);
+ List<EmergencyDrillExecuteCountRPC> selectByDayAndDept(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds);
+
+ List<EmergencyDrillExecuteCountRPC> selectByMonthAndDeptForIntegerMonth(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds);
String selectEmergencyDrillExecuteIntervalTimeByDeptId(@Param("deptId")Long deptId);
}
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 6169166..ffd722f 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
@@ -28,7 +28,9 @@
List<EmergencyDrillExecuteCountData> selectByYearAndDept(String startTime ,String endTime ,List<Long> deptIds);
- List<EmergencyDrillExecuteCountData> selectByDayAndDept(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);
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
index ba01a35..32221e2 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
@@ -63,11 +63,16 @@
}
@Override
- public List<EmergencyDrillExecuteCountData> selectByDayAndDept(String startTime, String endTime, List<Long> deptIds) {
+ public List<EmergencyDrillExecuteCountRPC> selectByDayAndDept(String startTime, String endTime, List<Long> deptIds) {
return emergencyDrillExecuteInfoRepository.selectByDayAndDept(startTime,endTime,deptIds);
}
@Override
+ public List<EmergencyDrillExecuteCountRPC> selectByMonthAndDeptForIntegerMonth(String startTime, String endTime, List<Long> deptIds) {
+ return emergencyDrillExecuteInfoRepository.selectByMonthAndDeptForIntegerMonth(startTime,endTime,deptIds);
+ }
+
+ @Override
public String selectEmergencyDrillExecuteIntervalTimeByDeptId(Long deptId) {
return emergencyDrillExecuteInfoRepository.selectEmergencyDrillExecuteIntervalTimeByDeptId(deptId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
index e865b2a..5ad92ea 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
@@ -55,15 +55,17 @@
emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
getSingleTimeData(emergencyExecuteTimeRPCResp);
- return new SearchResultVO<>(
+ SearchResultVO searchResultVO = new SearchResultVO<>(
false,
null,
null,
null,
- 1L,
+ null,
emergencyExecuteTimeRPCResp,
ResultCodes.OK
);
+ searchResultVO.setCount(1);
+ return searchResultVO;
}
@Override
@@ -81,15 +83,20 @@
getSingleTimeData(emergencyExecuteTimeRPCResp);
list.add(emergencyExecuteTimeRPCResp);
}
- return new SearchResultVO<>(
+
+ SearchResultVO searchResultVO = new SearchResultVO<>(
false,
null,
null,
null,
- (long) list.size(),
+ null,
list,
ResultCodes.OK
);
+ if (!list.isEmpty()){
+ searchResultVO.setCount(list.size());
+ }
+ return searchResultVO;
}
private void getSingleTimeData(EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp){
@@ -97,7 +104,7 @@
String lastTime = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteIntervalTimeByDeptId(emergencyExecuteTimeRPCResp.getDeptId());
if (StringUtils.isNotBlank(lastTime)){
emergencyExecuteTimeRPCResp.setLastTime(lastTime);
- emergencyExecuteTimeRPCResp.setDays(TimeUtils.differentDays(lastTime, TimeUtils.formatDate(new Date())));
+// emergencyExecuteTimeRPCResp.setDays(TimeUtils.differentDays(lastTime, TimeUtils.formatDate(new Date())));
}
}
@@ -115,15 +122,17 @@
getSingleNumData(emergencyExecuteNumRPCResp,query);
- return new SearchResultVO<>(
+ SearchResultVO searchResultVO = new SearchResultVO<>(
false,
null,
null,
null,
- 1L,
+ null,
emergencyExecuteNumRPCResp,
ResultCodes.OK
);
+ searchResultVO.setCount(1);
+ return searchResultVO;
}
@Override
@@ -142,23 +151,28 @@
getSingleNumData(emergencyExecuteNumRPCResp,query);
list.add(emergencyExecuteNumRPCResp);
}
- return new SearchResultVO<>(
+
+ SearchResultVO searchResultVO = new SearchResultVO<>(
false,
null,
null,
null,
- (long) list.size(),
+ null,
list,
ResultCodes.OK
);
+ if (!list.isEmpty()){
+ searchResultVO.setCount(list.size());
+ }
+ return searchResultVO;
}
private void getSingleNumData(EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp,EmergencyExecuteNumRPCReq query){
List<Long> deptIds = new ArrayList<>();
deptIds.add(emergencyExecuteNumRPCResp.getDeptId());
- List<Map<String,String>> mapList = new ArrayList<>();
- List<EmergencyDrillExecuteCountData> emergencyDrillExecuteCountDataList = new ArrayList<>();
+ List<Map<String,Integer>> mapList = new ArrayList<>();
+ List<EmergencyDrillExecuteCountRPC> emergencyDrillExecuteCountDataList = new ArrayList<>();
String startTime ;
String endTime ;
@@ -166,7 +180,7 @@
// 查该年度12个月份的
startTime = TimeUtils.getYearFirst(query.getYear());
endTime = TimeUtils.getYearLast(query.getYear());
- emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDept(startTime, endTime, deptIds);
+ emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDeptForIntegerMonth(startTime, endTime, deptIds);
}else{
// 查该年度指定月份的
startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
@@ -174,10 +188,11 @@
emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByDayAndDept(startTime, endTime, deptIds);
}
if (!emergencyDrillExecuteCountDataList.isEmpty()){
- for (EmergencyDrillExecuteCountData emergencyDrillExecuteCountData : emergencyDrillExecuteCountDataList){
- Map<String ,String> map = new HashMap<>();
- map.put("name",emergencyDrillExecuteCountData.getName());
- map.put("num",emergencyDrillExecuteCountData.getNum().toString());
+ for (EmergencyDrillExecuteCountRPC emergencyDrillExecuteCountRPC : emergencyDrillExecuteCountDataList){
+ Map<String ,Integer> map = new HashMap<>();
+ // 名称+数据 1如果为查询的是年：返回的name为月份 2如果查询的是月，返回的name为天
+ map.put("name",emergencyDrillExecuteCountRPC.getName());
+ map.put("num",emergencyDrillExecuteCountRPC.getNum());
mapList.add(map);
}
}
diff --git a/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
index 9c3a4a6..9da404b 100644
--- a/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -173,10 +173,16 @@
DATE_FORMAT( a.gmt_create, '%Y' )
</select>
- <select id="selectByDayAndDept" resultMap="emergencyDrillExecuteCountChart">
+
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountRPC"
+ id="emergencyDrillExecuteCountRPC">
+ <result column="num" property="num"/>
+ <result column="name" property="name"/>
+ </resultMap>
+ <select id="selectByDayAndDept" resultMap="emergencyDrillExecuteCountRPC">
SELECT
count( 0 ) AS num,
- DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ) AS `name`
+ DATE_FORMAT( a.gmt_create, '%d' ) AS `name`
FROM
`emergency_drill_execute` a
LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
@@ -194,6 +200,27 @@
DATE_FORMAT( a.gmt_create, '%Y-%m-%d' )
</select>
+ <select id="selectByMonthAndDeptForIntegerMonth" resultMap="emergencyDrillExecuteCountRPC">
+ SELECT
+ count( 0 ) AS num,
+ DATE_FORMAT( a.gmt_create, '%m' ) AS `name`
+ FROM
+ `emergency_drill_execute` a
+ LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND a.gmt_create <![CDATA[ >= ]]> #{startTime}
+ AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
+ <if test="deptIds != null " >
+ and b.department_id in
+ <foreach item="id" collection="deptIds" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ GROUP BY
+ DATE_FORMAT( a.gmt_create, '%Y-%m' )
+ </select>
+
<select id="selectEmergencyDrillExecuteIntervalTimeByDeptId" resultType="java.lang.String">
SELECT
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
index 2ad8d65..724970c 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
@@ -137,7 +137,7 @@
//获取打分明细
List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.getNumberDetailJson(), CurrentExamineDto.class);
List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());
- if (idList.isEmpty()){
+ if (!idList.isEmpty()){
List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList);
Map<Long,ExamineItem> itemMap = itemList.stream().collect(
Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
diff --git a/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java b/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java
index 0ce3a41..3a2004b 100644
--- a/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java
+++ b/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java
@@ -6,17 +6,17 @@
public class IncidentManageCountRPCResp {
- // 时间
- private String time ;
+ // 时间 如果查的是年，返回的是月份 ，如果查的是月，返回的是天
+ private Integer time ;
// 数据
private List<IncidentManageCountDetailRPCResp> detail;
- public String getTime() {
+ public Integer getTime() {
return time;
}
- public void setTime(String time) {
+ public void setTime(Integer time) {
this.time = time;
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCountRPC.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCountRPC.java
index ca051ee..192e999 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCountRPC.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCountRPC.java
@@ -5,7 +5,7 @@
public class AccidentReportCountRPC {
- private String time;
+ private Integer time;
private String level ;
@@ -20,11 +20,11 @@
private BigDecimal economicLoss;
- public String getTime() {
+ public Integer getTime() {
return time;
}
- public void setTime(String time) {
+ public void setTime(Integer time) {
this.time = time;
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java
index b6ac38e..2395704 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java
@@ -53,19 +53,24 @@
getSingleTimeData(incidentManageCountRPCResp, query);
- return new SearchResultVO<>(
+ SearchResultVO searchResultVO = new SearchResultVO<>(
false,
null,
null,
null,
- 1L,
+ null,
incidentManageCountRPCResp,
ResultCodes.OK
);
+ searchResultVO.setCount(1);
+ return searchResultVO;
}
@Override
public SearchResultVO<List<IncidentManageRPCResp>> getCountByDeptIds(IncidentManageCountRPCReq query) {
+ if (query.getYear() == null) {
+ throw new AccidentException(AccidentResultCodes.YEAR_NULL);
+ }
List<IncidentManageRPCResp> list = new ArrayList<>();
// 获取该部门及其子部门的所有信息
@@ -80,23 +85,27 @@
getSingleTimeData(incidentManageCountRPCResp, query);
list.add(incidentManageCountRPCResp);
}
- return new SearchResultVO<>(
+ SearchResultVO searchResultVO = new SearchResultVO<>(
false,
null,
null,
null,
- (long) list.size(),
+ null,
list,
ResultCodes.OK
);
+ if (!list.isEmpty()){
+ searchResultVO.setCount(list.size());
+ }
+ return searchResultVO;
}
private void getSingleTimeData(IncidentManageRPCResp incidentManageRPCResp, IncidentManageCountRPCReq query) {
+
List<IncidentManageCountRPCResp> resList = new ArrayList<>();
-
List<AccidentReportCountRPC> accidentReportCountRPCList = new ArrayList<>();
- Long deptId = query.getDeptId();
+ Long deptId = incidentManageRPCResp.getDeptId();
String startTime;
String endTime;
if (query.getMonth() == null) {
@@ -113,13 +122,13 @@
}
// 拼装第一层时间（去重）
- Set<String> timeSET = accidentReportCountRPCList.stream().map(AccidentReportCountRPC::getTime).collect(Collectors.toSet());
+ Set<Integer> timeSET = accidentReportCountRPCList.stream().map(AccidentReportCountRPC::getTime).collect(Collectors.toSet());
// 拼装第一层时间（排序）
- List<String> timeList = timeSET.stream().sorted().collect(Collectors.toList());
+ List<Integer> timeList = timeSET.stream().sorted().collect(Collectors.toList());
if (!CollectionUtils.isEmpty(timeSET)) {
- for (String str : timeSET) {
+ for (Integer integer : timeSET) {
IncidentManageCountRPCResp incidentManageCountRPCResp = new IncidentManageCountRPCResp();
- incidentManageCountRPCResp.setTime(str);
+ incidentManageCountRPCResp.setTime(integer);
incidentManageCountRPCResp.setDetail(new ArrayList<>());
resList.add(incidentManageCountRPCResp);
}
diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
index d9a0ee3..22d4d4c 100644
--- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
+++ b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
@@ -232,7 +232,7 @@
</resultMap>
<select id="getCountForRPCByDeptIdAndMonth" resultMap="accidentReportCountRPC">
SELECT
- DATE_FORMAT( a.gmt_create, '%Y-%m' ) as time,
+ DATE_FORMAT( a.gmt_create, '%m' ) as time,
a.accident_level AS `level`,
count( 0 ) AS num,
sum( a.economic_loss ) AS economicLoss,
@@ -254,7 +254,7 @@
<select id="getCountForRPCByDeptIdAndDay" resultMap="accidentReportCountRPC">
SELECT
- DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ) as time,
+ DATE_FORMAT( a.gmt_create, '%d' ) as time,
a.accident_level AS `level`,
count( 0 ) AS num,
sum( a.economic_loss ) AS economicLoss,
--
Gitblit v1.9.2