diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/ExcelWatermarkUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/ExcelWatermarkUtils.java index 6708ea2394..5648c71736 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/ExcelWatermarkUtils.java +++ b/core/core-backend/src/main/java/io/dataease/commons/utils/ExcelWatermarkUtils.java @@ -1,6 +1,7 @@ package io.dataease.commons.utils; import io.dataease.api.permissions.user.vo.UserFormVO; +import io.dataease.utils.IPUtils; import io.dataease.visualization.dto.WatermarkContentDTO; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFDrawing; @@ -20,7 +21,7 @@ import java.util.Date; public class ExcelWatermarkUtils { public static String transContent(String content, UserFormVO userInfo) { - content = content.replaceAll("\\$\\{ip}", userInfo.getIp() == null?"127.0.0.1":userInfo.getIp()); + content = content.replaceAll("\\$\\{ip}", IPUtils.get()== null?"127.0.0.1":IPUtils.get()); content = content.replaceAll("\\$\\{username}", userInfo.getAccount()); content = content.replaceAll("\\$\\{nickName}", userInfo.getName()); content = content.replaceAll("\\$\\{time}", new Date().toString()); diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index cc896c7eb1..b64fee702c 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -53,11 +53,11 @@ import io.dataease.system.manage.SysParameterManage; import io.dataease.utils.*; import io.dataease.visualization.dao.auto.entity.VisualizationWatermark; import io.dataease.visualization.dao.auto.mapper.VisualizationWatermarkMapper; +import io.dataease.visualization.dao.ext.mapper.ExtDataVisualizationMapper; import io.dataease.visualization.dto.WatermarkContentDTO; import io.dataease.visualization.server.DataVisualizationServer; import io.dataease.websocket.WsMessage; import io.dataease.websocket.WsService; -import io.dataease.xpack.permissions.user.manage.UserPageManage; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -109,11 +109,10 @@ public class ExportCenterManage implements BaseExportApi { private int max; @Resource private VisualizationWatermarkMapper watermarkMapper; + @Resource + private ExtDataVisualizationMapper visualizationMapper; - @Resource(name = "userPageManage") - private UserPageManage userPageManage; - private final static String DATA_URL_TITLE = "data:image/jpeg;base64,"; private static final String exportData_path = "/opt/dataease2.0/data/exportData/"; @@ -698,7 +697,7 @@ public class ExportCenterManage implements BaseExportApi { VisualizationWatermark watermark = watermarkMapper.selectById("system_default"); WatermarkContentDTO watermarkContent = JsonUtil.parseObject(watermark.getSettingContent(), WatermarkContentDTO.class); if (watermarkContent.getExcelEnable()) { - UserFormVO userInfo = userPageManage.queryForm(AuthUtils.getUser().getUserId()); + UserFormVO userInfo = visualizationMapper.queryInnerUserInfo(AuthUtils.getUser().getUserId()); // 在主逻辑中添加水印 int watermarkPictureIdx = ExcelWatermarkUtils.addWatermarkImage(wb, watermarkContent,userInfo); // 生成水印图片并获取 ID for (Sheet sheet : wb) { diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java index 57f9f9f307..270a91819e 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java @@ -2,6 +2,7 @@ package io.dataease.visualization.dao.ext.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import io.dataease.api.permissions.user.vo.UserFormVO; import io.dataease.api.visualization.dto.VisualizationViewTableDTO; import io.dataease.api.visualization.vo.DataVisualizationBaseVO; import io.dataease.api.visualization.vo.DataVisualizationVO; @@ -55,4 +56,6 @@ public interface ExtDataVisualizationMapper { void deleteDataVBatch(@Param("ids") Set ids); void deleteViewsBatch(@Param("ids") Set ids); + + UserFormVO queryInnerUserInfo(@Param("id") Long id); } diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml index d3a5415ede..1eaac4ce15 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml @@ -446,4 +446,8 @@ #{id} + +