From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-common/src/main/java/com/java110/common/cmd/machineType/UpdateMachineTypeCmd.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/cmd/machineType/UpdateMachineTypeCmd.java b/service-common/src/main/java/com/java110/common/cmd/machineType/UpdateMachineTypeCmd.java
index f6fd18f..b3e2c9d 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machineType/UpdateMachineTypeCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machineType/UpdateMachineTypeCmd.java
@@ -19,9 +19,8 @@
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.common.IMachineTypeV1InnerServiceSMO;
 import com.java110.po.machineType.MachineTypePo;
 import com.java110.utils.exception.CmdException;
@@ -30,7 +29,7 @@
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 
 
 /**
@@ -44,9 +43,9 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "machineType.updateMachineType")
-public class UpdateMachineTypeCmd extends AbstractServiceCmdListener {
+public class UpdateMachineTypeCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateMachineTypeCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(UpdateMachineTypeCmd.class);
 
 
     @Autowired
@@ -55,7 +54,6 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "typeId", "typeId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "typeId", "typeId涓嶈兘涓虹┖");
 
     }
 
@@ -63,7 +61,7 @@
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       MachineTypePo machineTypePo = BeanConvertUtil.covertBean(reqJson, MachineTypePo.class);
+        MachineTypePo machineTypePo = BeanConvertUtil.covertBean(reqJson, MachineTypePo.class);
         int flag = machineTypeV1InnerServiceSMOImpl.updateMachineType(machineTypePo);
 
         if (flag < 1) {

--
Gitblit v1.8.0