From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.java
index e08daae..92ca10e 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.java
@@ -24,11 +24,13 @@
import com.java110.core.event.cmd.CmdEvent;
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;
import com.java110.po.machine.MachineAttrPo;
import com.java110.po.machine.MachinePo;
-import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -36,6 +38,8 @@
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
/**
@@ -60,6 +64,9 @@
@Autowired
private IMachineAttrInnerServiceSMO machineAttrInnerServiceSMOImpl;
+ @Autowired
+ private ICommunityLocationV1InnerServiceSMO communityLocationV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "machineId", "璁惧ID涓嶈兘涓虹┖");
@@ -70,7 +77,14 @@
Assert.hasKeyAndValue(reqJson, "direction", "蹇呭～锛岃閫夋嫨璁惧鏂瑰悜");
Assert.hasKeyAndValue(reqJson, "authCode", "蹇呭～锛岃濉啓閴存潈缂栫爜");
Assert.hasKeyAndValue(reqJson, "locationTypeCd", "蹇呭～锛岃閫夋嫨浣嶇疆绫诲瀷");
- Assert.hasKeyAndValue(reqJson, "locationObjId", "蹇呭～锛岃濉啓浣嶇疆瀵硅薄ID");
+
+ MachineDto machineDto = new MachineDto();
+ machineDto.setMachineCode(reqJson.getString("machineCode"));
+ List<MachineDto> machineDtos = machineV1InnerServiceSMOImpl.queryMachines(machineDto);
+
+ if (machineDtos != null && machineDtos.size() > 0 && !reqJson.getString("machineId").equals(machineDtos.get(0).getMachineId())) {
+ throw new CmdException("璁惧宸插瓨鍦�");
+ }
Assert.judgeAttrValue(reqJson);
@@ -79,10 +93,18 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
- int flag = machineV1InnerServiceSMOImpl.updateMachine(machinePo);
+ 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());
+ }
+
+ int flag = machineV1InnerServiceSMOImpl.updateMachine(machinePo);
if (flag < 1) {
throw new CmdException("鏇存柊鏁版嵁澶辫触");
}
@@ -91,7 +113,6 @@
if (attrs.size() < 1) {
return;
}
-
MachineAttrPo attr = null;
JSONObject aObj = null;
--
Gitblit v1.8.0