From 5fc2fc57afc63a906ec5567e91aeab72d20aab7d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 16 一月 2023 23:17:50 +0800
Subject: [PATCH] 优化代码

---
 service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 4920ad5..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
@@ -31,7 +31,6 @@
 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;
@@ -79,6 +78,14 @@
         Assert.hasKeyAndValue(reqJson, "authCode", "蹇呭~锛岃濉啓閴存潈缂栫爜");
         Assert.hasKeyAndValue(reqJson, "locationTypeCd", "蹇呭~锛岃閫夋嫨浣嶇疆绫诲瀷");
 
+        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);
 
     }
@@ -88,7 +95,7 @@
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
 
-        if(!MachineDto.MACHINE_TYPE_MONITOR.equals(reqJson.getString("machineTypeCd"))) {
+        if (!MachineDto.MACHINE_TYPE_MONITOR.equals(reqJson.getString("machineTypeCd"))) {
             CommunityLocationDto communityLocationDto = new CommunityLocationDto();
             communityLocationDto.setCommunityId(reqJson.getString("communityId"));
             communityLocationDto.setLocationId(reqJson.getString("locationTypeCd"));

--
Gitblit v1.8.0