Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java =================================================================== diff -u -r35564 -r35603 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java (.../XinHuaDataManagerImpl.java) (revision 35564) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java (.../XinHuaDataManagerImpl.java) (revision 35603) @@ -830,7 +830,13 @@ jsonObject.put("machineNo" , fileName.substring(0 , fileName.indexOf("st"))); afterSt = fileName.substring(fileName.indexOf("st") + 2); } + if(afterSt == null){ + return null; + } String[] afterStArray = afterSt.split("-"); + if(afterStArray.length < 3){ + return null; + } jsonObject.put("sterilingDate" , afterStArray[0]); jsonObject.put("frequency" , afterStArray[1]); jsonObject.put("cycleCounter" , afterStArray[2]); @@ -845,7 +851,13 @@ jsonObject.put("machineNo" , fileName.substring(0 , fileName.indexOf("ws") + 2)); afterSt = fileName.substring(fileName.indexOf("ws") + 2); } + if(afterSt == null){ + return null; + } String[] afterStArray = afterSt.split("-"); + if(afterStArray.length < 3){ + return null; + } jsonObject.put("washDate" , afterStArray[0]); jsonObject.put("frequency" , afterStArray[1]); jsonObject.put("cycleCounter" , afterStArray[2]);