From 8b997bf7de8e2bc23a337261e19e5e43bd48c67e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 11:20:32 +0800
Subject: [PATCH] 7过程要求
---
cnas-process/src/main/java/com/ruoyi/process/utils/UserUtils.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/UserUtils.java b/cnas-process/src/main/java/com/ruoyi/process/utils/UserUtils.java
similarity index 68%
rename from inspect-server/src/main/java/com/ruoyi/inspect/util/UserUtils.java
rename to cnas-process/src/main/java/com/ruoyi/process/utils/UserUtils.java
index 4ea9c59..4ab4ae2 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/util/UserUtils.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/utils/UserUtils.java
@@ -1,21 +1,17 @@
-package com.ruoyi.inspect.util;
+package com.ruoyi.process.utils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.deepoove.poi.data.FilePictureRenderData;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.system.mapper.UserMapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-/**
- * Author: yuan
- * Date: 2024-12-17 鏄熸湡浜� 10:35:50
- * Description: User宸ュ叿绫�
- */
@Component
public class UserUtils {
private static UserMapper userMapper;
@@ -46,10 +42,8 @@
if (StringUtils.isBlank(userSignatureUrl)) {
throw new ErrorException("鎵句笉鍒拌浜哄憳绛惧悕");
}
- return imgUrl + "\\" + userSignatureUrl;
- } else {
- return null;
}
+ return imgUrl + "\\" + userSignatureUrl;
}
/**
@@ -57,18 +51,38 @@
* @param userId 浜哄憳id
* @return 鐢ㄦ埛绛惧悕瀵硅薄 or null
*/
- public static PictureRenderData getFinalUserSignatureUrl(Integer userId) {
+ public static PictureRenderData getFinalUserSignatureUrl(Integer userId,int width,int height) {
+ width = width <= 0 ? 100 : width;
+ height = height <= 0 ? 50 : height;
String userSignatureUrl = null;
if (userId != null) {
- userSignatureUrl = userMapper.selectById(userId)
+ userSignatureUrl = userMapper.selectOne(Wrappers.<User>lambdaQuery()
+ .eq(User::getId, userId))
.getSignatureUrl();
if (StringUtils.isBlank(userSignatureUrl)) {
throw new ErrorException("鎵句笉鍒拌浜哄憳绛惧悕");
}
}
- return StringUtils.isNotBlank(userSignatureUrl) ? Pictures.ofLocal(imgUrl + "/" + userSignatureUrl).create() : null;
+ return StringUtils.isNotBlank(userSignatureUrl) ? new FilePictureRenderData(width,height,imgUrl + "/" + userSignatureUrl) : null;
}
+ /**
+ * 閫氳繃鍚嶅瓧鑾峰彇鐢ㄦ埛绛惧悕鍦板潃
+ * @param userName 浜哄憳鍚嶅瓧
+ * @return 鐢ㄦ埛绛惧悕鍦板潃
+ */
+ public static String getUserSignatureUrl(String userName) {
+ String userSignatureUrl = null;
+ if (userName != null) {
+ userSignatureUrl = userMapper.selectOne(Wrappers.<User>lambdaQuery()
+ .eq(User::getName, userName))
+ .getSignatureUrl();
+ if (StringUtils.isBlank(userSignatureUrl)) {
+ throw new ErrorException("鎵句笉鍒拌浜哄憳绛惧悕");
+ }
+ }
+ return imgUrl + "/" + userSignatureUrl;
+ }
/**
* 閫氳繃鍚嶅瓧鑾峰彇娓叉煋Word鐢ㄦ埛绛惧悕瀵硅薄
--
Gitblit v1.9.3