From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize

---
 service-common/src/main/java/com/java110/common/cmd/chargeMachine/SaveChargeMachineCmd.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/SaveChargeMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/SaveChargeMachineCmd.java
index a4e4e39..1e3c76b 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/SaveChargeMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/SaveChargeMachineCmd.java
@@ -23,14 +23,14 @@
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.chargeMachinePort.ChargeMachinePortDto;
+import com.java110.dto.chargeMachine.ChargeMachineDto;
+import com.java110.dto.chargeMachine.ChargeMachinePortDto;
 import com.java110.intf.common.IChargeMachinePortV1InnerServiceSMO;
 import com.java110.intf.common.IChargeMachineSpecV1InnerServiceSMO;
 import com.java110.intf.common.IChargeMachineV1InnerServiceSMO;
 import com.java110.po.chargeMachine.ChargeMachinePo;
 import com.java110.po.chargeMachinePort.ChargeMachinePortPo;
 import com.java110.po.chargeMachineSpec.ChargeMachineSpecPo;
-import com.java110.po.meterMachineSpec.MeterMachineSpecPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -71,11 +71,18 @@
         Assert.hasKeyAndValue(reqJson, "machineName", "璇锋眰鎶ユ枃涓湭鍖呭惈machineName");
         Assert.hasKeyAndValue(reqJson, "machineCode", "璇锋眰鎶ユ枃涓湭鍖呭惈machineCode");
         Assert.hasKeyAndValue(reqJson, "implBean", "璇锋眰鎶ユ枃涓湭鍖呭惈implBean");
-        Assert.hasKeyAndValue(reqJson, "durationPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈durationPrice");
-        Assert.hasKeyAndValue(reqJson, "energyPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈energyPrice");
+        Assert.hasKeyAndValue(reqJson, "ruleId", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleId");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
         Assert.hasKeyAndValue(reqJson, "portCount", "璇锋眰鎶ユ枃涓湭鍖呭惈portCount");
 
+        ChargeMachineDto chargeMachineDto = new ChargeMachineDto();
+        chargeMachineDto.setMachineCode(reqJson.getString("machineCode"));
+        int count = chargeMachineV1InnerServiceSMOImpl.queryChargeMachinesCount(chargeMachineDto);
+
+        if (count > 0) {
+            throw new CmdException("鍏呯數妗╃紪鍙峰凡瀛樺湪");
+        }
+
 
         JSONArray specs = reqJson.getJSONArray("specs");
         if (specs == null || specs.size() < 1) {

--
Gitblit v1.8.0