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 @@ zip4j 2.11.5 + + io.jsonwebtoken + jjwt + \ 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 @@ effect_flag = #{effectFlag,jdbcType=VARCHAR}, + + modifier = #{userId,jdbcType=VARCHAR}, + + + modifier_name = #{userName,jdbcType=VARCHAR}, + gmt_modified = now() 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 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 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);