From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineFactoryCmd.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineFactoryCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineFactoryCmd.java
index 2230a69..1b2bf3f 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineFactoryCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineFactoryCmd.java
@@ -20,13 +20,14 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.chargeMachine.ChargeMachineFactorySpecDto;
+import com.java110.intf.common.IChargeMachineFactorySpecV1InnerServiceSMO;
import com.java110.intf.common.IChargeMachineFactoryV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.chargeMachineFactory.ChargeMachineFactoryDto;
+import com.java110.dto.chargeMachine.ChargeMachineFactoryDto;
import java.util.List;
import java.util.ArrayList;
import org.springframework.http.ResponseEntity;
@@ -52,10 +53,12 @@
@Autowired
private IChargeMachineFactoryV1InnerServiceSMO chargeMachineFactoryV1InnerServiceSMOImpl;
+ @Autowired
+ private IChargeMachineFactorySpecV1InnerServiceSMO chargeMachineFactorySpecV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
- Assert.hasKeyAndValue(reqJson, "communityId", "鏌ヨ灏忓尯ID");
}
@Override
@@ -69,6 +72,7 @@
if (count > 0) {
chargeMachineFactoryDtos = chargeMachineFactoryV1InnerServiceSMOImpl.queryChargeMachineFactorys(chargeMachineFactoryDto);
+ freshSpecs(chargeMachineFactoryDtos);
} else {
chargeMachineFactoryDtos = new ArrayList<>();
}
@@ -79,4 +83,40 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ /**
+ * 鍒峰叆閰嶇疆
+ *
+ * @param chargeMachineFactoryDtos
+ */
+ private void freshSpecs(List<ChargeMachineFactoryDto> chargeMachineFactoryDtos) {
+
+ if (chargeMachineFactoryDtos == null || chargeMachineFactoryDtos.size() < 1) {
+ return;
+ }
+
+ List<String> factoryIds = new ArrayList<>();
+ for (ChargeMachineFactoryDto chargeMachineFactoryDto : chargeMachineFactoryDtos) {
+ factoryIds.add(chargeMachineFactoryDto.getFactoryId());
+ }
+
+ ChargeMachineFactorySpecDto chargeMachineFactorySpecDto = new ChargeMachineFactorySpecDto();
+ chargeMachineFactorySpecDto.setFactoryIds(factoryIds.toArray(new String[factoryIds.size()]));
+
+ List<ChargeMachineFactorySpecDto> machineFactorySpecDtos = chargeMachineFactorySpecV1InnerServiceSMOImpl.queryChargeMachineFactorySpecs(chargeMachineFactorySpecDto);
+
+ if (machineFactorySpecDtos == null || machineFactorySpecDtos.size() < 1) {
+ return;
+ }
+ List<ChargeMachineFactorySpecDto> specs = null;
+ for (ChargeMachineFactoryDto chargeMachineFactoryDto : chargeMachineFactoryDtos) {
+ specs = new ArrayList<>();
+ for (ChargeMachineFactorySpecDto tmpMeterMachineFactorySpecDto : machineFactorySpecDtos) {
+ if (chargeMachineFactoryDto.getFactoryId().equals(tmpMeterMachineFactorySpecDto.getFactoryId())) {
+ specs.add(tmpMeterMachineFactorySpecDto);
+ }
+ }
+ chargeMachineFactoryDto.setSpecs(specs);
+ }
+ }
}
--
Gitblit v1.8.0