aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
shahaibo
2023-10-18 14:58:27 +08:00
parent 2b2fd1a72c fe2ffcd6a6
commit 4c11f2e280
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java
View File

@@ -110,6 +110,14 @@ public class PanToneServiceImpl extends ServiceImpl<PanToneMapper, PanTone> impl
}
});
// 覆盖pantone中的rgb值,使用前端传过来的rgb值
for (Map.Entry<String, PantoneVO> 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<PanToneMapper, PanTone> 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;
}