From 8eae6e860bcf79c02b1fa447974b1b4235e0bb34 Mon Sep 17 00:00:00 2001
From: sxlong <shixiaolong@cqida.cn>
Date: Fri, 29 Nov 2024 17:19:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=B1=BB=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E8=8E=B7=E5=8F=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electromagnetic-framework/pom.xml                 |  4 ++++
 .../main/resources/sqlmapper/EdDataInfoMapper.xml |  6 ++++++
 .../manage/service/facade/EDDataFacadeImpl.java   | 15 ++++++++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/electromagnetic-framework/pom.xml b/electromagnetic-framework/pom.xml
index 718c99d..a787489 100644
--- a/electromagnetic-framework/pom.xml
+++ b/electromagnetic-framework/pom.xml
@@ -80,6 +80,10 @@
             <artifactId>zip4j</artifactId>
             <version>2.11.5</version>
         </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
index a8ed76a..619da42 100644
--- a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
+++ b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
@@ -104,6 +104,12 @@
       <if test="effectFlag != null and effectFlag!=''">
         effect_flag = #{effectFlag,jdbcType=VARCHAR},
       </if>
+      <if test="userId != null and userId!=''">
+        modifier = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null and userName!=''">
+        modifier_name = #{userName,jdbcType=VARCHAR},
+      </if>
       gmt_modified = now()
     </set>
     <where>
diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
index ecbafeb..dda5b8a 100644
--- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
+++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
@@ -20,6 +20,7 @@ import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataM
 import electromagnetic.data.framework.share.id.IdWorker;
 import electromagnetic.data.framework.share.model.ElectromagneticResult;
 import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
+import electromagnetic.data.framework.share.util.UserThreadLocal;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -73,10 +74,10 @@ public class EDDataFacadeImpl implements EDDataFacade {
     public ElectromagneticResult<Boolean> createFolder(EDDataRequest request) {
         EDDataInfo edDataInfo = EDDataMappers.INSTANCE.getEDDataInfo(request);
 
-        edDataInfo.setCreator(request.getUserId());
-        edDataInfo.setCreatorName(request.getUserName());
-        edDataInfo.setModifier(request.getUserId());
-        edDataInfo.setModifierName(request.getUserName());
+        edDataInfo.setCreator(UserThreadLocal.getUserId());
+        edDataInfo.setCreatorName(UserThreadLocal.getUsername());
+        edDataInfo.setModifier(UserThreadLocal.getUserId());
+        edDataInfo.setModifierName(UserThreadLocal.getUsername());
         edDataInfo.setCategoryId(request.getParentId());
         edDataInfo.setDataName(request.getName());
         edDataInfo.setNote(request.getNote());
@@ -127,7 +128,9 @@ public class EDDataFacadeImpl implements EDDataFacade {
     public ElectromagneticResult<Boolean> updateFileInfo(EDDataRequest request)
     {
         try {
-            EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
+            EDDataParams parames = EDDataMappers.INSTANCE.getEDDataParames(request);
+            parames.setUserId(UserThreadLocal.getUserId());
+            parames.setUserName(UserThreadLocal.getUsername());
             return ElectromagneticResultUtil.success(edDataService.updateFileInfo(parames));
         } catch (Exception e) {
             log.error("文件信息更新失败。。。", e);
@@ -162,6 +165,8 @@ public class EDDataFacadeImpl implements EDDataFacade {
     {
         try {
             EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
+            parames.setUserId(UserThreadLocal.getUserId());
+            parames.setUserName(UserThreadLocal.getUsername());
             return ElectromagneticResultUtil.success(edDataService.uploadFile(parames));
         } catch (Exception e) {
             log.error("上传文件失败。。。", e);