chenxudong
/
electromagnetic-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data into develop

This commit is contained in:
s2042968 2024-12-02 14:42:16 +08:00
parent d52acbc776 8eae6e860b
commit 520d1885f7
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electromagnetic-framework/pom.xml
View File

@ -80,6 +80,10 @@
<artifactId>zip4j</artifactId>
<version>2.11.5</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
</dependencies>
</project>

6
infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
View File

@ -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>

15
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
View File

@ -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);