建筑编辑更新BUG

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

@@ -167,7 +167,7 @@ public class Building implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间", position = 50, hidden = true)
-    private LocalDateTime createDate = LocalDateTime.now();
+    private LocalDateTime createDate;
 
     @ApiModelProperty(value = "创建人", position = 51, hidden = true)
     private String createBy = "system";

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/CommandResolverExcelService.java

@@ -73,7 +73,7 @@ public class CommandResolverExcelService implements ResolverExcelService {
             if (hssfSheet == null || !StringUtils.equals(executeSheetName, hssfSheet.getSheetName())) {
                 continue;
             }
-            data.setInvalidTemplate(true);
+
             // 1,处理表头,解设备类型、指令类型
             Row deviceTypeRow = hssfSheet.getRow(1);
             Cell deviceTypeCell =  deviceTypeRow.getCell(1);
@@ -81,8 +81,7 @@ public class CommandResolverExcelService implements ResolverExcelService {
             String[] deviceType  = StringUtils.split(deviceTypeCell.getStringCellValue().trim(),"/");
             DeviceTypeDto dt = deviceTypeService.getByName(deviceType[1],deviceType[2]);
             if (dt == null) {
-                data.getMessageContent().append("导入失败，");
-                data.getMessageContent().append("设备型号不存在");
+                data.getMessageContent().append("设备型号不存在，");
                 continue;
             }
 
@@ -91,17 +90,16 @@ public class CommandResolverExcelService implements ResolverExcelService {
             Cell commandTypeCell =  commandTypeRow.getCell(1);
 
             if(StringUtils.equals("", commandTypeCell.getStringCellValue().trim())) {
-                data.getMessageContent().append("导入失败，");
-                data.getMessageContent().append("指令不能为空");
+                data.getMessageContent().append("指令不能为空，");
                 continue;
             }
 
             Integer valveStatus =  convertValveStatus(commandTypeCell.getStringCellValue().trim());
             if (valveStatus == null) {
-                data.getMessageContent().append("导入失败，");
-                data.getMessageContent().append("无效指令");
+                data.getMessageContent().append("无效指令，");
                 continue;
             }
+            data.setInvalidTemplate(true);
             String taskNo = generateTaskNo();
 
             // 2,处理明细行数据

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/DefaultHandleExcelService.java

@@ -100,7 +100,7 @@ public class DefaultHandleExcelService implements HandleExcelService {
             data.getMessageContent().append(data.getFailTime().get());
             data.getMessageContent().append("条。");
         }else {
-            data.getMessageContent().append("无效模板");
+            data.getMessageContent().append("导入失败。");
         }
 
         //更新完成生成消息