Merge remote-tracking branch 'origin/develop_master' into develop_master

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);
             }
 

adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java

@@ -340,15 +340,17 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> 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<AttFileEODao, AttFileEO> i
         return attFileInfo;
     }
 
+
     /**
      * @Author super_liu
      * @Description 多文件查询