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> emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/EmergencyDemoRpcAPi.java
文件已删除 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); } emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/User.java
文件已删除 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; } } 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; } } 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; } } 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; } } emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyDemoRpcProvider.java
文件已删除 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 ); } } 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); } 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 @@ -142,6 +159,7 @@ ); } public static void main(String[] args) { Date date = new Date();//获取当前日期 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//格式化一下 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