fix(resource): 资源处理

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/CmptController.java

@@ -206,7 +206,7 @@ public class CmptController {
         }
         String param = "uId=" + user2.getId();
         // 跳转到赛客助手后台赛事列表
-        if(partnerId != null&& !partnerId.isEmpty()){
+        if(partnerId != null&& !partnerId.isEmpty()&&!partnerId.equals("null")){
             param = param+"&partnerId="+partnerId;
             return "redirect:" + serverURL + "gk/guide/index/" + cmptId + "?" + param;
         }

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ResourcesController.java

@@ -123,7 +123,7 @@ public class ResourcesController {
             if(resourceResponseEntity.getBody().getInputStream() != null){
                 BufferedImage bg = ImageIO.read(resourceResponseEntity.getBody().getInputStream());
                 BufferedImage qr = ImageIO.read(new URL(cmpt.getLogo()));
-                overlapImageHD(bg, qr, response);
+                overlapImageHDPlus(bg, qr, response);
             }else{
                 log.info("=====获取小程序码为空："+resourceResponseEntity.getBody().toString());
             }
@@ -133,6 +133,43 @@ public class ResourcesController {
         }
     }
 
+    // ... 已有代码 ...
+
+    public static String overlapImageHDPlus(BufferedImage bg, BufferedImage qrCodeIps, HttpServletResponse response) throws Exception {
+        // 进一步增大背景图片尺寸
+        BufferedImage background = resizeImageHighQuality(2400, 2400, bg);
+        // 进一步增大二维码图片尺寸
+        BufferedImage qrCode = resizeImageHighQuality(1120, 1120, qrCodeIps);
+
+        qrCode = converToRadius(qrCode, 1120, 1120);
+        qrCode.createGraphics().setBackground(Color.WHITE);
+        Graphics2D g = background.createGraphics();
+        // 调整二维码位置
+        g.drawImage(qrCode, 640, 640, qrCode.getWidth(), qrCode.getHeight(), null);
+        g.dispose();
+        ImageIO.write(background, "jpg", response.getOutputStream());
+        return null;
+    }
+
+    /**
+     * 使用高质量算法调整图片尺寸
+     * @param x 目标宽度
+     * @param y 目标高度
+     * @param bfi 原始图片
+     * @return 调整尺寸后的图片
+     */
+    public static BufferedImage resizeImageHighQuality(int x, int y, BufferedImage bfi) {
+        BufferedImage bufferedImage = new BufferedImage(x, y, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = bufferedImage.createGraphics();
+        // 设置高质量的渲染提示
+        g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+        g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g.drawImage(bfi, 0, 0, x, y, null);
+        g.dispose();
+        return bufferedImage;
+    }
+
     public static String overlapImage(BufferedImage bg, BufferedImage qrCodeIps, HttpServletResponse response)throws Exception {
             //设置图片大小
             BufferedImage background = resizeImage(300, 300, bg);