From 84c941612ba4e3d2b66c78287b472ae48a8f2e39 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 25 Aug 2022 16:07:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E6=97=B6=EF=BC=8C=E6=96=87=E4=BB=B6=E4=B8=AD=E5=8C=85?= =?UTF-8?q?=E5=90=AB.=E7=9A=84=E6=97=B6=E5=80=99=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=B8=8D=E5=AF=B9=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/att/service/impl/AttFileEOServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 6ade5957..30004a37 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -340,15 +340,17 @@ public class AttFileEOServiceImpl extends ServiceImpl i */ AttFileEO attFileEO = new AttFileEO(); AttFileEO attFileInfo=null; - Integer flag=0; try { attFileEO.setId(attId); attFileInfo = this.baseMapper.selectFileInfoById(attFileEO); if (name.contains(".")) { - if (name.split("\\.")[1].equals(attFileInfo.getFileSuffix())) { + int suffixIndex = name.lastIndexOf("."); + String newSuffix = name.substring(suffixIndex+1).trim(); + if (StringUtils.equals(newSuffix.toUpperCase(),attFileInfo.getFileSuffix().toUpperCase())) { attFileInfo.setOldFileName(name); }else { - attFileInfo.setOldFileName(name.split("\\.")[0].trim()+"."+attFileInfo.getFileSuffix()); + String filename = name.substring(0,suffixIndex).trim(); + attFileInfo.setOldFileName(filename+"."+attFileInfo.getFileSuffix()); } }else { attFileInfo.setOldFileName(name.trim()+"."+attFileEO.getFileSuffix()); @@ -361,6 +363,7 @@ public class AttFileEOServiceImpl extends ServiceImpl i return attFileInfo; } + /** * @Author super_liu * @Description 多文件查询 From 075cd4768c706c01d1c2ec7a0c4275aa58900f75 Mon Sep 17 00:00:00 2001 From: zyd Date: Thu, 25 Aug 2022 16:34:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E7=BA=BF=E4=B8=8AES?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=E4=B8=AD=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6ID=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84BUG,?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E7=9C=8B=E4=B8=8D=E5=88=B0=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E6=AD=A4=E5=A4=84=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=BE=93=E5=87=BA=EF=BC=8C=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index bc7c78a3..ff10623f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -216,6 +216,7 @@ public class SendStandMQService { saveMap.put(field+"Name",fieldValue); }catch (Exception e){ logger.info("国内外标准 消息队列: "+addOrUpdate+", 标准ID:"+infoEO.getId()+",问题字段:"+field); + logger.error(e.getMessage(),e); saveMap.put(field+"Name",fieldValue); }