From 6cdd877a0eff79febbe91c983b08fd582894d366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 1 Jul 2025 09:27:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=B6=88=E6=81=AF=E7=9A=84=E6=9C=AA=E8=AF=BB?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/mobilebroken/admin/controller/TicketController.java | 2 +- .../com/nflg/mobilebroken/cfs/controller/TicketController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index c9089c7e..328a18dd 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -705,7 +705,7 @@ public class TicketController extends ControllerBase { for (ChatMessageVO messageVO : messageVOS) { if (Objects.equals(messageVO.getSenderId(), userId) || readeds.contains(messageVO.getId())) { messageVO.setReaded(true); - } else { + } else if(Objects.nonNull(messageVO.getId())){ notReadeds.add(messageVO.getId()); } } diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java index bee91b4b..783f7f0a 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java @@ -315,7 +315,7 @@ public class TicketController extends ControllerBase { for (ChatMessageVO messageVO : messageVOS) { if (Objects.equals(messageVO.getSenderId(), userId) || readeds.contains(messageVO.getId())) { messageVO.setReaded(true); - } else { + } else if(Objects.nonNull(messageVO.getId())){ notReadeds.add(messageVO.getId()); } } From f20f2e8442358f9188a9d362d49349767f8efa5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 1 Jul 2025 15:14:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E5=A6=82=E6=9E=9C=E8=A6=81?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E7=9A=84=E5=86=85=E5=AE=B9=E4=BB=85=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E6=95=B0=E5=AD=97=E5=92=8C=E7=AC=A6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/AliYunTranslate.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java index bdd6ba34..ac8a71e9 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java @@ -56,6 +56,9 @@ public class AliYunTranslate implements ITranslate { @Override public String translateWord(String text, String sourceLanguage, String targetLanguage, String formatType) { + if (isOnlyDigitsAndSymbols(text)){ + return text; + } com.aliyun.alimt20181012.models.TranslateGeneralRequest request = new com.aliyun.alimt20181012.models.TranslateGeneralRequest() .setTargetLanguage(targetLanguage) .setSourceLanguage(sourceLanguage) @@ -101,4 +104,12 @@ public class AliYunTranslate implements ITranslate { public String translateWord(String text, String targetLanguage) { return translateWord(text, targetLanguage, "text"); } + + private boolean isOnlyDigitsAndSymbols(String content) { + if (StrUtil.isBlank(content)) { + return true; + } + // 正则：只允许数字、符号（不含中英文字母） + return content.matches("[0-9\\s\\p{Punct}]+"); + } } From c21a4e077ca76d185d377ab4d5b97e42a3a5187e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 1 Jul 2025 18:13:53 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=9C=BA?= =?UTF-8?q?=E5=9E=8B=E5=8F=82=E6=95=B0=E8=AF=A6=E6=83=85=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProductModelParamsItemServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsItemServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsItemServiceImpl.java index 02bf286c..171650eb 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsItemServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsItemServiceImpl.java @@ -153,9 +153,10 @@ public class ProductModelParamsItemServiceImpl extends ServiceImpl StrUtil.isNotBlank(pi.getName())) .map(pi -> Convert.convert(ProductParamsItemVO.class, pi)) .collect(Collectors.toList())); + ivo.getItems().sort(Comparator.comparing(ProductParamsItemVO::getBatchNumber)); vo.getItems().add(ivo); }); - vo.getItems().sort(Comparator.comparing(ProductModelMainParamsItemChildrenVO::getIndexName)); + vo.getItems().sort(Comparator.comparing(ProductModelMainParamsItemChildrenVO::getBatchNumber)); }); vos.sort(Comparator.comparing(ProductModelParamsItemVO::getLanguageCode)); return vos; From 4a2cc93666857ce56f94b2639902c1f4c88123ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 2 Jul 2025 17:28:55 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E4=B8=8B=E6=8B=89=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E6=B2=A1=E6=9C=89=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=B3=BB=E5=88=97=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProductTypeMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml index 3ba47f01..8c42e2dc 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml @@ -80,7 +80,7 @@ + + + + + + From be2afe982ea11b9052a4d97cbeebedbbb643fb7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 7 Jul 2025 15:39:15 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/mobilebroken/repository/entity/ProductPart.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPart.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPart.java index 88e48a91..b81f59b1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPart.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductPart.java @@ -1,6 +1,7 @@ package com.nflg.mobilebroken.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; @@ -37,6 +38,7 @@ public class ProductPart implements Serializable { /** * 描述 */ + @TableField(value = "`describe`") private String describe; /** From 71d744cebb205d53b407f205d8e51e9cdaa6a65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 8 Jul 2025 09:25:40 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/mobilebroken/common/pojo/vo/ParamsSortListVO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ParamsSortListVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ParamsSortListVO.java index 2c7a82f9..642b56c4 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ParamsSortListVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ParamsSortListVO.java @@ -1,5 +1,8 @@ package com.nflg.mobilebroken.common.pojo.vo; +import lombok.Data; + +@Data public class ParamsSortListVO { private String batchNumber;