fixbugs

smart-city-platform/src/main/java/com/bz/smart_city/entity/Device.java

@@ -71,7 +71,7 @@ public class Device {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间", hidden = true)
-    private LocalDateTime dateCreate = LocalDateTime.now();
+    private LocalDateTime dateCreate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间", hidden = true)

smart-city-platform/src/main/java/com/bz/smart_city/service/importfile/AsyncTaskImportService.java

@@ -113,6 +113,7 @@ public class AsyncTaskImportService {
         dto.setInstallTime(LocalDateTime.now());
         Integer siteId = record.getSiteId();
         boolean isDownload = false;
+        boolean invalidTemplate = false;
         int successTime = 0 ;
         int failTime = 0 ;
         String messageTitle = "新装水表管理-批量添加水表";
@@ -137,6 +138,7 @@ public class AsyncTaskImportService {
                     if (!StringUtils.equals("安装计划模板", hssfSheet.getSheetName())) {
                         continue;
                     }
+                    invalidTemplate = true;
                     // 1,处理表头,解析客户、户数
                     Row customerIdRow = hssfSheet.getRow(2); // 客户Id行
                     Cell customerIdCell =  customerIdRow.getCell(7);
@@ -373,7 +375,9 @@ public class AsyncTaskImportService {
         }
 
 
-
+        if(!invalidTemplate){
+            messageContent.append("无效模板");
+        }
 
         //更新完成生成消息
         Message message = new Message();
@@ -400,6 +404,7 @@ public class AsyncTaskImportService {
         dto.setSiteId(record.getSiteId());
         dto.setInstallTime(LocalDateTime.now());
         boolean isDownload = false;
+        boolean invalidTemplate = false;
         int successTime = 0 ;
         int failTime = 0 ;
         String messageTitle = "设备列表-批量添加";
@@ -422,6 +427,7 @@ public class AsyncTaskImportService {
                     if (hssfSheet == null || !StringUtils.equals("表格模板", hssfSheet.getSheetName())) {
                         continue;
                     }
+                    invalidTemplate = true;
                     // 循环行Row
                     for (int rowNum = 4; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
                         Row row = hssfSheet.getRow(rowNum);
@@ -675,6 +681,7 @@ public class AsyncTaskImportService {
                 importService.updateByPrimaryKeySelective(record);
 
                 isDownload = true;
+
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("read excel error" + e.getMessage());
@@ -686,6 +693,9 @@ public class AsyncTaskImportService {
         } else {
             throw new ServiceException(-900, "文件不能为空！");
         }
+        if(!invalidTemplate){
+            messageContent.append("无效模板");
+        }
 
         //更新完成生成消息
         Message message = new Message();