From 47bfee2fafdae8dd9339021f787787acfddfc0a5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 18:37:07 +0800
Subject: [PATCH] rpc接口
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 35 deletions(-)
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 027b313..63a3827 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
@@ -10,17 +10,20 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
+import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
+import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
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.rpc.api.model.dto.req.EmergencyExecuteNumRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteTimeRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesInfoService;
import com.gkhy.safePlatform.emergency.utils.TimeUtils;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,17 +48,16 @@
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);
- }
+ // 获取id对应的部门
+ DepInfoRPCRespDTO depInfoRPCRespDTO = getDepInfoByDepId(query.getDeptId());
+
+ emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
+ emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
+ emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ String lastTime = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteIntervalTimeByDeptId(query.getDeptId());
+ emergencyExecuteTimeRPCResp.setLastTime(lastTime);
+ emergencyExecuteTimeRPCResp.setDays(TimeUtils.differentDays(lastTime, TimeUtils.formatDate(new Date())));
+
return new SearchResultVO<>(
false,
null,
@@ -75,7 +77,7 @@
null,
null,
null,
- (long)list.size(),
+ (long) list.size(),
list,
ResultCodes.OK
);
@@ -83,7 +85,43 @@
@Override
public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query) {
- return null;
+ if (query.getYear()==null){
+ throw new EmergencyException(EmergencyResultCodes.YEAR_NULL);
+ }
+ EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp = new EmergencyExecuteNumRPCResp();
+ // 获取id对应的部门
+ DepInfoRPCRespDTO depInfoRPCRespDTO = getDepInfoByDepId(query.getDeptId());
+
+ emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
+ emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
+ emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+
+ // 查到该年度对应月份的数据
+ List<Map<String,String>> mapList = new ArrayList<>();
+ String startTime = TimeUtils.getYearFirst(query.getYear());
+ String endTime = TimeUtils.getYearLast(query.getYear());
+ List<Long> deptIds = new ArrayList<>();
+ deptIds.add(query.getDeptId());
+ List<EmergencyDrillExecuteCountData> emergencyDrillExecuteCountDataList = emergencyDrillExecuteInfoService.selectByMonthAndDept(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());
+ mapList.add(map);
+ }
+ }
+ emergencyExecuteNumRPCResp.setData(mapList);
+
+ return new SearchResultVO<>(
+ false,
+ null,
+ null,
+ null,
+ 1L,
+ emergencyExecuteNumRPCResp,
+ ResultCodes.OK
+ );
}
@Override
@@ -91,6 +129,18 @@
return null;
}
+ public DepInfoRPCRespDTO getDepInfoByDepId(Long deptId) {
+ DepInfoRPCRespDTO dep = new DepInfoRPCRespDTO();
+ ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(deptId);
+ if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
+ if (rpcResult.getData() != null) {
+ dep = (DepInfoRPCRespDTO) rpcResult.getData();
+ }
+ } else {
+ throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST);
+ }
+ return dep;
+ }
@Override
public ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteCountQuery query) {
@@ -105,15 +155,15 @@
List<EmergencyDrillExecuteCountData> list = new ArrayList<>();
// 获取部门id集合
List<Long> deptIds = new ArrayList<>();
-
- ResultVO<List<Long>> rpcResult = accountDepartmentService.listDepAndSubDepIds(query.getDeptId());
+ deptIds.add(query.getDeptId());
+/* ResultVO<List<Long>> rpcResult = accountDepartmentService.listDepAndSubDepIds(query.getDeptId());
if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
if (rpcResult.getData() != null) {
deptIds = (List<Long>) rpcResult.getData();
}
} else {
throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST);
- }
+ }*/
// 获取时间
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
Date date = new Date();
@@ -187,19 +237,4 @@
);
}
-
- 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);
- //在当前时间的基础上获取前三天的日期
-// calendar1.add(Calendar.DATE, -40);
- //add方法 参数也可传入 月份，获取的是前几月或后几月的日期
- //calendar1.add(Calendar.MONTH, -3);
- Date today = calendar1.getTime();
- String time = sdf.format(today);
- System.out.println(time);
- }
}
--
Gitblit v1.9.2