Merge branch 'feature/S3' into release/S3

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/executor/ItemExecutorCreateEAIService.java

@@ -1,6 +1,7 @@
 package com.digiwin.athena.app.service.executor;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.digiwin.app.container.exceptions.DWBusinessException;
 import com.digiwin.app.service.DWEAIResult;
@@ -62,7 +63,7 @@ public class ItemExecutorCreateEAIService extends AbsEAIService {
         //进行批量新增
         itemExecutorService.saveBatch(itemExecutorInfo);
 
-        return EAIUtil.buildEAIResult(new HashMap<>());
+        return EAIUtil.buildEAIResult(new JSONObject().fluentPut("item_executor_info",itemExecutorInfo));
     }
 
 

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/supplier/SupplierContactInfoCreateEAIService.java

@@ -1,5 +1,6 @@
 package com.digiwin.athena.app.service.supplier;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.digiwin.app.service.DWEAIResult;
 import com.digiwin.athena.app.infra.entity.SupplierContactEntity;
@@ -51,6 +52,6 @@ public class SupplierContactInfoCreateEAIService extends AbsEAIService {
 
         this.supplierContactInfoService.saveBatch(supplierContactEntities);
 
-        return EAIUtil.buildEAIResult(new HashMap<>());
+        return EAIUtil.buildEAIResult(new JSONObject().fluentPut("contact_info", supplierContactEntities));
     }
 }

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/supplier/SupplierCreateEAIService.java

@@ -1,5 +1,6 @@
 package com.digiwin.athena.app.service.supplier;
 
+import com.alibaba.fastjson.JSONObject;
 import com.digiwin.app.service.DWEAIResult;
 import com.digiwin.athena.app.infra.entity.ItemSupplierEntity;
 import com.digiwin.athena.app.infra.service.SupplierService;
@@ -35,6 +36,6 @@ public class SupplierCreateEAIService extends AbsEAIService {
         EAIRequest eaiRequest = EAIRequest.build(messageBody);
         List<ItemSupplierEntity> supplierInfo = eaiRequest.getObject("item_supplier_info", SupplierUtil.LIST_ENTITY_SUPPLIER);
         supplierService.saveBatch(supplierInfo);
-        return EAIUtil.buildEAIResult(new HashMap<>());
+        return EAIUtil.buildEAIResult(new JSONObject().fluentPut("item_supplier_info", supplierInfo));
     }
 }