public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-14 21:12:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13969 from dataease/pr@dev-v2@fix_link-error

Browse Source 
fix: 修复引用错误
This commit is contained in:
王嘉豪
2024-12-11 11:57:34 +08:00
committed by GitHub
parent 858fd95192 f123634f9d
commit ea0cba7df5
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-backend/src/main/java/io/dataease/commons/utils/ExcelWatermarkUtils.java
View File

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

9
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
View File

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

3
core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java
View File

@@ -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<Long> ids);
void deleteViewsBatch(@Param("ids") Set<Long> ids);
UserFormVO queryInnerUserInfo(@Param("id") Long id);
}

4
core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
View File

@@ -446,4 +446,8 @@
#{id}
</foreach>
</delete>
<select id="queryInnerUserInfo" resultType="io.dataease.api.permissions.user.vo.UserFormVO">
select id,account,name from per_user where id = #{id}
</select>
</mapper>