From 4f453600a18461b6c71cdf9e6f2bae7786c648ae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 05 八月 2021 16:12:34 +0800
Subject: [PATCH] 优化successCount 错误问题

---
 service-common/src/main/java/com/java110/common/bmo/assetImportLog/impl/SaveAssetImportLogBMOImpl.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/bmo/assetImportLog/impl/SaveAssetImportLogBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/assetImportLog/impl/SaveAssetImportLogBMOImpl.java
index 631ee35..eb09c8d 100644
--- a/service-common/src/main/java/com/java110/common/bmo/assetImportLog/impl/SaveAssetImportLogBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/assetImportLog/impl/SaveAssetImportLogBMOImpl.java
@@ -1,14 +1,21 @@
 package com.java110.common.bmo.assetImportLog.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.java110.common.bmo.assetImportLog.ISaveAssetImportLogBMO;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.common.IAssetImportLogDetailInnerServiceSMO;
 import com.java110.intf.common.IAssetImportLogInnerServiceSMO;
 import com.java110.po.assetImportLog.AssetImportLogPo;
+import com.java110.po.assetImportLogDetail.AssetImportLogDetailPo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Service("saveAssetImportLogBMOImpl")
 public class SaveAssetImportLogBMOImpl implements ISaveAssetImportLogBMO {
@@ -16,23 +23,57 @@
     @Autowired
     private IAssetImportLogInnerServiceSMO assetImportLogInnerServiceSMOImpl;
 
+    @Autowired
+    private IAssetImportLogDetailInnerServiceSMO assetImportLogDetailInnerServiceSMOImpl;
+
     /**
      * 娣诲姞灏忓尯淇℃伅
      *
-     * @param assetImportLogPo
+     * @param reqJson
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
     @Java110Transactional
-    public ResponseEntity<String> save(AssetImportLogPo assetImportLogPo) {
-
+    public ResponseEntity<String> save(JSONObject reqJson) {
+        AssetImportLogPo assetImportLogPo = new AssetImportLogPo();
         assetImportLogPo.setLogId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_logId));
+        assetImportLogPo.setCommunityId(reqJson.getString("communityId"));
+        assetImportLogPo.setErrorCount(reqJson.getString("errorCount"));
+        assetImportLogPo.setLogType(reqJson.getString("logType"));
+        assetImportLogPo.setSuccessCount(reqJson.getString("successCount"));
         int flag = assetImportLogInnerServiceSMOImpl.saveAssetImportLog(assetImportLogPo);
 
-        if (flag > 0) {
+        if (flag < 1) {
+            throw new IllegalArgumentException("淇濆瓨 瀵煎叆鏃ュ織澶辫触");
+        }
+
+        if (!reqJson.containsKey("assetImportLogDetailDtos")) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+        }
+        JSONArray assetImportLogDetailDtos = reqJson.getJSONArray("assetImportLogDetailDtos");
+        if (assetImportLogDetailDtos.size() < 1) {
             return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
         }
 
-        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+        List<AssetImportLogDetailPo> assetImportLogDetailPos = new ArrayList<>();
+        AssetImportLogDetailPo assetImportLogDetailPo = null;
+        for (int detailIndex = 0; detailIndex < assetImportLogDetailDtos.size(); detailIndex++) {
+            assetImportLogDetailPo = new AssetImportLogDetailPo();
+            assetImportLogDetailPo.setCommunityId(assetImportLogPo.getCommunityId());
+            assetImportLogDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+            assetImportLogDetailPo.setLogId(assetImportLogPo.getLogId());
+            assetImportLogDetailPo.setMessage(assetImportLogDetailDtos.getJSONObject(detailIndex).getString("message"));
+            assetImportLogDetailPo.setObjName(assetImportLogDetailDtos.getJSONObject(detailIndex).getString("objName"));
+            assetImportLogDetailPo.setState(assetImportLogDetailDtos.getJSONObject(detailIndex).getString("state"));
+            assetImportLogDetailPos.add(assetImportLogDetailPo);
+        }
+
+        flag = assetImportLogDetailInnerServiceSMOImpl.saveAssetImportLogDetails(assetImportLogDetailPos);
+        if (flag < 1) {
+            throw new IllegalArgumentException("淇濆瓨 瀵煎叆鏃ュ織澶辫触");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+
     }
 
 }

--
Gitblit v1.8.0