模板格式判断

business-service/src/main/java/com/ozs/service/impl/BaseCameraManagementServiceImpl.java

@@ -18,6 +18,7 @@ import com.ozs.service.BaseRailwayManagementService;
 import com.ozs.service.BaseUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
@@ -198,8 +199,13 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     failureMsg.append(failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 已存在");
                 }
             } catch (Exception e) {
+                String msg = null;
                 failureNum++;
-                String msg = failureNum + "、相机编码 " + cameraManagementVos.getCameraCode() + " 导入失败：";
+                if (ObjectUtils.isEmpty(cameraManagementVos)) {
+                    msg = "导入的文档格式不正确";
+                }else {
+                    msg = failureNum + "、相机编码 " + cameraManagementVos.getCameraCode() + " 导入失败：";
+                }
                 failureMsg.append(msg);
                 log.error(msg, e);
             }

business-service/src/main/java/com/ozs/service/impl/BaseRailwayManagementServiceImpl.java

@@ -91,8 +91,13 @@ public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayMan
                     failureMsg.append( failureNum + "、线路名称 " + railwayManagement.getRailwayName() + " 已存在");
                 }
             } catch (Exception e) {
+                String msg=null;
                 failureNum++;
-                String msg = failureNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入失败：";
+                if (ObjectUtils.isEmpty(railwayManagement)) {
+                    msg = "导入的文档格式不正确";
+                }else {
+                    msg = failureNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入失败：";
+                }
                 failureMsg.append(msg);
                 log.error(msg, e);
             }

business-service/src/main/java/com/ozs/service/impl/BaseTerminalServiceImpl.java

@@ -190,8 +190,13 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
                     }
                 }
             } catch (Exception e) {
+                String msg = null;
                 failureNum++;
-                String msg = failureNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + " 导入失败：";
+                if (ObjectUtils.isEmpty(baseVehicleTerminal)) {
+                    msg = "导入的文档格式不正确";
+                } else {
+                    msg = failureNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + " 导入失败：";
+                }
                 failureMsg.append(msg);
                 log.error(msg, e);
             }

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -184,8 +184,13 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                     }
                 }
             } catch (Exception e) {
+                String msg = null;
                 failureNum++;
-                String msg = failureNum + "、机车编码 " + baseVehicle2.getVehicleCode() + " 导入失败：";
+                if (ObjectUtils.isEmpty(baseVehicle2)) {
+                    msg = "导入的文档格式不正确";
+                } else {
+                     msg = failureNum + "、机车编码 " + baseVehicle2.getVehicleCode() + " 导入失败：";
+                }
                 failureMsg.append(msg);
                 log.error(msg, e);
             }
@@ -245,7 +250,7 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         if (!StringUtils.isEmptySunhh(terminalCodeList) && terminalCodeList.size() > 0) {
             wrapper.notIn(BaseTerminal::getTerminalCode, terminalCodeList);
         }
-        wrapper.eq(BaseTerminal::getStatus,1);
+        wrapper.eq(BaseTerminal::getStatus, 1);
 //        List<BaseVehicleTerminal> baseVehicleTerminalList = baseVehicleTerminalMapper.selectList(wrapper);
         int pageNum = Integer.parseInt(baseVehicleVo.getPageNum().toString());
         int pageSize = Integer.parseInt(baseVehicleVo.getPageSize().toString());