@@ -256,6 +256,11 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
String mountPoint = map.get(4);
String port = map.get(5);
String failureTimeStr = map.get(6);
+ if(StringUtils.isBlank(userName) && StringUtils.isBlank(password) && StringUtils.isBlank(operator) && StringUtils.isBlank(ipAddr)
+ && StringUtils.isBlank(mountPoint)&& StringUtils.isBlank(port)&& StringUtils.isBlank(failureTimeStr)){
+ continue;
+ }
+
log.info("rtkAccount-excel-in--userName:{},password:{},operator:{},ipAddr:{},mountPoint:{},port:{},failureTime:{}",userName,password,operator,ipAddr,mountPoint,port,failureTimeStr);
if(StringUtils.isBlank(userName) || StringUtils.isBlank(password) || StringUtils.isBlank(ipAddr) || StringUtils.isBlank(mountPoint) || StringUtils.isBlank(port)){
errorIndex.add(index);
@@ -180,6 +180,9 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
String rtkTypeStr = map.get(1);
String rtkSn = map.get(2);
String rtkSgSn = map.get(3);
+ if(StringUtils.isBlank(cameraSn) && StringUtils.isBlank(rtkTypeStr) && StringUtils.isBlank(rtkSn) && StringUtils.isBlank(rtkSgSn)){
log.info("rtkDevice-excel-in--cameraSn:{},rtkTypeStr:{},rtkSn:{},rtkSgSn:{}",cameraSn,rtkTypeStr,rtkSn,rtkSgSn);
RtkTypeEnum rtkTypeEnum = RtkTypeEnum.getByMsg(rtkTypeStr);
if(StringUtils.isBlank(rtkSn) || rtkTypeEnum == null){