Skip to content

S
single-matter
Commit fa9ff92f authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

测试bug修改

parent 065a2688
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 26 deletions
single-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/SingleApplyreviewService.java
View file @ fa9ff92f
...@@ -77,35 +77,58 @@ public class SingleApplyreviewService implements IApplicationStartedService { ...@@ -77,35 +77,58 @@ public class SingleApplyreviewService implements IApplicationStartedService {
Map<Long,MatterDatumEntity> datumEntityMap = datumEntityList.stream().collect(Collectors.toMap(datumEntity->datumEntity.getId(), Function.identity())); Map<Long,MatterDatumEntity> datumEntityMap = datumEntityList.stream().collect(Collectors.toMap(datumEntity->datumEntity.getId(), Function.identity()));
for(MatterApplyDatumEntity item:datumList){ for(MatterApplyDatumEntity item:datumList){
MatterDatumEntity matterDatumEntity = datumEntityMap.get(item.getDatumId()); MatterDatumEntity matterDatumEntity = datumEntityMap.get(item.getDatumId());
if(matterDatumEntity==null){
item.setReviewStatus(1);
item.setUpdateTime(new Date());
matterApplyDatumService.update(item);
continue;
}
if(StringUtils.isNotEmpty(matterDatumEntity.getSystemPrompt())&&StringUtils.isNotEmpty(matterDatumEntity.getPrompt())) { if(StringUtils.isNotEmpty(matterDatumEntity.getSystemPrompt())&&StringUtils.isNotEmpty(matterDatumEntity.getPrompt())) {
CustomerWebSocketClient webSocketClient = new CustomerWebSocketClient(uri);
webSocketClient.connect();
webSocketClient.setMatterApplyDatumService(matterApplyDatumService);
webSocketClient.setMatterApplyService(matterApplyService);
if (!webSocketClient.isOpen()) {
Thread.sleep(2000);
}
webSocketClient.setApplyDatumId(item.getId());
//TODO
Map<String, String> processUserImage = new HashMap<>();
processUserImage.put("action", "pre_review");
processUserImage.put("system_prompt", matterDatumEntity.getSystemPrompt());
processUserImage.put("user_prompt", matterDatumEntity.getPrompt());
String template_image_url = ImageToBase64Converter.convertToBase64(rootPath + matterDatumEntity.getMatterDatumFileList().get(0).getPreviewUrl());
processUserImage.put("template_image_url", template_image_url);
String user_image_url = ImageToBase64Converter.convertToBase64(rootPath + item.getFileUrl());
processUserImage.put("user_image_url", user_image_url);
processUserImage.put("serial_number", item.getId().toString());
if (webSocketClient.isOpen()) {
webSocketClient.setCurrentTime(System.currentTimeMillis());
webSocketClient.send(JSONObject.toJSONString(processUserImage));
//log.info("发送消息: " + JSONObject.toJSONString(processUserImage));
}
try { try {
Thread.sleep(15000); CustomerWebSocketClient webSocketClient = new CustomerWebSocketClient(uri);
} catch (InterruptedException e2) { webSocketClient.connect();
webSocketClient.setMatterApplyDatumService(matterApplyDatumService);
webSocketClient.setMatterApplyService(matterApplyService);
if (!webSocketClient.isOpen()) {
try {
Thread.sleep(2000);
} catch (InterruptedException e2) {
}
}
webSocketClient.setApplyDatumId(item.getId());
Map<String, String> processUserImage = new HashMap<>();
processUserImage.put("action", "pre_review");
processUserImage.put("system_prompt", matterDatumEntity.getSystemPrompt());
processUserImage.put("user_prompt", matterDatumEntity.getPrompt());
String template_image_url = ImageToBase64Converter.convertToBase64(rootPath + matterDatumEntity.getMatterDatumFileList().get(0).getPreviewUrl());
processUserImage.put("template_image_url", template_image_url);
String user_image_url = ImageToBase64Converter.convertToBase64(rootPath + item.getFileUrl());
processUserImage.put("user_image_url", user_image_url);
processUserImage.put("serial_number", item.getId().toString());
if (webSocketClient.isOpen()) {
webSocketClient.setCurrentTime(System.currentTimeMillis());
webSocketClient.send(JSONObject.toJSONString(processUserImage));
//log.info("发送消息: " + JSONObject.toJSONString(processUserImage));
}else {
item.setReviewStatus(1);
item.setUpdateTime(new Date());
matterApplyDatumService.update(item);
}
try {
Thread.sleep(15000);
} catch (InterruptedException e2) {
}
webSocketClient.close();
}catch (Exception e){
log.info("预审异常:" + e.getMessage());
item.setReviewStatus(1);
item.setUpdateTime(new Date());
matterApplyDatumService.update(item);
} }
webSocketClient.close();
}else { }else {
item.setReviewStatus(1); item.setReviewStatus(1);
item.setUpdateTime(new Date()); item.setUpdateTime(new Date());
...@@ -129,6 +152,12 @@ public class SingleApplyreviewService implements IApplicationStartedService { ...@@ -129,6 +152,12 @@ public class SingleApplyreviewService implements IApplicationStartedService {
} }
update.setUpdateTime(new Date()); update.setUpdateTime(new Date());
matterApplyService.getDao().update(update);
}else {
MatterApplyEntity update = new MatterApplyEntity();
update.setId(applyId);
update.setApplyState(2);
update.setUpdateTime(new Date());
matterApplyService.getDao().update(update); matterApplyService.getDao().update(update);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment