优化卡未授权问题

邱一成
1 parent e130c410
Showing 2 changed files with 26 additions and 18 deletions Show diff stats
cloud/dahua/src/main/java/com/example/dahua/async/SendUserInfoTask.java
cloud/dahua/src/main/java/com/example/dahua/module/GateModule.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 {//新增卡信息
  
@@ -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;
     }
  
     /**
...	...	@@ -318,27 +318,31 @@ public class SendUserInfoTask {
318	318	if (bCardFlags != -1) {//修改卡信息
319	319	int newRecordNo=0;
320	320	int bFaceFalgsInt=0;
321		- bFaceFalgsInt = GateModule.modifyFaceInfo(user_id, memory, loginHandleLong);
322		- if(bFaceFalgsInt==1) {//1照片修改成功
323		- bFaceFalgs=true;
324		- GateModule.modifyCard(bCardFlags, cardNum, user_id, name, "123456", Res.string().getCardStatusInt(1), Res.string().getCardTypeInt(1),
325		- 0, 0, 1, startTime, endTime, loginHandleLong, userType);
326		- userDao.updateRecordNo(user_id, bCardFlags, attendanceBean.getClint_id());
327		- }
328		- else if(bFaceFalgsInt==1029)//1029用户id不存在
329		- {
	321	+
	322	+ newRecordNo=GateModule.modifyCard(bCardFlags, cardNum, user_id, name, "123456", Res.string().getCardStatusInt(1), Res.string().getCardTypeInt(1),
	323	+ 0, 0, 1, startTime, endTime, loginHandleLong, userType);
	324	+ if(newRecordNo==1){
	325	+ userDao.updateRecordNo(user_id, bCardFlags, attendanceBean.getClint_id());}
	326	+
	327	+ bFaceFalgsInt = GateModule.modifyFaceInfo(user_id, memory, loginHandleLong);
	328	+ if(bFaceFalgsInt==1) {//1照片修改成功
	329	+ bFaceFalgs=true;
	330	+ }
	331	+ else{bFaceFalgs=false;}
	332	+ //卡号添加成功，但是人脸不成功的话，就需要新增人脸
	333	+ if (!bFaceFalgs)
	334	+ bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong);
	335	+ else{
	336	+ userDao.deleteRecordNo(user_id, bCardFlags);
330	337	bCardFlags = GateModule.insertCard(cardNum, user_id, name, "123456"
331	338	, Res.string().getCardStatusInt(1), Res.string().getCardTypeInt(1), 0, 1
332	339	, 1, startTime, endTime, loginHandleLong,userType);
333		-
334	340	if (bCardFlags != -1) {
335		- userDao.updateRecordNo(user_id, bCardFlags, attendanceBean.getClint_id());
	341	+ int index = userDao.saveRecordNo(user_id, bCardFlags, name, attendanceBean.getClint_id());//存储记录集编号
336	342	}
337		- }
338		- else{bFaceFalgs=false;}
339		- //卡号添加成功，但是人脸不成功的话，就需要新增人脸
340		- if (!bFaceFalgs)
	343	+ //添加人脸
341	344	bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong);
	345	+ }
342	346
343	347	} else {//新增卡信息
344	348
...	...
...	...	@@ -632,7 +632,7 @@ public class GateModule {
632	632	return true;
633	633	}
634	634
635		- public static boolean modifyCard(int recordNo, String cardNo, String userId, String cardName, String cardPwd,
	635	+ public static int modifyCard(int recordNo, String cardNo, String userId, String cardName, String cardPwd,
636	636	int cardStatus, int cardType, int useTimes, int isFirstEnter,
637	637	int isValid, String startValidTime, String endValidTime, LLong lLong,String userType) {
638	638	/**
...	...	@@ -729,12 +729,16 @@ public class GateModule {
729	729	// cardStatus, cardType, useTimes, isFirstEnter,
730	730	// isValid, startValidTime, endValidTime, lLong, userType);
731	731	}
732		- return false;
	732	+ if(number.equals("1091")\|\|number.equals("1147"))//未知错误
	733	+ {
	734	+ return Integer.parseInt(number);
	735	+ }
	736	+ return 0;
733	737	} else {
734	738	System.out.println("修改卡信息成功 ");
735	739	}
736	740
737		- return true;
	741	+ return 1;
738	742	}
739	743
740	744	/**
...	...