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

service-base/src/main/java/com/simuwang/base/common/util/ExcelUtil.java

@@ -28,7 +28,7 @@ public class ExcelUtil {
     private static final Logger logger = LoggerFactory.getLogger(ExcelUtil.class);
 
     public static boolean isExcel(String fileName) {
-        return StrUtil.isNotBlank(fileName) && (fileName.endsWith("xls") || fileName.endsWith("xlsx"));
+        return StrUtil.isNotBlank(fileName) && (fileName.endsWith("xls") || fileName.endsWith("xlsx") || fileName.endsWith("XLS") || fileName.endsWith("XLSX"));
     }
 
     public static boolean isPdf(String fileName) {

service-base/src/main/java/com/simuwang/base/common/util/StringUtil.java

@@ -50,7 +50,6 @@ public class StringUtil {
                 sdf.parse(dateString);
                 return true;
             } catch (Exception e) {
-                return false;
             }
         }
         return false;

service-daq/src/main/java/com/simuwang/daq/service/NavEmailParser.java

@@ -69,8 +69,7 @@ public class NavEmailParser extends AbstractEmailParser {
     }
 
     @Override
-    public List<EmailFundNavDTO>
-    parse(EmailContentInfoDTO emailContentInfoDTO, Map<String, List<String>> emailFieldMap) {
+    public List<EmailFundNavDTO> parse(EmailContentInfoDTO emailContentInfoDTO, Map<String, List<String>> emailFieldMap) {
         List<EmailFundNavDTO> emailFundNavDTOList = CollUtil.newArrayList();
         String emailContent = emailContentInfoDTO.getEmailContent();
         // 1.解析邮件正文
@@ -366,7 +365,7 @@ public class NavEmailParser extends AbstractEmailParser {
         EmailFundNavDTO emailFundNavDTO = new EmailFundNavDTO();
         String priceDate = columnFieldMap.get(EmailFieldConst.PRICE_DATE) != null && sheetRow.getCell(columnFieldMap.get(EmailFieldConst.PRICE_DATE)) != null ?
                 ExcelUtil.getCellValue(sheetRow.getCell(columnFieldMap.get(EmailFieldConst.PRICE_DATE))) : null;
-
+        priceDate = StringUtil.isValidDate(priceDate) ? priceDate : null;
         // 份额基金净值文件格式
         long parentFiledCount = columnFieldMap.keySet().stream().filter(e -> e.contains("parent")).count();
         if (parentFiledCount >= 1) {

service-manage/src/main/java/com/simuwang/manage/api/deletion/DeletionController.java

@@ -115,15 +115,21 @@ public class DeletionController {
         values.put(sheetName,dataList);
         HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(sheetName,head,values,null);
         try {
-            response.setContentType("application/x-xls");
-            response.setCharacterEncoding("gbk");
-            response.addHeader("Content-Disposition", "attachment;filename=" + EncodeUtil.encodeUTF8("缺失明细.xls"));
+            response.setContentType("application/vnd.ms-excel");
+            response.setCharacterEncoding("GBK");
+            response.addHeader("Content-Disposition", "attachment;filename=" + EncodeUtil.encodeUTF8("缺失明细.xlsx"));
             ServletOutputStream outputStream = response.getOutputStream();
             wb.write(outputStream);
             outputStream.flush();
             outputStream.close();
         } catch (Exception e) {
             logger.error(e.getMessage(),e);
+        } finally {
+            try {
+                wb.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
     }
 }

service-manage/src/main/java/com/simuwang/manage/dto/MenuTreeDTO.java

@@ -3,6 +3,7 @@ package com.simuwang.manage.dto;
 import cn.hutool.core.collection.ListUtil;
 import com.simuwang.base.pojo.dos.sys.SysMenuDO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -67,6 +68,7 @@ public class MenuTreeDTO {
      * 启用状态，1-启用，0-禁用
      */
     private Integer status;
+    private Date createTime;
     /**
      * 子菜单
      */
@@ -99,6 +101,7 @@ public class MenuTreeDTO {
         this.visible = menuDO.getVisible();
         this.icon = menuDO.getIcon();
         this.status = menuDO.getStatus();
+        this.createTime = menuDO.getCreateTime();
     }
 
     public Integer getId() {
@@ -220,4 +223,12 @@ public class MenuTreeDTO {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }