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

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-06-26 14:15:35 +08:00
parent a7347c9dc0 d3deec72eb
commit c70231d5de
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -2946,12 +2946,17 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
collectionElement.setCreateDate(date); collectionElement.setCreateDate(date);
libraryService.processSketchBoards(url, collectionElement.getLevel2Type()); libraryService.processSketchBoards(url, collectionElement.getLevel2Type());
}else if (receiveCollectionElement.getLevel1Type().equals(CollectionLevel1TypeEnum.COLOR_BOARD.getRealName())) { }else if (receiveCollectionElement.getLevel1Type().equals(CollectionLevel1TypeEnum.COLOR_BOARD.getRealName())) {
String color = receiveCollectionElement.getHsv(); /*String color = receiveCollectionElement.getHsv();
String[] parts = color.split("\\s+"); String[] parts = color.split("\\s+");
int h = Math.round(Float.parseFloat(parts[0])); int h = Math.round(Float.parseFloat(parts[0]));
int s = Math.round(Float.parseFloat(parts[1])); // 关键修改 int s = Math.round(Float.parseFloat(parts[1])); // 关键修改
int v = Math.round(Float.parseFloat(parts[2])); int v = Math.round(Float.parseFloat(parts[2]));
int[] hsv = {h, s, v}; int[] hsv = {h, s, v};*/
String rgbStr = receiveCollectionElement.getRgb();
int[] rgb = Arrays.stream(rgbStr.split("\\s+"))
.mapToInt(Integer::parseInt)
.toArray();
int[] hsv = PantoneUtils.rgbToHsv(rgb);
// int[] hsv = Arrays.stream(color.split("\\s+")).mapToInt(Integer::parseInt).toArray(); // int[] hsv = Arrays.stream(color.split("\\s+")).mapToInt(Integer::parseInt).toArray();
int value = (hsv[0] * 101 * 101) + (hsv[1] * 101) + hsv[2]; int value = (hsv[0] * 101 * 101) + (hsv[1] * 101) + hsv[2];
ColorLookupTable colorLookupTable = colorLoopUpTableService.getByColorValue(value); ColorLookupTable colorLookupTable = colorLoopUpTableService.getByColorValue(value);
@@ -2968,7 +2973,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
collectionElement.setProjectId(project.getId()); collectionElement.setProjectId(project.getId());
collectionElement.setName(panTone.getPantoneIndex() + "_" + panTone.getName() + "_" + panTone.getTcx()); collectionElement.setName(panTone.getPantoneIndex() + "_" + panTone.getName() + "_" + panTone.getTcx());
collectionElement.setHasPin((byte) 0); collectionElement.setHasPin((byte) 0);
collectionElement.setColorRgb(receiveCollectionElement.getRgb()); collectionElement.setColorRgb(rgbStr);
collectionElement.setCreateDate(date); collectionElement.setCreateDate(date);
} }
} }

7
src/main/java/com/ai/da/service/impl/LLMServiceImpl.java
View File

@@ -232,7 +232,7 @@ public class LLMServiceImpl implements LLMService {
@Override @Override
public SseEmitter streamNew(String prompt, Long projectParamId, String fileUrl, List<String> imageUrlList, String token, Boolean enableThinking, String process) { public SseEmitter streamNew(String prompt, Long projectParamId, String fileUrl, List<String> imageUrlList, String token, Boolean enableThinking, String process) {
SseEmitter emitter = new SseEmitter(0L); // 永不超时 SseEmitter emitter = new SseEmitter(0L); // 永不超时
List<String> designTools = Arrays.asList("moodboard", "printboard", "generate_color_code", "sketchboard"); List<String> designTools = Arrays.asList("moodboard", "printboard", /*"generate_color_code", */"sketchboard", "colorboard");
executor.submit(() -> { executor.submit(() -> {
try { try {
@@ -241,8 +241,8 @@ public class LLMServiceImpl implements LLMService {
if (validate) { if (validate) {
AuthPrincipalVo principal = jwtTokenHelper.parserToUser(token); AuthPrincipalVo principal = jwtTokenHelper.parserToUser(token);
Long accountId = principal.getId(); Long accountId = principal.getId();
// String url = "http://18.167.251.121:10002/chat-stream"; // String url = "http://18.167.251.121:10002/api/chat_stream";
String url = "http://18.167.251.121:10002/api/chat_stream"; String url = "http://18.167.251.121:2011/api/chat_stream";
// String url = "http://10.1.1.240:1013/chat-stream"; // String url = "http://10.1.1.240:1013/chat-stream";
HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection(); HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
conn.setRequestMethod("POST"); conn.setRequestMethod("POST");
@@ -251,6 +251,7 @@ public class LLMServiceImpl implements LLMService {
Long projectId = null; Long projectId = null;
if (null == projectParamId) { if (null == projectParamId) {
Project project = new Project(); Project project = new Project();
project.setAccountId(accountId);
project.setCreateTime(LocalDateTime.now()); project.setCreateTime(LocalDateTime.now());
projectMapper.insert(project); projectMapper.insert(project);
projectId = project.getId(); projectId = project.getId();