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/SaveMeterMachineCmd.java | 80 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/meterMachine/SaveMeterMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/meterMachine/SaveMeterMachineCmd.java
index 0ae9c79..fe02e46 100644
--- a/service-common/src/main/java/com/java110/common/cmd/meterMachine/SaveMeterMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/meterMachine/SaveMeterMachineCmd.java
@@ -15,6 +15,7 @@
*/
package com.java110.common.cmd.meterMachine;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
@@ -22,15 +23,23 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.meterMachine.MeterMachineDto;
+import com.java110.intf.common.IMeterMachineSpecV1InnerServiceSMO;
import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.po.meterMachine.MeterMachinePo;
+import com.java110.po.meterMachineSpec.MeterMachineSpecPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.List;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -52,6 +61,12 @@
@Autowired
private IMeterMachineV1InnerServiceSMO meterMachineV1InnerServiceSMOImpl;
+ @Autowired
+ private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
+ @Autowired
+ private IMeterMachineSpecV1InnerServiceSMO meterMachineSpecV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "machineName", "璇锋眰鎶ユ枃涓湭鍖呭惈machineName");
@@ -59,23 +74,88 @@
Assert.hasKeyAndValue(reqJson, "meterType", "璇锋眰鎶ユ枃涓湭鍖呭惈meterType");
Assert.hasKeyAndValue(reqJson, "machineModel", "璇锋眰鎶ユ枃涓湭鍖呭惈machineModel");
Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
+ Assert.hasKeyAndValue(reqJson, "roomName", "璇锋眰鎶ユ枃涓湭鍖呭惈鎴垮眿鍚嶇О");
Assert.hasKeyAndValue(reqJson, "feeConfigId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeConfigId");
Assert.hasKeyAndValue(reqJson, "implBean", "璇锋眰鎶ユ枃涓湭鍖呭惈implBean");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ if (!reqJson.containsKey("specs")) {
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+
+ return;
+ }
+
+ JSONArray specs = reqJson.getJSONArray("specs");
+ if (specs == null || specs.size() < 1) {
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+
+ return;
+ }
+
+ JSONObject specObj = null;
+ for (int specIndex = 0; specIndex < specs.size(); specIndex++) {
+ specObj = specs.getJSONObject(specIndex);
+
+ Assert.hasKeyAndValue(specObj, "specValue", "鏈寘鍚�" + specObj.getString("specName"));
+ }
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setConfigId(reqJson.getString("feeConfigId"));
+ feeConfigDto.setCommunityId(reqJson.getString("communityId"));
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+ Assert.listOnlyOne(feeConfigDtos, "璐圭敤椤逛笉瀛樺湪");
+
MeterMachinePo meterMachinePo = BeanConvertUtil.covertBean(reqJson, MeterMachinePo.class);
meterMachinePo.setMachineId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ meterMachinePo.setFeeConfigName(feeConfigDtos.get(0).getFeeName());
+ meterMachinePo.setCurDegrees("0");
+ meterMachinePo.setCurReadingTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ meterMachinePo.setPrestoreDegrees("0");
+ meterMachinePo.setHeartbeatTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ if(MeterMachineDto.MACHINE_MODEL_RECHARGE.equals(meterMachinePo.getMachineModel())){
+ meterMachinePo.setReadDay(1);
+ meterMachinePo.setReadHours(1);
+ }
int flag = meterMachineV1InnerServiceSMOImpl.saveMeterMachine(meterMachinePo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+ if (!reqJson.containsKey("specs")) {
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+
+ return;
+ }
+
+ JSONArray specs = reqJson.getJSONArray("specs");
+ if (specs == null || specs.size() < 1) {
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+
+ return;
+ }
+
+ JSONObject specObj = null;
+ MeterMachineSpecPo meterMachineSpecPo = null;
+ for (int specIndex = 0; specIndex < specs.size(); specIndex++) {
+ specObj = specs.getJSONObject(specIndex);
+ meterMachineSpecPo = new MeterMachineSpecPo();
+ meterMachineSpecPo.setMachineId(meterMachinePo.getMachineId());
+ meterMachineSpecPo.setSpecId(specObj.getString("specId"));
+ meterMachineSpecPo.setSpecName(specObj.getString("specName"));
+ meterMachineSpecPo.setSpecValue(specObj.getString("specValue"));
+ meterMachineSpecPo.setMmsId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ meterMachineSpecPo.setCommunityId(meterMachinePo.getCommunityId());
+ flag = meterMachineSpecV1InnerServiceSMOImpl.saveMeterMachineSpec(meterMachineSpecPo);
+
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+ }
+ }
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
--
Gitblit v1.8.0