From a8a4a22dd94226f4734f6473993e2c08371b0416 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 22 七月 2022 11:07:34 +0800
Subject: [PATCH] 优化添加设备 时 属性无法添加的bug
---
service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 6270465..0102f56 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
@@ -25,6 +25,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.community.CommunityLocationDto;
+import com.java110.dto.machine.MachineDto;
import com.java110.intf.common.IMachineAttrInnerServiceSMO;
import com.java110.intf.common.IMachineV1InnerServiceSMO;
import com.java110.intf.community.ICommunityLocationV1InnerServiceSMO;
@@ -33,6 +34,7 @@
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.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -93,18 +95,20 @@
MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
machinePo.setLocationObjId(locationDtos.get(0).getLocationObjId());
machinePo.setMachineId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ machinePo.setHeartbeatTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ machinePo.setState(MachineDto.MACHINE_STATE_ON);
int flag = machineV1InnerServiceSMOImpl.saveMachine(machinePo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
- dealMachineAttr(reqJson);
+ dealMachineAttr(reqJson,machinePo);
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
- private void dealMachineAttr(JSONObject paramObj) {
+ private void dealMachineAttr(JSONObject paramObj,MachinePo machinePo) {
if (!paramObj.containsKey("attrs")) {
return;
@@ -120,7 +124,7 @@
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.setMachineId(machinePo.getMachineId());
attr.setAttrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
flag = machineAttrInnerServiceSMOImpl.saveMachineAttrs(attr);
if (flag < 1) {
--
Gitblit v1.8.0