diff --git a/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java b/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java index 1ee73a1..ee23450 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java +++ b/cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java @@ -318,27 +318,31 @@ public class SendUserInfoTask { if (bCardFlags != -1) {//修改卡信息 int newRecordNo=0; int bFaceFalgsInt=0; - bFaceFalgsInt = GateModule.modifyFaceInfo(user_id, memory, loginHandleLong); - if(bFaceFalgsInt==1) {//1照片修改成功 - bFaceFalgs=true; - GateModule.modifyCard(bCardFlags, cardNum, user_id, name, "123456", Res.string().getCardStatusInt(1), Res.string().getCardTypeInt(1), - 0, 0, 1, startTime, endTime, loginHandleLong, userType); - userDao.updateRecordNo(user_id, bCardFlags, attendanceBean.getClint_id()); - } - else if(bFaceFalgsInt==1029)//1029用户id不存在 - { + + newRecordNo=GateModule.modifyCard(bCardFlags, cardNum, user_id, name, "123456", Res.string().getCardStatusInt(1), Res.string().getCardTypeInt(1), + 0, 0, 1, startTime, endTime, loginHandleLong, userType); + if(newRecordNo==1){ + userDao.updateRecordNo(user_id, bCardFlags, attendanceBean.getClint_id());} + + bFaceFalgsInt = GateModule.modifyFaceInfo(user_id, memory, loginHandleLong); + if(bFaceFalgsInt==1) {//1照片修改成功 + bFaceFalgs=true; + } + else{bFaceFalgs=false;} + //卡号添加成功,但是人脸不成功的话,就需要新增人脸 + if (!bFaceFalgs) + bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong); + else{ + userDao.deleteRecordNo(user_id, bCardFlags); bCardFlags = GateModule.insertCard(cardNum, user_id, name, "123456" , Res.string().getCardStatusInt(1), Res.string().getCardTypeInt(1), 0, 1 , 1, startTime, endTime, loginHandleLong,userType); - if (bCardFlags != -1) { - userDao.updateRecordNo(user_id, bCardFlags, attendanceBean.getClint_id()); + int index = userDao.saveRecordNo(user_id, bCardFlags, name, attendanceBean.getClint_id());//存储记录集编号 } - } - else{bFaceFalgs=false;} - //卡号添加成功,但是人脸不成功的话,就需要新增人脸 - if (!bFaceFalgs) + //添加人脸 bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong); + } } else {//新增卡信息 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 375e010..97eb165 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 @@ -632,7 +632,7 @@ public class GateModule { return true; } - public static boolean modifyCard(int recordNo, String cardNo, String userId, String cardName, String cardPwd, + public static int modifyCard(int recordNo, String cardNo, String userId, String cardName, String cardPwd, int cardStatus, int cardType, int useTimes, int isFirstEnter, int isValid, String startValidTime, String endValidTime, LLong lLong,String userType) { /** @@ -729,12 +729,16 @@ public class GateModule { // cardStatus, cardType, useTimes, isFirstEnter, // isValid, startValidTime, endValidTime, lLong, userType); } - return false; + if(number.equals("1091")||number.equals("1147"))//未知错误 + { + return Integer.parseInt(number); + } + return 0; } else { System.out.println("修改卡信息成功 "); } - return true; + return 1; } /** -- libgit2 0.21.0