From a749c5dd2ed50e116d986fcb4bdddf7f845998fb Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 22 Apr 2024 13:09:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?BUGFIX:=E4=BE=BF=E5=88=A9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConvenientInquiryController.java | 13 ++++- .../da/model/dto/UserDesignStatisticDTO.java | 16 +++++- .../resources/mapper/primary/DesignMapper.xml | 53 ++++++++++++------- 3 files changed, 60 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java index 1cc2552a..36424b7a 100644 --- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java +++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java @@ -7,12 +7,15 @@ import com.ai.da.mapper.primary.DesignMapper; import com.ai.da.mapper.primary.TrialOrderMapper; import com.ai.da.mapper.primary.entity.TrialOrder; import com.ai.da.model.dto.UserDesignStatisticDTO; +import io.netty.util.internal.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; @Api(tags = "便利查询") @@ -31,7 +34,7 @@ public class ConvenientInquiryController { @GetMapping("/getTrial") public Response> getTrial(){ Long accountId = UserContext.getUserHolder().getId(); - if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L)){ + if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L)){ List trialOrders = trialOrderMapper.selectList(null); return Response.success(trialOrders); }else { @@ -43,7 +46,13 @@ public class ConvenientInquiryController { @GetMapping("/getDesignStatistic") public Response> getDesignStatistic(@RequestParam String startTime,@RequestParam String endTime){ Long accountId = UserContext.getUserHolder().getId(); - if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L)){ + if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L)){ + if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00"; + if (StringUtil.isNullOrEmpty(endTime)){ + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + Date date = new Date(); + endTime = simpleDateFormat.format(date); + } List designStatistic = designMapper.getDesignStatistic(startTime, endTime); return Response.success(designStatistic); }else { diff --git a/src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java b/src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java index 25bd7038..b0713077 100644 --- a/src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java +++ b/src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java @@ -7,11 +7,25 @@ public class UserDesignStatisticDTO { private Long accountId; - private Long useDesignTimes; + private Long designTimes; private String userEmail; private String userName; private String isTrial; + + private String trialOrderId; + + private String title; + + private String surname; + + private String givenName; + + private String country; + + private String occupation; + + private String createTime; } diff --git a/src/main/resources/mapper/primary/DesignMapper.xml b/src/main/resources/mapper/primary/DesignMapper.xml index edf3f675..6fc69739 100644 --- a/src/main/resources/mapper/primary/DesignMapper.xml +++ b/src/main/resources/mapper/primary/DesignMapper.xml @@ -4,30 +4,45 @@ - - - - - - - - + + + + + + + + - + insert into t_design - (account_id,collection_id,system_scale,single_overall,switch_category,create_date) - values( - #{accountId}, - #{collectionId}, - #{systemScale}, - #{singleOverall}, - #{switchCategory}, - #{createDate}); + (account_id, collection_id, system_scale, single_overall, switch_category, create_date) + values (#{accountId}, + #{collectionId}, + #{systemScale}, + #{singleOverall}, + #{switchCategory}, + #{createDate}); From 19d170c1bfe908053ecaa1a55a144750fd361a03 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 22 Apr 2024 15:32:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=BE=93=E5=85=A5prompt=E4=BF=AE=E9=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/service/impl/GenerateServiceImpl.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 6b26bea4..d0613304 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -232,20 +232,37 @@ public class GenerateServiceImpl extends ServiceImpl i if (StringUtil.isNullOrEmpty(text)) { throw new BusinessException("please.input.the.caption"); } - generate.setText(text); +// generate.setText(text); + modifyPrompt(text, generate); break; case "image": if (Objects.isNull(elementId)) { throw new BusinessException("please.choose.an.image"); } generate.setElementId(elementId); + modifyPrompt(text, generate); break; case "text-image": if (StringUtil.isNullOrEmpty(text) || Objects.isNull(elementId)) { throw new BusinessException("please.input.the.caption.and.choose.an.image"); } - generate.setText(text); +// generate.setText(text); generate.setElementId(elementId); + modifyPrompt(text, generate); + default: + } + } + + private void modifyPrompt(String userInput, Generate generate){ + switch (generate.getLevel1Type()) { + case "Moodboard": + generate.setText(userInput + ",high quality"); + break; + case "Printboard": + generate.setText(userInput + ", fabric print, high quality"); + break; + case "Sketchboard": + generate.setText("a single item of " + userInput + "with clean background, hand-drawing sketch style, high quality"); default: } } From 3114d3cb368b0d6472ab7c3b4c2fe13ce01927f4 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 23 Apr 2024 11:02:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BE=BF=E5=88=A9=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/controller/ConvenientInquiryController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java index 36424b7a..4b4526bd 100644 --- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java +++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java @@ -34,7 +34,7 @@ public class ConvenientInquiryController { @GetMapping("/getTrial") public Response> getTrial(){ Long accountId = UserContext.getUserHolder().getId(); - if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L)){ + if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)){ List trialOrders = trialOrderMapper.selectList(null); return Response.success(trialOrders); }else { @@ -46,7 +46,7 @@ public class ConvenientInquiryController { @GetMapping("/getDesignStatistic") public Response> getDesignStatistic(@RequestParam String startTime,@RequestParam String endTime){ Long accountId = UserContext.getUserHolder().getId(); - if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L)){ + if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)){ if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00"; if (StringUtil.isNullOrEmpty(endTime)){ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); From d000eaa6b8f31018cf0bb87f7ebc355de56e9795 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 23 Apr 2024 11:40:02 +0800 Subject: [PATCH 4/6] BUGFIX:generate prompt modify --- .../da/service/impl/GenerateServiceImpl.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index d0613304..ba286732 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -123,6 +123,9 @@ public class GenerateServiceImpl extends ServiceImpl i String text = generateThroughImageTextDTO.getText(); Long elementId = generateThroughImageTextDTO.getCollectionElementId(); validateGeneraType(generate, text, elementId, generateType); + if (generateType.equals("text") || generateType.equals("text-image")){ + text = modifyPrompt(text, generate, generateThroughImageTextDTO.getLevel1Type()); + } // 2.1 sketch或print在t_collection_element表/t_library表中的信息是否需要更新 如 level2Type CollectionElement collectionElement = collectionElementService.editLevel2Type(elementId, generateThroughImageTextDTO.getLevel2Type(), generateThroughImageTextDTO.getDesignType()); @@ -232,39 +235,41 @@ public class GenerateServiceImpl extends ServiceImpl i if (StringUtil.isNullOrEmpty(text)) { throw new BusinessException("please.input.the.caption"); } -// generate.setText(text); - modifyPrompt(text, generate); + generate.setText(text); break; case "image": if (Objects.isNull(elementId)) { throw new BusinessException("please.choose.an.image"); } generate.setElementId(elementId); - modifyPrompt(text, generate); break; case "text-image": if (StringUtil.isNullOrEmpty(text) || Objects.isNull(elementId)) { throw new BusinessException("please.input.the.caption.and.choose.an.image"); } -// generate.setText(text); + generate.setText(text); generate.setElementId(elementId); - modifyPrompt(text, generate); default: } } - private void modifyPrompt(String userInput, Generate generate){ - switch (generate.getLevel1Type()) { + private String modifyPrompt(String userInput, Generate generate, String level1Type){ + String text = ""; + switch (level1Type) { case "Moodboard": - generate.setText(userInput + ",high quality"); + text = userInput + ",high quality"; + generate.setText(text); break; case "Printboard": - generate.setText(userInput + ", fabric print, high quality"); + text = userInput + ", fabric print, high quality"; + generate.setText(text); break; case "Sketchboard": - generate.setText("a single item of " + userInput + "with clean background, hand-drawing sketch style, high quality"); + text = "a single item of " + userInput + "with clean background, hand-drawing sketch style, high quality"; + generate.setText(text); default: } + return text; } @Override From ff842c5443c83e362ec00379004730eb6136dd1f Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 23 Apr 2024 12:18:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?BUGFIX:SR=E5=BC=82=E5=B8=B8=20=E6=89=8B?= =?UTF-8?q?=E5=8A=A8ACK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/common/RabbitMQ/SRConsumer.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java index 059b4f81..341b58a1 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java @@ -87,14 +87,31 @@ public class SRConsumer { superResolutionDTO = JSONObject.parseObject(msg.getBody(), SuperResolutionDTO.class); // channel.basicNack() 为不确认deliveryTag对应的消息，第二个参数是否应用于多消息，第三个参数是否requeue setErrorMessage(msg, channel, e.getMsg(), superResolutionDTO); + try { + // 2.1 手动确认该消息 + channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false); + } catch (IOException ex) { + log.error("手动确认，不返回队列重新消费, error message : " + e.getMessage()); + } } catch (JSONException e) { log.error(e.getMessage()); setErrorMessage(msg, channel, e.getMessage(), null); + try { + // 2.1 手动确认该消息 + channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false); + } catch (IOException ex) { + log.error("手动确认，不返回队列重新消费, error message : " + e.getMessage()); + } } catch (Exception e) { log.error(e.getMessage()); superResolutionDTO = JSONObject.parseObject(msg.getBody(), SuperResolutionDTO.class); setErrorMessage(msg, channel, e.getMessage(), superResolutionDTO); - + try { + // 2.1 手动确认该消息 + channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false); + } catch (IOException ex) { + log.error("手动确认，不返回队列重新消费, error message : " + e.getMessage()); + } } long end = System.currentTimeMillis(); From c31a4bcd8f6c3a23f2de24814cd3074ed06ab625 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 23 Apr 2024 14:21:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?generate=20mode=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/enums/GenerateModeEnum.java | 2 +- src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/common/enums/GenerateModeEnum.java b/src/main/java/com/ai/da/common/enums/GenerateModeEnum.java index fb4f8e94..f3cc14e9 100644 --- a/src/main/java/com/ai/da/common/enums/GenerateModeEnum.java +++ b/src/main/java/com/ai/da/common/enums/GenerateModeEnum.java @@ -22,7 +22,7 @@ public enum GenerateModeEnum { /** * 通过文本和图片生成 */ - TEXT_IMAGE(2, "text-image","txt2img"); + TEXT_IMAGE(2, "text-image","img2img"); private Integer code; private String value; diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index ba286732..ccbd397d 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -265,7 +265,7 @@ public class GenerateServiceImpl extends ServiceImpl i generate.setText(text); break; case "Sketchboard": - text = "a single item of " + userInput + "with clean background, hand-drawing sketch style, high quality"; + text = "a single item , " + userInput + ", clean background, hand-drawing sketch style, high quality"; generate.setText(text); default: }