|
@@ -179,7 +179,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
}
|
|
}
|
|
StringBuilder res = new StringBuilder("第");
|
|
StringBuilder res = new StringBuilder("第");
|
|
for (Integer index : errorList) {
|
|
for (Integer index : errorList) {
|
|
- res.append(index + 5).append(",");
|
|
|
|
|
|
+ res.append(index ).append(",");
|
|
}
|
|
}
|
|
res.deleteCharAt(res.lastIndexOf(","));
|
|
res.deleteCharAt(res.lastIndexOf(","));
|
|
res.append("行存在错误");
|
|
res.append("行存在错误");
|
|
@@ -194,7 +194,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
bo = true;
|
|
bo = true;
|
|
}
|
|
}
|
|
for (String wifiName : newList) {
|
|
for (String wifiName : newList) {
|
|
- int index = wifiNameList.indexOf(wifiName) + 3;
|
|
|
|
|
|
+ int index = wifiNameList.indexOf(wifiName) + 4;
|
|
if(bo){
|
|
if(bo){
|
|
if( !wifiName.contains("_") || !wifiName.contains("4D")
|
|
if( !wifiName.contains("_") || !wifiName.contains("4D")
|
|
|| !CameraTypeEnum.typePrefixMap.containsKey(wifiName.split("_")[0]+"_")){
|
|
|| !CameraTypeEnum.typePrefixMap.containsKey(wifiName.split("_")[0]+"_")){
|