From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 service-dev/src/main/java/com/java110/dev/cmd/dict/SaveDictCmd.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/service-dev/src/main/java/com/java110/dev/cmd/dict/SaveDictCmd.java b/service-dev/src/main/java/com/java110/dev/cmd/dict/SaveDictCmd.java
index 4379327..bad6b21 100644
--- a/service-dev/src/main/java/com/java110/dev/cmd/dict/SaveDictCmd.java
+++ b/service-dev/src/main/java/com/java110/dev/cmd/dict/SaveDictCmd.java
@@ -21,16 +21,19 @@
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.dictSpec.DictSpecDto;
+import com.java110.intf.dev.IDictSpecV1InnerServiceSMO;
 import com.java110.intf.dev.IDictV1InnerServiceSMO;
 import com.java110.po.dict.DictPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
 
 /**
  * 绫昏〃杩帮細淇濆瓨
@@ -52,12 +55,14 @@
     @Autowired
     private IDictV1InnerServiceSMO dictV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IDictSpecV1InnerServiceSMO dictSpecV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "statusCd", "璇锋眰鎶ユ枃涓湭鍖呭惈statusCd");
-Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
-Assert.hasKeyAndValue(reqJson, "tableColumns", "璇锋眰鎶ユ枃涓湭鍖呭惈tableColumns");
-Assert.hasKeyAndValue(reqJson, "tableName", "璇锋眰鎶ユ枃涓湭鍖呭惈tableName");
+        Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
+        Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈绫诲瀷");
 
     }
 
@@ -65,7 +70,15 @@
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       DictPo dictPo = BeanConvertUtil.covertBean(reqJson, DictPo.class);
+        DictSpecDto dictSpecDto  = new DictSpecDto();
+        dictSpecDto.setSpecId(reqJson.getString("specId"));
+        List<DictSpecDto> dictSpecDtos = dictSpecV1InnerServiceSMOImpl.queryDictSpecs(dictSpecDto);
+
+        Assert.listOnlyOne(dictSpecDtos,"鏈煡璇㈠埌绫诲瀷");
+
+        DictPo dictPo = BeanConvertUtil.covertBean(reqJson, DictPo.class);
+        dictPo.setTableName(dictSpecDtos.get(0).getTableName());
+        dictPo.setTableColumns(dictSpecDtos.get(0).getTableColumns());
         int flag = dictV1InnerServiceSMOImpl.saveDict(dictPo);
 
         if (flag < 1) {

--
Gitblit v1.8.0