diff --git a/pom.xml b/pom.xml
index 7b6f221..ba0cdb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.yzx.hardware-access
hardware-access
- 2.0.4
+ 2.0.5
8
diff --git a/src/main/java/com/hkversion/Acs/AcsMain.java b/src/main/java/com/hkversion/Acs/AcsMain.java
index dd5ca1b..2269060 100644
--- a/src/main/java/com/hkversion/Acs/AcsMain.java
+++ b/src/main/java/com/hkversion/Acs/AcsMain.java
@@ -93,8 +93,15 @@ public class AcsMain {
// login_V40("175.155.64.18","admin","kdsy2009",(short) 50118); //登陆设备
// login_V40("175.155.64.18","admin","kdsy2009",(short) 50114); //登陆设备
- login_V40("118.122.89.90","admin","yzx123456",(short)7713);
-// login_V40("192.168.69.103","admin","yzx123456",(short)8000);
+// login_V40("118.122.89.90","admin","yzx123456",(short)7713);
+// login_V40("192.168.0.75","admin","yzx123456",(short)8000);
+// login_V40("10.7.88.15","admin","lwxx1357",(short)8000);
+// login_V40("10.7.88.16","admin","lwxx1357",(short)8000);
+// login_V40("118.122.89.101","admin","yzx123456.",(short)50033);
+// login_V40("118.122.89.101","admin","kdsy2009",(short)50116);
+
+
+
/**
* 人员管理模块
*/
@@ -143,9 +150,9 @@ public class AcsMain {
// MutilCard.setGroupCfg(lUserID);
// MutilCard.setMultiCardCfg(lUserID);
//设置计划模板
-// UserManage.setCardTemplate(lUserID,8,8);
+// UserManage.setCardTemplate(lUserID,21,21);
//获取计划模板
- UserManage.getCardTemplate(lUserID,8);
+ UserManage.getCardTemplate(lUserID,5);
//设备能力获取
// DeviceAbility.getDeviceAbility(lUserID,0x01);
diff --git a/src/main/java/com/hkversion/Acs/UserManage.java b/src/main/java/com/hkversion/Acs/UserManage.java
index a7b9252..343f059 100644
--- a/src/main/java/com/hkversion/Acs/UserManage.java
+++ b/src/main/java/com/hkversion/Acs/UserManage.java
@@ -125,7 +125,7 @@ public class UserManage {
}
}
- public static int modifyUserInfo(int lUserID, String employeeNo,int planTemplateNo,String doorRight) throws InterruptedException, JSONException {
+ public static int modifyUserInfo(int lUserID, String employeeNo,String planTemplateNo,String doorRight) throws InterruptedException, JSONException {
int status = -1;
HCNetSDK.BYTE_ARRAY ptrByteArray = new HCNetSDK.BYTE_ARRAY(1024); //数组
//"POST /ISAPI/AccessControl/UserInfo/Record?format=json" 此URL也是下发人员
@@ -483,20 +483,20 @@ public class UserManage {
// struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[2].struTimeSegment.struEndTime.bySecond = 0;
struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].byEnable = 1;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struBeginTime.byHour = 15;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struBeginTime.byMinute = 30;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struBeginTime.bySecond = 59;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struEndTime.byHour = 19;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struEndTime.byMinute = 40;
+ struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struBeginTime.byHour = 02;
+ struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struBeginTime.byMinute = 00;
+ struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struBeginTime.bySecond = 00;
+ struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struEndTime.byHour = 20;
+ struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struEndTime.byMinute = 59;
struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[0].struTimeSegment.struEndTime.bySecond = 59;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].byEnable = 1;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struBeginTime.byHour = 11;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struBeginTime.byMinute = 20;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struBeginTime.bySecond = 59;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struEndTime.byHour = 12;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struEndTime.byMinute = 00;
- struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struEndTime.bySecond = 0;
+// struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].byEnable = 1;
+// struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struBeginTime.byHour = 11;
+// struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struBeginTime.byMinute = 20;
+// struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struBeginTime.bySecond = 59;
+// struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struEndTime.byHour = 12;
+// struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struEndTime.byMinute = 00;
+// struWeekPlanCfg.struPlanCfg[4].struPlanCfgDay[1].struTimeSegment.struEndTime.bySecond = 0;
struWeekPlanCfg.write();
//设置卡权限周计划参数
if (false == HKVersion.hCNetSDK.NET_DVR_SetDeviceConfig(userID, HCNetSDK.NET_DVR_SET_CARD_RIGHT_WEEK_PLAN_V50, 1, lpCond, struWeekPlanCond.size(), lpStatusList, lpInbuferCfg, struWeekPlanCfg.size())) {
diff --git a/src/main/java/com/yzx/impl/HKVersion.java b/src/main/java/com/yzx/impl/HKVersion.java
index aa1c44e..ab37620 100644
--- a/src/main/java/com/yzx/impl/HKVersion.java
+++ b/src/main/java/com/yzx/impl/HKVersion.java
@@ -276,7 +276,7 @@ public class HKVersion implements IHardwareEquipment {
if(userInfoSearch.containsKey("responseStatusStrg") && userInfoSearch.getString("responseStatusStrg").equals("OK")){
JSONArray userInfoList = userInfoSearch.getJSONArray("UserInfo");
JSONObject userInfo = userInfoList.getJSONObject(0);
- Integer template_id = userInfo.getJSONArray("RightPlan").getJSONObject(0).getInteger("planTemplateNo");
+ String template_id = userInfo.getJSONArray("RightPlan").getJSONObject(0).getString("planTemplateNo");
userFaceInfo = new UserFaceInfo();
userFaceInfo.setTemplateId(template_id);
userFaceInfo.setEmployeeNo(employeeNo);
diff --git a/src/main/java/com/yzx/pojo/UserFaceInfo.java b/src/main/java/com/yzx/pojo/UserFaceInfo.java
index 5652462..711d485 100644
--- a/src/main/java/com/yzx/pojo/UserFaceInfo.java
+++ b/src/main/java/com/yzx/pojo/UserFaceInfo.java
@@ -4,7 +4,7 @@ import lombok.Data;
@Data
public class UserFaceInfo {
- private int templateId;
+ private String templateId;
private String employeeNo;//用户编号
private int status;//状态 1 成功 -1失败
private int person_id;//