diff --git a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java index 9904c67..f8d7d5e 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java +++ b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java @@ -256,7 +256,7 @@ public class MyTask implements ApplicationRunner { NetSDKLib.LLong lLong = GateModule.realLoadPic2(0, analyzerCallback, lLongMap.get(dev.getDevcieId()),dev.getDevcieId()); System.out.println("监听成功:"+dev.getDevcieId()); if (lLong.intValue() != -1) { - it.remove(); + //it.remove(); } } } @@ -322,7 +322,7 @@ public class MyTask implements ApplicationRunner { if (gateBufferedImage != null) { ImageIO.write(gateBufferedImage, "png", new File(snapPicPath)); } - log.info("设备ID: {},卡号: {},抓拍照片存储地址:{}" ,szSn,card,snapPicPath); + //验证设备id是否存在特殊字符 if(isMatch(REGEX_POSITIVE_Symbol, szSn)){ log.info("—设备ID异常: {},卡号: {}",szSn,card); @@ -342,6 +342,7 @@ public class MyTask implements ApplicationRunner { } else{ card = cardNo(card); } + log.info("设备ID: {},卡号: {},抓拍照片存储地址:{}" ,szSn,card,snapPicPath); //根据卡号获取卡身份信息 CardBean cardBean = userDao.getCards(card); String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -415,7 +416,7 @@ public class MyTask implements ApplicationRunner { } public final static String REGEX_POSITIVE_INTEGER = "^\\+?[1-9]\\d*$"; - public final static String REGEX_POSITIVE_Symbol = "\\\":?!."; + public final static String REGEX_POSITIVE_Symbol = ",,:?!."; private boolean isMatch(String regex, String orginal) { if (orginal == null || orginal.trim().equals("")) { //$NON-NLS-1$ return false; diff --git a/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java b/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java index 92d6c49..521e6e5 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java +++ b/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java @@ -714,7 +714,7 @@ public class GateModule { /** * 门禁卡记录集信息 */ -// NET_RECORDSET_ACCESS_CTL_CARD accessCardInfo = new NET_RECORDSET_ACCESS_CTL_CARD(); + accessCardInfo = new NET_RECORDSET_ACCESS_CTL_CARD(); // 记录集编号, 修改、删除卡信息必须填写 accessCardInfo.nRecNo = recordNo; @@ -784,7 +784,7 @@ public class GateModule { /** * 记录集操作 */ -// NET_CTRL_RECORDSET_PARAM update = new NET_CTRL_RECORDSET_PARAM(); + update = new NET_CTRL_RECORDSET_PARAM(); update.emType = EM_NET_RECORD_TYPE.NET_RECORD_ACCESSCTLCARD; // 记录集信息类型 update.pBuf = accessCardInfo.getPointer(); -- libgit2 0.21.0