Commit 11aeb86c494849c108bc7285b719f36f5a73999d
1 parent
1c00f173
Exists in
master
看板代码修改
Showing
2 changed files
with
18 additions
and
4 deletions
Show diff stats
cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
| @@ -54,9 +54,12 @@ public class GateModule { | @@ -54,9 +54,12 @@ public class GateModule { | ||
| 54 | return m_hAttachHandle; | 54 | return m_hAttachHandle; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | + | ||
| 58 | + private static NetSDKLib.NET_DEVICEINFO_Ex deviceInfo; | ||
| 59 | + | ||
| 57 | public static LLong realLoadPic2(int ChannelId, NetSDKLib.fAnalyzerDataCallBack m_AnalyzerDataCB, LLong lLong,String devcieId) { | 60 | public static LLong realLoadPic2(int ChannelId, NetSDKLib.fAnalyzerDataCallBack m_AnalyzerDataCB, LLong lLong,String devcieId) { |
| 58 | 61 | ||
| 59 | - final NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex(); | 62 | +// final NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex(); |
| 60 | 63 | ||
| 61 | // 设备ID | 64 | // 设备ID |
| 62 | System.arraycopy(devcieId.getBytes(), 0, deviceInfo.sSerialNumber, 0, devcieId.getBytes().length); | 65 | System.arraycopy(devcieId.getBytes(), 0, deviceInfo.sSerialNumber, 0, devcieId.getBytes().length); |
| @@ -677,6 +680,16 @@ public class GateModule { | @@ -677,6 +680,16 @@ public class GateModule { | ||
| 677 | } | 680 | } |
| 678 | 681 | ||
| 679 | /** | 682 | /** |
| 683 | + * 门禁卡记录集信息 | ||
| 684 | + */ | ||
| 685 | + private static NET_RECORDSET_ACCESS_CTL_CARD accessCardInfo; | ||
| 686 | + | ||
| 687 | + /** | ||
| 688 | + * 记录集操作 | ||
| 689 | + */ | ||
| 690 | + private static NET_CTRL_RECORDSET_PARAM update; | ||
| 691 | + | ||
| 692 | + /** | ||
| 680 | * 修改设备卡信息 | 693 | * 修改设备卡信息 |
| 681 | * @param recordNo | 694 | * @param recordNo |
| 682 | * @param cardNo | 695 | * @param cardNo |
| @@ -701,7 +714,7 @@ public class GateModule { | @@ -701,7 +714,7 @@ public class GateModule { | ||
| 701 | /** | 714 | /** |
| 702 | * 门禁卡记录集信息 | 715 | * 门禁卡记录集信息 |
| 703 | */ | 716 | */ |
| 704 | - NET_RECORDSET_ACCESS_CTL_CARD accessCardInfo = new NET_RECORDSET_ACCESS_CTL_CARD(); | 717 | +// NET_RECORDSET_ACCESS_CTL_CARD accessCardInfo = new NET_RECORDSET_ACCESS_CTL_CARD(); |
| 705 | // 记录集编号， 修改、删除卡信息必须填写 | 718 | // 记录集编号， 修改、删除卡信息必须填写 |
| 706 | accessCardInfo.nRecNo = recordNo; | 719 | accessCardInfo.nRecNo = recordNo; |
| 707 | 720 | ||
| @@ -771,7 +784,8 @@ public class GateModule { | @@ -771,7 +784,8 @@ public class GateModule { | ||
| 771 | /** | 784 | /** |
| 772 | * 记录集操作 | 785 | * 记录集操作 |
| 773 | */ | 786 | */ |
| 774 | - NET_CTRL_RECORDSET_PARAM update = new NET_CTRL_RECORDSET_PARAM(); | 787 | +// NET_CTRL_RECORDSET_PARAM update = new NET_CTRL_RECORDSET_PARAM(); |
| 788 | + | ||
| 775 | update.emType = EM_NET_RECORD_TYPE.NET_RECORD_ACCESSCTLCARD; // 记录集信息类型 | 789 | update.emType = EM_NET_RECORD_TYPE.NET_RECORD_ACCESSCTLCARD; // 记录集信息类型 |
| 776 | update.pBuf = accessCardInfo.getPointer(); | 790 | update.pBuf = accessCardInfo.getPointer(); |
| 777 | 791 |
cloud/pom.xml
| @@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
| 35 | <!-- <module>consumer</module>--> | 35 | <!-- <module>consumer</module>--> |
| 36 | <module>haikangface</module> | 36 | <module>haikangface</module> |
| 37 | <!-- <module>search_independence</module>--> | 37 | <!-- <module>search_independence</module>--> |
| 38 | - <!-- <module>search_smartCampus</module>--> | 38 | + <module>search_smartCampus</module> |
| 39 | <!-- <module>search_xiaoan</module>--> | 39 | <!-- <module>search_xiaoan</module>--> |
| 40 | <!-- <module>mypulsar</module>--> | 40 | <!-- <module>mypulsar</module>--> |
| 41 | <!-- <module>weigeng</module>--> | 41 | <!-- <module>weigeng</module>--> |