@@ -263,12 +263,12 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
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);
+ errorIndex.add(index -3);
continue;
}
RtkAccount rtkAccount = this.getByUserName(userName);
if(rtkAccount !=null){
Date failureTime = null;
@@ -276,7 +276,7 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
try {
failureTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(failureTimeStr);
} catch (ParseException e) {
@@ -186,17 +186,17 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
log.info("rtkDevice-excel-in--cameraSn:{},rtkTypeStr:{},rtkSn:{},rtkSgSn:{},index:{}",cameraSn,rtkTypeStr,rtkSn,rtkSgSn,index);
RtkTypeEnum rtkTypeEnum = RtkTypeEnum.getByMsg(rtkTypeStr);
if(StringUtils.isBlank(rtkSn) || rtkTypeEnum == null){
RtkDevice rtkDevice = this.getByRtkSnCode(rtkSn);
if(rtkDevice !=null){
RtkDevice rtkDevice2 = this.getByCameraSn(cameraSn);
if(rtkDevice2 !=null){
RtkDeviceInParam param = new RtkDeviceInParam(cameraSn,rtkTypeEnum.getCode(),rtkSn,rtkSgSn);