From d59ce37bc27d01da323b79c10200e93796865fee Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:09:42 +0800
Subject: [PATCH] fix
---
/dev/null | 20 --
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java | 16 ++
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteTimeRPCReq.java | 26 +++
emergency/emergency-rpc-api/pom.xml | 8 +
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/resp/EmergencyExecuteTimeRPCResp.java | 62 +++++++
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteNumRPCReq.java | 59 +++++++
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/EmergencyRpcAPi.java | 21 ++
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCaseServiceImpl.java | 3
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/resp/EmergencyExecuteNumRPCResp.java | 62 +++++++
emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java | 79 +++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 74 +++++---
11 files changed, 381 insertions(+), 49 deletions(-)
diff --git a/emergency/emergency-rpc-api/pom.xml b/emergency/emergency-rpc-api/pom.xml
index 3e5e275..b438c8b 100644
--- a/emergency/emergency-rpc-api/pom.xml
+++ b/emergency/emergency-rpc-api/pom.xml
@@ -9,6 +9,14 @@
<!-- </parent>-->
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>com.gkhy.safePlatfrom</groupId>
+ <artifactId>commons</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<groupId>com.gkhy.safePlatfrom</groupId>
<artifactId>emergency-rpc-api</artifactId>
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/EmergencyDemoRpcAPi.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/EmergencyDemoRpcAPi.java
deleted file mode 100644
index 901fa1f..0000000
--- a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/EmergencyDemoRpcAPi.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gkhy.safePlatform.emergency.rpc.api;
-
-import com.gkhy.safePlatform.emergency.rpc.api.model.User;
-
-public interface EmergencyDemoRpcAPi {
-
- String sayHello(User user);
-}
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/EmergencyRpcAPi.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/EmergencyRpcAPi.java
new file mode 100644
index 0000000..a7d4985
--- /dev/null
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/EmergencyRpcAPi.java
@@ -0,0 +1,21 @@
+package com.gkhy.safePlatform.emergency.rpc.api;
+
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteNumRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteTimeRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteNumRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteTimeRPCResp;
+
+import java.util.List;
+
+public interface EmergencyRpcAPi {
+
+
+ SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query);
+
+ SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query);
+
+ SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query);
+
+ SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query);
+}
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/User.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/User.java
deleted file mode 100644
index f3b289d..0000000
--- a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/User.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gkhy.safePlatform.emergency.rpc.api.model;
-
-public class User {
-
- private String name;
-
- private String email;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-}
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteNumRPCReq.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteNumRPCReq.java
new file mode 100644
index 0000000..5d71a05
--- /dev/null
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteNumRPCReq.java
@@ -0,0 +1,59 @@
+package com.gkhy.safePlatform.emergency.rpc.api.model.req;
+
+public class EmergencyExecuteNumRPCReq {
+
+ // 部门id
+ private Long deptId;
+
+ // 统计类型 1-只统计该部门 2-统计该部门及其子部门
+ private Integer countType;
+
+ // 查询时间类型 1-年 2-月
+ private Integer timeType;
+
+ //年
+ private Integer year;
+
+ // 月
+ private Integer mouth;
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ public Integer getCountType() {
+ return countType;
+ }
+
+ public void setCountType(Integer countType) {
+ this.countType = countType;
+ }
+
+ public Integer getTimeType() {
+ return timeType;
+ }
+
+ public void setTimeType(Integer timeType) {
+ this.timeType = timeType;
+ }
+
+ public Integer getYear() {
+ return year;
+ }
+
+ public void setYear(Integer year) {
+ this.year = year;
+ }
+
+ public Integer getMouth() {
+ return mouth;
+ }
+
+ public void setMouth(Integer mouth) {
+ this.mouth = mouth;
+ }
+}
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteTimeRPCReq.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteTimeRPCReq.java
new file mode 100644
index 0000000..06ceb5c
--- /dev/null
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteTimeRPCReq.java
@@ -0,0 +1,26 @@
+package com.gkhy.safePlatform.emergency.rpc.api.model.req;
+
+public class EmergencyExecuteTimeRPCReq {
+
+ // 部门id
+ private Long deptId;
+
+ // 统计类型 1-只统计该部门 2-统计该部门及其子部门
+ private Integer countType;
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ public Integer getCountType() {
+ return countType;
+ }
+
+ public void setCountType(Integer countType) {
+ this.countType = countType;
+ }
+}
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/resp/EmergencyExecuteNumRPCResp.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/resp/EmergencyExecuteNumRPCResp.java
new file mode 100644
index 0000000..091eb84
--- /dev/null
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/resp/EmergencyExecuteNumRPCResp.java
@@ -0,0 +1,62 @@
+package com.gkhy.safePlatform.emergency.rpc.api.model.resp;
+
+
+import java.util.Date;
+
+public class EmergencyExecuteNumRPCResp {
+
+ // 部门id
+ private Long deptId;
+
+ // 部门名称
+ private String deptName;
+
+ // 部门级别
+ private Integer deptLevel;
+
+ //上次演练的时间
+ private Date lastTime;
+
+ // 距离上次演练的天数
+ private Integer days;
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public Integer getDeptLevel() {
+ return deptLevel;
+ }
+
+ public void setDeptLevel(Integer deptLevel) {
+ this.deptLevel = deptLevel;
+ }
+
+ public Date getLastTime() {
+ return lastTime;
+ }
+
+ public void setLastTime(Date lastTime) {
+ this.lastTime = lastTime;
+ }
+
+ public Integer getDays() {
+ return days;
+ }
+
+ public void setDays(Integer days) {
+ this.days = days;
+ }
+}
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/resp/EmergencyExecuteTimeRPCResp.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/resp/EmergencyExecuteTimeRPCResp.java
new file mode 100644
index 0000000..0a52095
--- /dev/null
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/resp/EmergencyExecuteTimeRPCResp.java
@@ -0,0 +1,62 @@
+package com.gkhy.safePlatform.emergency.rpc.api.model.resp;
+
+
+import java.util.Date;
+
+public class EmergencyExecuteTimeRPCResp {
+
+ // 部门id
+ private Long deptId;
+
+ // 部门名称
+ private String deptName;
+
+ // 部门级别
+ private Integer deptLevel;
+
+ //上次演练的时间
+ private Date lastTime;
+
+ // 距离上次演练的天数
+ private Integer days;
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public Integer getDeptLevel() {
+ return deptLevel;
+ }
+
+ public void setDeptLevel(Integer deptLevel) {
+ this.deptLevel = deptLevel;
+ }
+
+ public Date getLastTime() {
+ return lastTime;
+ }
+
+ public void setLastTime(Date lastTime) {
+ this.lastTime = lastTime;
+ }
+
+ public Integer getDays() {
+ return days;
+ }
+
+ public void setDays(Integer days) {
+ this.days = days;
+ }
+}
diff --git a/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyDemoRpcProvider.java b/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyDemoRpcProvider.java
deleted file mode 100644
index 1b84a95..0000000
--- a/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyDemoRpcProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.gkhy.safePlatform.emergency.rpc.provider;
-
-
-import com.gkhy.safePlatform.emergency.rpc.api.EmergencyDemoRpcAPi;
-import com.gkhy.safePlatform.emergency.rpc.api.model.User;
-import org.apache.dubbo.config.annotation.DubboService;
-
-@DubboService
-public class EmergencyDemoRpcProvider implements EmergencyDemoRpcAPi {
-
-
-
- @Override
- public String sayHello(User user) {
- if(user == null)
- return "non";
- String resp = "Name: "+user.getName()+" Email:"+user.getEmail()+" rpc call";
- return resp;
- }
-}
diff --git a/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java b/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java
new file mode 100644
index 0000000..db759d2
--- /dev/null
+++ b/emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java
@@ -0,0 +1,79 @@
+package com.gkhy.safePlatform.emergency.rpc.provider;
+
+
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.emergency.rpc.api.EmergencyRpcAPi;
+import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteNumRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteTimeRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteNumRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteTimeRPCResp;
+import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@DubboService
+public class EmergencyRpcProvider implements EmergencyRpcAPi {
+
+ @Autowired
+ private EmergencyCountService emergencyCountService;
+
+
+ @Override
+ public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query) {
+ EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp = emergencyCountService.getTimeByDeptId(query);
+ return new SearchResultVO(
+ false,
+ null,
+ null,
+ null,
+ (long)1,
+ emergencyExecuteTimeRPCResp,
+ ResultCodes.OK
+ );
+ }
+
+ @Override
+ public SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) {
+ List<EmergencyExecuteTimeRPCResp> emergencyExecuteTimeRPCRespList = emergencyCountService.getTimeByDeptIds(query);
+ return new SearchResultVO(
+ false,
+ null,
+ null,
+ null,
+ (long)emergencyExecuteTimeRPCRespList.size(),
+ emergencyExecuteTimeRPCRespList,
+ ResultCodes.OK
+ );
+ }
+
+ @Override
+ public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query) {
+ EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp = emergencyCountService.getNumByDeptId(query);
+ return new SearchResultVO(
+ false,
+ null,
+ null,
+ null,
+ (long)1,
+ emergencyExecuteNumRPCResp,
+ ResultCodes.OK
+ );
+ }
+
+ @Override
+ public SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query) {
+ List<EmergencyExecuteNumRPCResp> emergencyExecuteNumRPCRespList = emergencyCountService.getNumByDeptIds(query);
+ return new SearchResultVO(
+ false,
+ null,
+ null,
+ null,
+ (long)emergencyExecuteNumRPCRespList.size(),
+ emergencyExecuteNumRPCRespList,
+ ResultCodes.OK
+ );
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
index 13379ff..7f2fc8b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
@@ -6,6 +6,10 @@
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesCountRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
+import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteNumRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteTimeRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteNumRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteTimeRPCResp;
import java.util.List;
@@ -14,4 +18,16 @@
ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteCountQuery query);
ResultVO<List<EmergencySuppliesCountRespDTO>> countEmergencySupplies(PageQuery<EmergencySuppliesCountQuery> pageQuery);
+
+ // RPC接口--1、传入部门ID，查询该部门最后一次完成应急演练的时间
+ EmergencyExecuteTimeRPCResp getTimeByDeptId(EmergencyExecuteTimeRPCReq query);
+
+ // RPC接口--2、传入部门ID，查询该部门及其子部门的最后一次完成应急演练的时间
+ List<EmergencyExecuteTimeRPCResp> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query);
+
+ // RPC接口--3、传入部门ID和年份月份，查询该部门在指定的年份，或者指定的月份的应急演练的次数
+ EmergencyExecuteNumRPCResp getNumByDeptId(EmergencyExecuteNumRPCReq query);
+
+ // RPC接口--4、传入部门ID和年份月份，查询该部门及其子部门，在指定的年份，或者指定的月份的应急演练的次数
+ List<EmergencyExecuteNumRPCResp> getNumByDeptIds(EmergencyExecuteNumRPCReq query);
}
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 bff4bd6..a547e56 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
@@ -13,6 +13,10 @@
import com.gkhy.safePlatform.emergency.model.dto.resp.*;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
+import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteNumRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteTimeRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteNumRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
@@ -39,12 +43,25 @@
@Autowired
private EmergencySuppliesInfoService emergencySuppliesInfoService;
- /**
- * redisson客户端
- */
- @Autowired
- private RedissonClient redissonClient;
+ @Override
+ public EmergencyExecuteTimeRPCResp getTimeByDeptId(EmergencyExecuteTimeRPCReq query) {
+ return null;
+ }
+ @Override
+ public List<EmergencyExecuteTimeRPCResp> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) {
+ return null;
+ }
+
+ @Override
+ public EmergencyExecuteNumRPCResp getNumByDeptId(EmergencyExecuteNumRPCReq query) {
+ return null;
+ }
+
+ @Override
+ public List<EmergencyExecuteNumRPCResp> getNumByDeptIds(EmergencyExecuteNumRPCReq query) {
+ return null;
+ }
@Override
@@ -66,33 +83,33 @@
if (rpcResult.getData() != null) {
deptIds = (List<Long>) rpcResult.getData();
}
- }else{
+ } else {
throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST);
}
// 获取时间
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
Date date = new Date();
int year = Integer.parseInt(sdf.format(date));
- if (query.getType()==1){
+ if (query.getType() == 1) {
// 月
String startTime = TimeUtils.getYearFirst(year);
String endTime = TimeUtils.getYearLast(year);
- list = emergencyDrillExecuteInfoService.selectByMonthAndDept(startTime,endTime,deptIds);
+ list = emergencyDrillExecuteInfoService.selectByMonthAndDept(startTime, endTime, deptIds);
}
- if (query.getType()==2){
+ if (query.getType() == 2) {
// 年
- String startTime = TimeUtils.getYearFirst(year-10);
+ String startTime = TimeUtils.getYearFirst(year - 10);
String endTime = TimeUtils.getYearLast(year);
- list = emergencyDrillExecuteInfoService.selectByYearAndDept(startTime,endTime,deptIds);
+ list = emergencyDrillExecuteInfoService.selectByYearAndDept(startTime, endTime, deptIds);
}
- if (!CollectionUtils.isEmpty(list)){
- List<EmergencyDrillExecuteCountDataRespDTO> dataList = BeanCopyUtils.copyBeanList(list,EmergencyDrillExecuteCountDataRespDTO.class);
+ if (!CollectionUtils.isEmpty(list)) {
+ List<EmergencyDrillExecuteCountDataRespDTO> dataList = BeanCopyUtils.copyBeanList(list, EmergencyDrillExecuteCountDataRespDTO.class);
emergencyDrillExecuteCountRespDTO.setDataList(dataList);
- }else{
+ } else {
emergencyDrillExecuteCountRespDTO.setDataList(new ArrayList<>());
}
- return new ResultVO<>(ResultCodes.OK,emergencyDrillExecuteCountRespDTO);
+ return new ResultVO<>(ResultCodes.OK, emergencyDrillExecuteCountRespDTO);
}
@Override
@@ -101,11 +118,11 @@
Long pageIndex = pageQuery.getPageIndex();
Long pageSize = pageQuery.getPageSize();
- Page<EmergencySuppliesInfoDetailDO> page = new Page<>(pageIndex,pageSize);
- List<EmergencySuppliesInfoDetailDO> emergencySuppliesInfoDetailDOList = emergencySuppliesInfoService.countEmergencySupplies(page,pageQuery.getSearchParams());
+ Page<EmergencySuppliesInfoDetailDO> page = new Page<>(pageIndex, pageSize);
+ List<EmergencySuppliesInfoDetailDO> emergencySuppliesInfoDetailDOList = emergencySuppliesInfoService.countEmergencySupplies(page, pageQuery.getSearchParams());
- if (!CollectionUtils.isEmpty(emergencySuppliesInfoDetailDOList)){
- for (EmergencySuppliesInfoDetailDO emergencySuppliesInfoDetailDO :emergencySuppliesInfoDetailDOList){
+ if (!CollectionUtils.isEmpty(emergencySuppliesInfoDetailDOList)) {
+ for (EmergencySuppliesInfoDetailDO emergencySuppliesInfoDetailDO : emergencySuppliesInfoDetailDOList) {
EmergencySuppliesCountRespDTO emergencySuppliesCountRespDTO = new EmergencySuppliesCountRespDTO();
// 名称+数量
emergencySuppliesCountRespDTO.setName(emergencySuppliesInfoDetailDO.getName());
@@ -135,25 +152,26 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,page.getPages(),
+ pageSize, page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
);
}
+
public static void main(String[] args) {
- Date date = new Date();//获取当前日期
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//格式化一下
- Calendar calendar1 = Calendar.getInstance();//获取对日期操作的类对象
- //两种写法都可以获取到前三天的日期
- calendar1.set(Calendar.DAY_OF_YEAR,calendar1.get(Calendar.DAY_OF_YEAR) -40);
- //在当前时间的基础上获取前三天的日期
+ Date date = new Date();//获取当前日期
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//格式化一下
+ Calendar calendar1 = Calendar.getInstance();//获取对日期操作的类对象
+ //两种写法都可以获取到前三天的日期
+ calendar1.set(Calendar.DAY_OF_YEAR, calendar1.get(Calendar.DAY_OF_YEAR) - 40);
+ //在当前时间的基础上获取前三天的日期
// calendar1.add(Calendar.DATE, -40);
//add方法 参数也可传入 月份，获取的是前几月或后几月的日期
//calendar1.add(Calendar.MONTH, -3);
- Date today = calendar1.getTime();
- String time= sdf.format(today);
+ Date today = calendar1.getTime();
+ String time = sdf.format(today);
System.out.println(time);
}
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCaseServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCaseServiceImpl.java
index 7f87919..49747b5 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCaseServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCaseServiceImpl.java
@@ -47,7 +47,8 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize, page.getPages(),
+ pageSize,
+ page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
--
Gitblit v1.9.2