From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/cmd/meterMachine/ListMeterMachineCmd.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 ae878a0..89095df 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,24 +16,20 @@
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.meterMachineFactory.MeterMachineFactoryDto;
-import com.java110.dto.meterMachineFactorySpec.MeterMachineFactorySpecDto;
-import com.java110.dto.meterMachineSpec.MeterMachineSpecDto;
+import com.java110.dto.meter.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 com.java110.dto.meter.MeterMachineDto;
import java.util.List;
import java.util.ArrayList;
@@ -64,6 +60,9 @@
@Autowired
private IMeterMachineSpecV1InnerServiceSMO meterMachineSpecV1InnerServiceSMOImpl;
+ @Autowired
+ private ISmartMeterCoreRead smartMeterCoreReadImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
@@ -82,6 +81,7 @@
if (count > 0) {
meterMachineDtos = meterMachineV1InnerServiceSMOImpl.queryMeterMachines(meterMachineDto);
freshSpecs(meterMachineDtos);
+ queryMeterMachineDegree(meterMachineDtos);
} else {
meterMachineDtos = new ArrayList<>();
}
@@ -93,6 +93,19 @@
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 + "");
+ }
+
/**
* 鍒峰叆閰嶇疆
*
--
Gitblit v1.8.0