From 75bf0fa6a3e113bd77191ace7e46f557b27552ee Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 19 九月 2022 18:55:42 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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..059d64f 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;
@@ -74,6 +76,14 @@
Assert.hasKeyAndValue(reqJson, "authCode", "蹇呭～锛岃濉啓閴存潈缂栫爜");
Assert.hasKeyAndValue(reqJson, "locationTypeCd", "蹇呭～锛岃閫夋嫨浣嶇疆绫诲瀷");
+ MachineDto machineDto = new MachineDto();
+ machineDto.setMachineCode(reqJson.getString("machineCode"));
+ int count = machineV1InnerServiceSMOImpl.queryMachinesCount(machineDto);
+
+ if (count > 0) {
+ throw new CmdException("璁惧宸插瓨鍦�");
+ }
+
//灞炴�ф牎楠�
Assert.judgeAttrValue(reqJson);
@@ -82,29 +92,35 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
- CommunityLocationDto communityLocationDto = new CommunityLocationDto();
- communityLocationDto.setCommunityId(reqJson.getString("communityId"));
- communityLocationDto.setLocationId(reqJson.getString("locationTypeCd"));
- List<CommunityLocationDto> locationDtos = communityLocationV1InnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
-
- Assert.listOnlyOne(locationDtos, "浣嶇疆涓嶅瓨鍦�");
-
MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
- machinePo.setLocationObjId(locationDtos.get(0).getLocationObjId());
+
+ if (!MachineDto.MACHINE_TYPE_MONITOR.equals(reqJson.getString("machineTypeCd"))) {
+ CommunityLocationDto communityLocationDto = new CommunityLocationDto();
+ communityLocationDto.setCommunityId(reqJson.getString("communityId"));
+ communityLocationDto.setLocationId(reqJson.getString("locationTypeCd"));
+ List<CommunityLocationDto> locationDtos = communityLocationV1InnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
+ Assert.listOnlyOne(locationDtos, "浣嶇疆涓嶅瓨鍦�");
+ machinePo.setLocationObjId(locationDtos.get(0).getLocationObjId());
+ } else {
+ machinePo.setLocationObjId("-1");
+ machinePo.setLocationTypeCd("-1");
+ }
+
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 +136,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