From 2562d6ce39aa405514c9e22ff0237f3f145040b6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 27 八月 2024 10:45:29 +0800
Subject: [PATCH] 企业二维码样式修改
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 4 +++-
project-common/src/main/java/com/project/common/utils/qrcode/QRCodeUtil.java | 38 +++++++++++++++++++++-----------------
project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java | 3 ++-
project-admin/src/main/java/com/project/ProjectApplication.java | 2 ++
project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java | 5 +++++
5 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/project-admin/src/main/java/com/project/ProjectApplication.java b/project-admin/src/main/java/com/project/ProjectApplication.java
index b82a92b..0c24be6 100644
--- a/project-admin/src/main/java/com/project/ProjectApplication.java
+++ b/project-admin/src/main/java/com/project/ProjectApplication.java
@@ -3,6 +3,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cache.annotation.EnableCaching;
import org.springframework.scheduling.annotation.EnableAsync;
/**
@@ -11,6 +12,7 @@
* @author project
*/
@EnableAsync
+@EnableCaching
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class ProjectApplication
{
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index 80bf645..3276c3e 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -25,6 +25,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -47,6 +48,7 @@
@ApiOperation("鑾峰彇鍚岃浜�")
@GetMapping("/peerList")
+ @Cacheable(value = "sysUser:peerList")
public AjaxResult peerList(String nickName, String deptId)
{
List<SysUser> list = userService.list(userService.lq()
@@ -54,7 +56,7 @@
.ne(SysUser::getUserName,"admin")
.ne(SysUser::getUserId, SecurityUtils.getUserId())
.like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
- .eq(deptId!=null, SysUser::getDeptId,deptId)
+ .eq(deptId!=null, SysUser::getDeptId, deptId)
);
list.forEach(user->{
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
diff --git a/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java b/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
index 4d21a07..e8b5ecf 100644
--- a/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
+++ b/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
@@ -15,6 +15,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -28,7 +29,7 @@
@Data
@NoArgsConstructor
-public class SysUser
+public class SysUser implements Serializable
{
private static final long serialVersionUID = 1L;
diff --git a/project-common/src/main/java/com/project/common/utils/qrcode/QRCodeUtil.java b/project-common/src/main/java/com/project/common/utils/qrcode/QRCodeUtil.java
index b34ffe2..cd4b4aa 100644
--- a/project-common/src/main/java/com/project/common/utils/qrcode/QRCodeUtil.java
+++ b/project-common/src/main/java/com/project/common/utils/qrcode/QRCodeUtil.java
@@ -143,11 +143,11 @@
//浜岀淮鐮佸浘涓婂甫瀛�
public static void contextLoads2(String content, String name, String filePathStr)
{
- int qrCodeWidth = 700;
- int qrCodeHeight = 700;
- int textPadding = 5; // 鏂囨湰涓庝簩缁寸爜涔嬮棿鐨勯棿璺�
- int textSize = 30; // 鏂囨湰瀛椾綋澶у皬
- int totalHeight = qrCodeHeight + 300;
+ int qrCodeWidth = 350;
+ int qrCodeHeight = 350;
+ int textPadding = 2; // 鏂囨湰涓庝簩缁寸爜涔嬮棿鐨勯棿璺�
+ int textSize = 10; // 鏂囨湰瀛椾綋澶у皬
+ int totalHeight = 380;
try {
// 鐢熸垚浜岀淮鐮佺殑BitMatrix
@@ -158,26 +158,30 @@
// 鍒涘缓涓�涓柊鐨凚ufferedImage鏉ュ绾充簩缁寸爜鍜屾枃鏈�
BufferedImage combinedImage = new BufferedImage(
- qrCodeWidth, 900, BufferedImage.TYPE_INT_RGB);
+ qrCodeWidth, totalHeight, BufferedImage.TYPE_INT_RGB);
// 缁樺埗浜岀淮鐮佸埌鏂扮殑BufferedImage涓�
Graphics2D g2d = combinedImage.createGraphics();
g2d.setColor(Color.WHITE);
- g2d.fillRect(0, 0, qrCodeWidth, 900);
- g2d.drawImage(qrCodeImage, 0, 0, null);
+ g2d.fillRect(0, 0, qrCodeWidth, totalHeight);
+ g2d.drawImage(qrCodeImage, -5, -10,360,360, null);
- // 璁剧疆鏂囨湰鏍峰紡
- Font font = new Font("BLACK", Font.PLAIN, textSize);
- g2d.setFont(font);
- g2d.setColor(Color.BLACK); // 鏂囨湰棰滆壊
+
// 缁樺埗鏂囨湰鍒板浘鐗囦笅鏂�
- FontMetrics metrics = g2d.getFontMetrics();
+ Font font = new Font("Black", Font.BOLD, 20);
+ FontMetrics metrics = g2d.getFontMetrics(font);
int textX = (qrCodeWidth - metrics.stringWidth("娌堜笜鎯犱紒鎵ф硶")) / 2;
- int textX1 = (qrCodeWidth - metrics.stringWidth(name)) / 2;
- int textY = qrCodeHeight + textPadding;
- g2d.drawString("娌堜笜鎯犱紒鎵ф硶", textX, textY);
- g2d.drawString(name, textX1, textY+50);
+ // 璁剧疆鏂囨湰鏍峰紡
+ g2d.setFont(font);
+ g2d.setColor(Color.BLACK); // 鏂囨湰棰滆壊
+ g2d.drawString("娌堜笜鎯犱紒鎵ф硶", textX, 330);
+ Font font1 = new Font("Serif", Font.PLAIN, 15);
+ FontMetrics metrics1 = g2d.getFontMetrics(font1);
+ int textX1 = (360 - metrics1.stringWidth(name)) / 2;
+ g2d.setFont(font1);
+ g2d.setColor(Color.BLACK); // 鏂囨湰棰滆壊
+ g2d.drawString(name, textX1, 355);
g2d.dispose();
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
index a1994e4..0326440 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
@@ -28,6 +28,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -264,6 +265,7 @@
*/
@Override
@Transactional
+ @CacheEvict(value = "sysUser:peerList",allEntries = true)
public int insertUser(SysUser user)
{
// 鏂板鐢ㄦ埛淇℃伅
@@ -299,6 +301,7 @@
*/
@Override
@Transactional
+ @CacheEvict(value = "sysUser:peerList",allEntries = true)
public int updateUser(SysUser user)
{
Long userId = user.getUserId();
@@ -481,6 +484,7 @@
*/
@Override
@Transactional
+ @CacheEvict(value = "sysUser:peerList",allEntries = true)
public int deleteUserById(Long userId)
{
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
@@ -498,6 +502,7 @@
*/
@Override
@Transactional
+ @CacheEvict(value = "sysUser:peerList",allEntries = true)
public int deleteUserByIds(Long[] userIds)
{
for (Long userId : userIds)
--
Gitblit v1.9.1