|
|
@@ -95,7 +95,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
|
|
|
dtos.setMachineCode(param.getMachineCode());
|
|
|
dtos.setTimestamp(new Date().getTime());
|
|
|
List<CamRegDto> camRegs = new ArrayList<>();
|
|
|
- String[] split = param.getSnCodes().split(",");
|
|
|
+ String[] split = param.getSnCodes().split("\n");
|
|
|
for (String snCode : split) {
|
|
|
CamRegDto camRegDto = new CamRegDto();
|
|
|
camRegDto.setSn(snCode);
|
|
|
@@ -116,6 +116,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
|
|
|
detail.setCameraTypeStr(CameraUtils.getCameraTypeStr(detail.getCameraType()));
|
|
|
detailHashMap.put(snCode,detail);
|
|
|
}
|
|
|
+ param.setCameraNum(detailHashMap.size());
|
|
|
dtos.setCamRegs(camRegs);
|
|
|
String authorizeKey = RegCodeUtil.batchGenRegeditCamCode(dtos);
|
|
|
if(StringUtils.isBlank(authorizeKey)){
|
|
|
@@ -128,7 +129,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
|
|
|
}
|
|
|
this.saveOrUpdate(param);
|
|
|
if(StringUtils.isNotBlank(param.getSnCodes())){
|
|
|
- String[] split = param.getSnCodes().split(",");
|
|
|
+ String[] split = param.getSnCodes().split("\n");
|
|
|
for (String snCode : split) {
|
|
|
AuthorizeCameraDetail detail = detailHashMap.get(snCode);
|
|
|
if(detail!= null){
|
lyhzzz