From 51f77719ae2db1d56a0670b93e6d9fca558ec86a Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期二, 29 七月 2025 18:37:15 +0800
Subject: [PATCH] 白单流水唯一校验+添加操作人2025/07/29
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
index ac1671b..0efe8c3 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -1,6 +1,9 @@
package com.java110.api.smo.assetImport.impl;
import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.api.smo.assetImport.IAssetImportSMO;
@@ -8,9 +11,12 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.log.AssetImportLogDetailDto;
import com.java110.dto.system.ComponentValidateResult;
+import com.java110.dto.user.UserDto;
import com.java110.intf.common.IAssetImportLogDetailInnerServiceSMO;
import com.java110.intf.common.IAssetImportLogInnerServiceSMO;
import com.java110.intf.job.IUserImportDataV1InnerServiceSMO;
+import com.java110.intf.user.IMenuUserV1InnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.log.AssetImportLogDetailPo;
import com.java110.po.log.AssetImportLogPo;
import com.java110.utils.factory.ApplicationContextFactory;
@@ -26,8 +32,10 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.HashMap;
import java.util.List;
/**
@@ -67,6 +75,9 @@
@Autowired
private IUserImportDataV1InnerServiceSMO userImportDataV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO iUserInnerServiceSMOImpl;
@Override
public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
@@ -123,6 +134,24 @@
assetImportLogPo.setLogType(logType);
assetImportLogPo.setErrorCount("0");
assetImportLogPo.setSuccessCount("0");
+ String userId = null;
+ try {
+ userId = new ObjectMapper().readValue(pd.getReqData(), HashMap.class).get("userId").toString();
+ } catch (JsonMappingException e) {
+ throw new RuntimeException(e);
+ } catch (JsonParseException e) {
+ throw new RuntimeException(e);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ if(userId != null) {
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> users = iUserInnerServiceSMOImpl.getUsers(userDto);
+ if(users != null && users.size() > 0) {
+ assetImportLogPo.setUserName(users.get(0).getUserName());
+ }
+ }
assetImportLogInnerServiceSMOImpl.saveAssetImportLog(assetImportLogPo);
List<AssetImportLogDetailPo> assetImportLogDetailPos = new ArrayList<>();
--
Gitblit v1.8.0