From 94b912d88a8ce809c698ce53ac2b05cdbc1313e0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 19 六月 2023 13:52:02 +0800
Subject: [PATCH] 优化导入日志功能
---
service-common/src/main/java/com/java110/common/bmo/assetImportLogDetail/impl/GetAssetImportLogDetailBMOImpl.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/assetImportLogDetail/impl/GetAssetImportLogDetailBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/assetImportLogDetail/impl/GetAssetImportLogDetailBMOImpl.java
index 69eb476..97febf9 100644
--- a/service-common/src/main/java/com/java110/common/bmo/assetImportLogDetail/impl/GetAssetImportLogDetailBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/assetImportLogDetail/impl/GetAssetImportLogDetailBMOImpl.java
@@ -1,8 +1,13 @@
package com.java110.common.bmo.assetImportLogDetail.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.assetImportLogDetail.IGetAssetImportLogDetailBMO;
-import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto;
+import com.java110.dto.log.AssetImportLogDetailDto;
+import com.java110.dto.log.AssetImportLogTypeDto;
import com.java110.intf.common.IAssetImportLogDetailInnerServiceSMO;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -28,17 +33,41 @@
int count = assetImportLogDetailInnerServiceSMOImpl.queryAssetImportLogDetailsCount(assetImportLogDetailDto);
List<AssetImportLogDetailDto> assetImportLogDetailDtos = null;
+
+ JSONArray datas = null;
if (count > 0) {
assetImportLogDetailDtos = assetImportLogDetailInnerServiceSMOImpl.queryAssetImportLogDetails(assetImportLogDetailDto);
+ // todo 杞崲涓簀sonArray
+ datas = covertToData(assetImportLogDetailDtos);
} else {
- assetImportLogDetailDtos = new ArrayList<>();
+ datas = new JSONArray();
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) assetImportLogDetailDto.getRow()), count, assetImportLogDetailDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) assetImportLogDetailDto.getRow()), count, datas);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
return responseEntity;
}
+ private JSONArray covertToData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
+ JSONArray datas = new JSONArray();
+
+ if (assetImportLogDetailDtos == null || assetImportLogDetailDtos.size() < 1) {
+ return datas;
+ }
+
+ JSONObject data = null;
+
+ for (AssetImportLogDetailDto assetImportLogDetailDto : assetImportLogDetailDtos) {
+ data = BeanConvertUtil.beanCovertJson(assetImportLogDetailDto);
+ if (!StringUtil.isEmpty(assetImportLogDetailDto.getContent())) {
+ data.putAll(JSONObject.parseObject(assetImportLogDetailDto.getContent()));
+ }
+ datas.add(data);
+ }
+
+ return datas;
+ }
+
}
--
Gitblit v1.8.0