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/meterMachine/ListMeterMachineCmd.java | 90 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 15 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/meterMachine/ListMeterMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/meterMachine/ListMeterMachineCmd.java
index e37a5ea..cb748f6 100644
--- a/service-common/src/main/java/com/java110/common/cmd/meterMachine/ListMeterMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/meterMachine/ListMeterMachineCmd.java
@@ -16,22 +16,24 @@
package com.java110.common.cmd.meterMachine;
import com.alibaba.fastjson.JSONObject;
+import com.java110.common.smartMeter.ISmartMeterCoreRead;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.meterMachine.MeterMachineSpecDto;
+import com.java110.intf.common.IMeterMachineSpecV1InnerServiceSMO;
import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
-import com.java110.po.meterMachine.MeterMachinePo;
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.meterMachine.MeterMachineDto;
+
import java.util.List;
import java.util.ArrayList;
+
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
import org.slf4j.Logger;
@@ -51,34 +53,92 @@
@Java110Cmd(serviceCode = "meterMachine.listMeterMachine")
public class ListMeterMachineCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(ListMeterMachineCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(ListMeterMachineCmd.class);
@Autowired
private IMeterMachineV1InnerServiceSMO meterMachineV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMeterMachineSpecV1InnerServiceSMO meterMachineSpecV1InnerServiceSMOImpl;
+
+ @Autowired
+ private ISmartMeterCoreRead smartMeterCoreReadImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+ Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖�");
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- MeterMachineDto meterMachineDto = BeanConvertUtil.covertBean(reqJson, MeterMachineDto.class);
+ MeterMachineDto meterMachineDto = BeanConvertUtil.covertBean(reqJson, MeterMachineDto.class);
- int count = meterMachineV1InnerServiceSMOImpl.queryMeterMachinesCount(meterMachineDto);
+ int count = meterMachineV1InnerServiceSMOImpl.queryMeterMachinesCount(meterMachineDto);
- List<MeterMachineDto> meterMachineDtos = null;
+ List<MeterMachineDto> meterMachineDtos = null;
- if (count > 0) {
- meterMachineDtos = meterMachineV1InnerServiceSMOImpl.queryMeterMachines(meterMachineDto);
- } else {
- meterMachineDtos = new ArrayList<>();
- }
+ if (count > 0) {
+ meterMachineDtos = meterMachineV1InnerServiceSMOImpl.queryMeterMachines(meterMachineDto);
+ freshSpecs(meterMachineDtos);
+ queryMeterMachineDegree(meterMachineDtos);
+ } else {
+ meterMachineDtos = new ArrayList<>();
+ }
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, meterMachineDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, meterMachineDtos);
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
- cmdDataFlowContext.setResponseEntity(responseEntity);
+ cmdDataFlowContext.setResponseEntity(responseEntity);
+ }
+
+ private void queryMeterMachineDegree(List<MeterMachineDto> meterMachineDtos) {
+ if (meterMachineDtos == null || meterMachineDtos.size() != 1) {
+ return;
+ }
+
+ if (!MeterMachineDto.MACHINE_MODEL_RECHARGE.equals(meterMachineDtos.get(0).getMachineModel())) {
+ return;
+ }
+
+ double degree = smartMeterCoreReadImpl.getMeterDegree(meterMachineDtos.get(0));
+ meterMachineDtos.get(0).setDegree(degree + "");
+ }
+
+ /**
+ * 鍒峰叆閰嶇疆
+ *
+ * @param meterMachineDtos
+ */
+ private void freshSpecs(List<MeterMachineDto> meterMachineDtos) {
+
+ if (meterMachineDtos == null || meterMachineDtos.size() < 1) {
+ return;
+ }
+
+ List<String> machineIds = new ArrayList<>();
+ for (MeterMachineDto meterMachineDto : meterMachineDtos) {
+ machineIds.add(meterMachineDto.getMachineId());
+ }
+
+ MeterMachineSpecDto meterMachineSpecDto = new MeterMachineSpecDto();
+ meterMachineSpecDto.setMachineIds(machineIds.toArray(new String[machineIds.size()]));
+
+ List<MeterMachineSpecDto> meterMachineSpecDtos = meterMachineSpecV1InnerServiceSMOImpl.queryMeterMachineSpecs(meterMachineSpecDto);
+
+ if (meterMachineSpecDtos == null || meterMachineSpecDtos.size() < 1) {
+ return;
+ }
+ List<MeterMachineSpecDto> specs = null;
+ for (MeterMachineDto meterMachineDto : meterMachineDtos) {
+ specs = new ArrayList<>();
+ for (MeterMachineSpecDto tmpMeterMachineFactorySpecDto : meterMachineSpecDtos) {
+ if (meterMachineDto.getMachineId().equals(tmpMeterMachineFactorySpecDto.getMachineId())) {
+ specs.add(tmpMeterMachineFactorySpecDto);
+ }
+ }
+ meterMachineDto.setSpecs(specs);
+ }
}
}
--
Gitblit v1.8.0