From f498c77c01ea479fa67663286fbbb3cf8b66e689 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 七月 2022 18:34:20 +0800
Subject: [PATCH] 优化设备 调整为cmd 模式
---
service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java
index bff4e77..b4b214a 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java
@@ -15,6 +15,7 @@
*/
package com.java110.common.cmd.machine;
+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,17 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.intf.common.IMachineAttrInnerServiceSMO;
import com.java110.intf.common.IMachineV1InnerServiceSMO;
+import com.java110.po.machine.MachineAttrPo;
import com.java110.po.machine.MachinePo;
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 org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -52,16 +55,22 @@
@Autowired
private IMachineV1InnerServiceSMO machineV1InnerServiceSMOImpl;
+ @Autowired
+ private IMachineAttrInnerServiceSMO machineAttrInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue( reqJson, "machineCode", "璇锋眰鎶ユ枃涓湭鍖呭惈machineCode" );
- Assert.hasKeyAndValue( reqJson, "machineVersion", "璇锋眰鎶ユ枃涓湭鍖呭惈machineVersion" );
- Assert.hasKeyAndValue( reqJson, "machineTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈machineTypeCd" );
- Assert.hasKeyAndValue( reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId" );
- Assert.hasKeyAndValue( reqJson, "machineName", "璇锋眰鎶ユ枃涓湭鍖呭惈machineName" );
- Assert.hasKeyAndValue( reqJson, "authCode", "璇锋眰鎶ユ枃涓湭鍖呭惈authCode" );
- Assert.hasKeyAndValue( reqJson, "direction", "璇锋眰鎶ユ枃涓湭鍖呭惈direction" );
- Assert.hasKeyAndValue( reqJson, "typeId", "璇锋眰鎶ユ枃涓湭鍖呭惈typeId" );
+ Assert.hasKeyAndValue(reqJson, "machineCode", "蹇呭～锛岃濉啓璁惧缂栫爜");
+ Assert.hasKeyAndValue(reqJson, "machineVersion", "蹇呭～锛岃濉啓璁惧鐗堟湰鍙�");
+ Assert.hasKeyAndValue(reqJson, "machineName", "蹇呭～锛岃濉啓璁惧鍚嶇О");
+ Assert.hasKeyAndValue(reqJson, "machineTypeCd", "蹇呭～锛岃閫夋嫨璁惧绫诲瀷");
+ Assert.hasKeyAndValue(reqJson, "direction", "蹇呭～锛岃閫夋嫨璁惧鏂瑰悜");
+ Assert.hasKeyAndValue(reqJson, "authCode", "蹇呭～锛岃濉啓閴存潈缂栫爜");
+ Assert.hasKeyAndValue(reqJson, "locationTypeCd", "蹇呭～锛岃閫夋嫨浣嶇疆绫诲瀷");
+ Assert.hasKeyAndValue(reqJson, "locationObjId", "蹇呭～锛岃濉啓浣嶇疆瀵硅薄ID");
+
+ //灞炴�ф牎楠�
+ Assert.judgeAttrValue(reqJson);
}
@@ -77,6 +86,34 @@
throw new CmdException( "淇濆瓨鏁版嵁澶辫触" );
}
+ dealMachineAttr(reqJson);
+
cmdDataFlowContext.setResponseEntity( ResultVo.success() );
}
+
+ private void dealMachineAttr(JSONObject paramObj) {
+
+ if (!paramObj.containsKey("attrs")) {
+ return;
+ }
+
+ JSONArray attrs = paramObj.getJSONArray("attrs");
+ if (attrs.size() < 1) {
+ return;
+ }
+
+ MachineAttrPo attr = null;
+ int flag = 0;
+ for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
+ attr = BeanConvertUtil.covertBean(attrs.getJSONObject(attrIndex), MachineAttrPo.class);
+ attr.setCommunityId(paramObj.getString("communityId"));
+ attr.setMachineId(paramObj.getString("machineId"));
+ attr.setAttrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID ));
+ flag = machineAttrInnerServiceSMOImpl.saveMachineAttrs(attr);
+ if (flag < 1) {
+ throw new CmdException( "淇濆瓨鏁版嵁澶辫触" );
+ }
+ }
+
+ }
}
--
Gitblit v1.8.0