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/UpdateMeterMachineCmd.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/meterMachine/UpdateMeterMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/meterMachine/UpdateMeterMachineCmd.java
index 211662a..1a3e906 100644
--- a/service-common/src/main/java/com/java110/common/cmd/meterMachine/UpdateMeterMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/meterMachine/UpdateMeterMachineCmd.java
@@ -15,15 +15,17 @@
*/
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;
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.intf.common.IMeterMachineSpecV1InnerServiceSMO;
import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
-import com.java110.po.meterMachine.MeterMachinePo;
+import com.java110.po.meter.MeterMachinePo;
+import com.java110.po.meter.MeterMachineSpecPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -46,30 +48,82 @@
@Java110Cmd(serviceCode = "meterMachine.updateMeterMachine")
public class UpdateMeterMachineCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(UpdateMeterMachineCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(UpdateMeterMachineCmd.class);
@Autowired
private IMeterMachineV1InnerServiceSMO meterMachineV1InnerServiceSMOImpl;
+ @Autowired
+ private IMeterMachineSpecV1InnerServiceSMO meterMachineSpecV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "machineId", "machineId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
+ 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 {
- MeterMachinePo meterMachinePo = BeanConvertUtil.covertBean(reqJson, MeterMachinePo.class);
+ MeterMachinePo meterMachinePo = BeanConvertUtil.covertBean(reqJson, MeterMachinePo.class);
int flag = meterMachineV1InnerServiceSMOImpl.updateMeterMachine(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.setCommunityId(meterMachinePo.getCommunityId());
+ flag = meterMachineSpecV1InnerServiceSMOImpl.updateMeterMachineSpec(meterMachineSpecPo);
+
+ if (flag < 1) {
+ throw new CmdException("淇敼鏁版嵁澶辫触");
+ }
+ }
+
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0