From fe2ffcd6a67b99040d5e699f2e273a8309300a9f Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Wed, 18 Oct 2023 11:46:50 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX=EF=BC=9A=E4=BF=AE=E6=94=B9pantone?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84rgb=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/service/impl/PanToneServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java b/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java index b37b846a..edf31d4f 100644 --- a/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java @@ -110,6 +110,14 @@ public class PanToneServiceImpl extends ServiceImpl impl } }); + // 覆盖pantone中的rgb值,使用前端传过来的rgb值 + for (Map.Entry pantoneVOEntry : colorPantoneVO.entrySet()) { + int[] rgb = Arrays.stream(pantoneVOEntry.getKey().split("\\s+")).mapToInt(Integer::parseInt).toArray(); + pantoneVOEntry.getValue().setR(rgb[0]); + pantoneVOEntry.getValue().setG(rgb[1]); + pantoneVOEntry.getValue().setB(rgb[2]); + } + return colorPantoneVO; } @@ -164,9 +172,9 @@ public class PanToneServiceImpl extends ServiceImpl impl return null; } PantoneVO pantoneVO = CopyUtil.copyObject(panTone,PantoneVO.class); - pantoneVO.setR(panTone.getR()); - pantoneVO.setG(panTone.getG()); - pantoneVO.setB(panTone.getB()); +// pantoneVO.setR(panTone.getR()); +// pantoneVO.setG(panTone.getG()); +// pantoneVO.setB(panTone.getB()); pantoneVO.setId(panTone.getPantoneIndex()); return pantoneVO; }