From 17f8dd032fc267b38cdddc88de416aeab2600f90 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:38:23 +0800
Subject: [PATCH] 根据物资类型分类-应急物资列表
---
emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java | 83 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 44 deletions(-)
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
index db759d2..c0647ae 100644
--- 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
@@ -1,21 +1,34 @@
package com.gkhy.safePlatform.emergency.rpc.provider;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesTypeRespDTO;
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.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.rpc.api.model.dto.resp.EmergencySuppliesRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencySuppliesTypeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
+import com.gkhy.safePlatform.emergency.service.EmergencySuppliesService;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.ArrayList;
import java.util.List;
@DubboService
public class EmergencyRpcProvider implements EmergencyRpcAPi {
+ @Autowired
+ private EmergencySuppliesService emergencySuppliesService;
@Autowired
private EmergencyCountService emergencyCountService;
@@ -23,57 +36,39 @@
@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);
+ }
+
+ @Override
+ public ResultVO<List<EmergencySuppliesTypeRPCResp>> emergencySuppliesList(ContextCacheUser currentUser) {
+
+ List<EmergencySuppliesTypeRespDTO> list = (List<EmergencySuppliesTypeRespDTO>)emergencySuppliesService.emergencySuppliesList(currentUser).getData();
+ List<EmergencySuppliesTypeRPCResp> typeRPCRespList = new ArrayList<>();
+ for (EmergencySuppliesTypeRespDTO typeRespDTO:list) {
+ EmergencySuppliesTypeRPCResp typeRPCResp = new EmergencySuppliesTypeRPCResp();
+ typeRPCResp.setMaterialType(typeRespDTO.getMaterialType());
+ typeRPCResp.setMaterialTypeName(typeRespDTO.getMaterialTypeName());
+ if(!CollectionUtils.isEmpty(typeRespDTO.getList())){
+ List<EmergencySuppliesRPCResp> emergencySuppliesRPCRespList = BeanCopyUtils.copyBeanList(typeRespDTO.getList(), EmergencySuppliesRPCResp.class);
+ typeRPCResp.setList(emergencySuppliesRPCRespList);
+ }
+ typeRPCRespList.add(typeRPCResp);
+ }
+ return new ResultVO<>(ResultCodes.OK,typeRPCRespList);
}
}
--
Gitblit v1.9.2