From 630cb0babb264657d8a07476e328654573620f8c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 一月 2022 13:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java
old mode 100644
new mode 100755
index e2013c1..770d713
--- a/service-api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/machine/impl/MachineBMOImpl.java
@@ -4,8 +4,9 @@
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.machine.IMachineBMO;
 import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.common.IMachineInnerServiceSMO;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.machine.MachineDto;
+import com.java110.intf.common.IMachineInnerServiceSMO;
 import com.java110.po.machine.MachinePo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.Assert;
@@ -53,11 +54,12 @@
         JSONObject businessMachine = new JSONObject();
         businessMachine.putAll(paramInJson);
         businessMachine.put("state", "1000");
-        businessMachine.put("machineId", "-1");
+        businessMachine.put("machineId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineId));
         //璁$畻 搴旀敹閲戦
 
         MachinePo machinePo = BeanConvertUtil.covertBean(businessMachine, MachinePo.class);
         super.insert(dataFlowContext, machinePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE);
+        paramInJson.put("machineId", businessMachine.getString("machineId"));
 
     }
 

--
Gitblit v1.8.0