调整提示

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

@@ -85,11 +85,7 @@ public class CommandResolverExcelService implements ResolverExcelService {
                 data.getMessageContent().append("设备型号不存在");
                 continue;
             }
-            if(dt.getIsValve()==0){
-                data.getMessageContent().append("导入失败，");
-                data.getMessageContent().append("设备型号不支持该指令");
-                continue;
-            }
+
 
             Row commandTypeRow = hssfSheet.getRow(2);
             Cell commandTypeCell =  commandTypeRow.getCell(1);
@@ -129,6 +125,8 @@ public class CommandResolverExcelService implements ResolverExcelService {
                     }
                     log.info("row rowNum  = {} deviceNo = {} params = {}",rowNum,deviceNoCell.getStringCellValue(),params);
 
+
+
                     Device device = deviceMapper.findByDeviceNo(deviceNoCell.getStringCellValue().trim());
                     if (device == null) {
                         data.getFailTime().incrementAndGet();
@@ -140,6 +138,12 @@ public class CommandResolverExcelService implements ResolverExcelService {
                         remarkCell.setCellValue("表型不匹配");
                         continue;
                     }
+                    if(dt.getIsValve()==0){
+                        data.getFailTime().incrementAndGet();
+                        remarkCell.setCellValue("设备型号不支持该指令");
+                        continue;
+                    }
+
                     Integer count = deviceCommandMapper.countByDeviceId(device.getId());
                     if (count != null && count > 0) {
                         data.getFailTime().incrementAndGet();