emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteNumRPCReq.java
@@ -5,9 +5,6 @@ // 部门id private Long deptId; // 统计类型 1-只统计该部门 2-统计该部门及其子部门 private Integer countType; // 查询时间类型 1-年 2-月 private Integer timeType; @@ -23,14 +20,6 @@ public void setDeptId(Long deptId) { this.deptId = deptId; } public Integer getCountType() { return countType; } public void setCountType(Integer countType) { this.countType = countType; } public Integer getTimeType() { emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteTimeRPCReq.java
@@ -5,9 +5,6 @@ // 部门id private Long deptId; // 统计类型 1-只统计该部门 2-统计该部门及其子部门 private Integer countType; public Long getDeptId() { return deptId; } @@ -16,11 +13,4 @@ this.deptId = deptId; } public Integer getCountType() { return countType; } public void setCountType(Integer countType) { this.countType = countType; } } emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java
@@ -23,57 +23,21 @@ @Override public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query) { EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp = emergencyCountService.getTimeByDeptId(query); return new SearchResultVO( false, null, null, null, (long)1, emergencyExecuteTimeRPCResp, ResultCodes.OK ); return emergencyCountService.getTimeByDeptId(query); } @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 ); return emergencyCountService.getTimeByDeptIds(query); } @Override public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query) { EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp = emergencyCountService.getNumByDeptId(query); return new SearchResultVO( false, null, null, null, (long)1, emergencyExecuteNumRPCResp, ResultCodes.OK ); return emergencyCountService.getNumByDeptId(query); } @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 ); return emergencyCountService.getNumByDeptIds(query); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
@@ -3,10 +3,13 @@ import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.utils.PageUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO; 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.EmergencyExecuteTimeRPCReq; import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteTimeRPCResp; import com.gkhy.safePlatform.emergency.service.EmergencyCountService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,4 +40,13 @@ return emergencyCountService.countEmergencySupplies(pageQuery); } /** * 应急演练次数统计图 */ @RequestMapping(value = "/getTimeByDeptId",method = RequestMethod.POST) public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(@RequestBody EmergencyExecuteTimeRPCReq query){ return emergencyCountService.getTimeByDeptId(query); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
@@ -2,6 +2,7 @@ import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesCountRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery; @@ -20,14 +21,15 @@ ResultVO<List<EmergencySuppliesCountRespDTO>> countEmergencySupplies(PageQuery<EmergencySuppliesCountQuery> pageQuery); // RPC接口--1、传入部门ID，查询该部门最后一次完成应急演练的时间 EmergencyExecuteTimeRPCResp getTimeByDeptId(EmergencyExecuteTimeRPCReq query); SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query); // RPC接口--2、传入部门ID，查询该部门及其子部门的最后一次完成应急演练的时间 List<EmergencyExecuteTimeRPCResp> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query); SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query); // RPC接口--3、传入部门ID和年份月份，查询该部门在指定的年份，或者指定的月份的应急演练的次数 EmergencyExecuteNumRPCResp getNumByDeptId(EmergencyExecuteNumRPCReq query); SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query); // RPC接口--4、传入部门ID和年份月份，查询该部门及其子部门，在指定的年份，或者指定的月份的应急演练的次数 List<EmergencyExecuteNumRPCResp> getNumByDeptIds(EmergencyExecuteNumRPCReq query); SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
@@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService; import com.gkhy.safePlatform.commons.enums.E; import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO; import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.exception.BusinessException; import com.gkhy.safePlatform.commons.query.PageQuery; @@ -18,12 +18,10 @@ 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; import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesInfoService; import com.gkhy.safePlatform.emergency.utils.TimeUtils; import org.apache.dubbo.config.annotation.DubboReference; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -44,22 +42,52 @@ private EmergencySuppliesInfoService emergencySuppliesInfoService; @Override public EmergencyExecuteTimeRPCResp getTimeByDeptId(EmergencyExecuteTimeRPCReq query) { public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query) { EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp = new EmergencyExecuteTimeRPCResp(); ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(query.getDeptId()); if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) { if (rpcResult.getData() != null) { DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData(); emergencyExecuteTimeRPCResp.setDeptId(dep.getDepId()); emergencyExecuteTimeRPCResp.setDeptName(dep.getDepName()); emergencyExecuteTimeRPCResp.setDeptLevel(dep.getDepLevel()); } } else { throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST); } return new SearchResultVO<>( false, null, null, null, 1L, emergencyExecuteTimeRPCResp, ResultCodes.OK ); } @Override public SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) { List<EmergencyExecuteTimeRPCResp> list = new ArrayList<>(); return new SearchResultVO<>( false, null, null, null, (long)list.size(), list, ResultCodes.OK ); } @Override public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq 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) { public SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query) { return null; }
