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 cd0bba3..ab26de6 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java +++ b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java @@ -2,6 +2,8 @@ package com.example.dahua; import com.example.dahua.bean.*; import com.example.dahua.dao.UserDao; +import com.example.dahua.enums.EnumSendFaceType; +import com.example.dahua.enums.EnumSzBusinessType; import com.example.dahua.lib.NetSDKLib; import com.example.dahua.lib.ToolKits; import com.example.dahua.lib.Utils; @@ -242,8 +244,7 @@ public class MyTask implements ApplicationRunner { if (null != deviceInfoBeans && deviceInfoBeans.size() > 0) { for (DeviceInfoBean dev : deviceInfoBeans) { - if (lLongMap.get(dev.getDevcieId()).intValue() > 0) { - NetSDKLib.LLong lLong = GateModule.realLoadPic2(0, analyzerCallback, lLongMap.get(dev.getDevcieId()),dev.getDevcieId()); + if (lLongMap.get(dev.getDevcieId()).intValue() > 0) { NetSDKLib.LLong lLong = GateModule.realLoadPic2(0, analyzerCallback, lLongMap.get(dev.getDevcieId()),dev.getDevcieId()); // System.out.println("监听成功："+dev.getDevcieId()); // if (lLong.intValue() != -1) { // //deviceInfoBeans.remove(dev); @@ -290,7 +291,8 @@ public class MyTask implements ApplicationRunner { ToolKits.GetPointerData(pAlarmInfo, msg); //卡号 String card = new String(msg.szCardNo).trim(); - + //开门错误码 + int messageCode = msg.nErrorCode; System.out.println("sda:" + card + " 抓拍照片存储地址:"); try { @@ -304,8 +306,11 @@ public class MyTask implements ApplicationRunner { if (gateBufferedImage != null) { ImageIO.write(gateBufferedImage, "png", new File(snapPicPath)); } + int schoolId=userDao.getSchoolIdbyClint_id(szSn); //卡号取反（大写） - card = cardNo(card); + if(!szSn.startsWith("ytj")&&schoolId==126&&schoolId==393){ + card = cardNo(card); + } //根据卡号获取卡身份信息 CardBean cardBean = userDao.getCards(card); String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -314,11 +319,13 @@ public class MyTask implements ApplicationRunner { if (null != cardBean && cardBean.getType() == 0) { //老师人脸信息，保存人脸记录表 TeacherBean teacherBean = userDao.getTeacherWithId(cardBean.getUser_id()); - sendRecordDao.addFaceRecoder(szSn, teacherBean.getUser_id(), teacherBean.getName(), snapPicPath, 1, time, card,""); + sendRecordDao.addFaceRecoder(szSn, teacherBean.getUser_id(), teacherBean.getName(), snapPicPath, 1, + time, card,messageCode ==32?EnumSendFaceType.TIME_INTERVAL_ERROR.message:""); } else if (null != cardBean && cardBean.getType() == 2) { //学生人脸信息，保存人脸记录表 UserInfoBean userInfoBean = userDao.getStudentWithid(cardBean.getUser_id()); - sendRecordDao.addFaceRecoder(szSn, userInfoBean.getUser_id(), userInfoBean.getName(), snapPicPath, 1, time, card,""); + sendRecordDao.addFaceRecoder(szSn, userInfoBean.getUser_id(), userInfoBean.getName(), snapPicPath, 1, + time, card,messageCode ==32?EnumSendFaceType.TIME_INTERVAL_ERROR.message:""); } // TODO 考勤记录 @@ -327,9 +334,10 @@ public class MyTask implements ApplicationRunner { //门禁事件类型：1进2出 int eventType = msg.emEventType; //刷卡时间 - String eventTime = msg.UTC.toStringTime(); + String eventTime = DateUtils.date2String(new Date(), DateUtils.format2); + //保存考勤记录 - kaoQinRecord(status,eventType,card,szSn,eventTime,snapPicPath); + kaoQinRecord(status,eventType,card,szSn,eventTime,snapPicPath,messageCode); } } catch (IOException e2) { @@ -382,7 +390,7 @@ public class MyTask implements ApplicationRunner { * @param eventTime * @param imageUrl */ - public void kaoQinRecord(int status,int eventType,String cardNo,String deviceId,String eventTime,String imageUrl) { + public void kaoQinRecord(int status,int eventType,String cardNo,String deviceId,String eventTime,String imageUrl,int messageCode) { if (status == 1) { //有效刷卡调考勤存储过程 CheckIn checkIn = new CheckIn(); @@ -426,27 +434,32 @@ public class MyTask implements ApplicationRunner { } } else { //若即不成功，也不是请假，则按刷卡异常处理 - User user = userDao.selectUserByCardNum(cardNo).get(0); - if(user ==null ){ - System.out.println("卡号"+cardNo+"没找到对应学生或老师"); + List users = userDao.selectUserByCardNum(cardNo); + if(users.size()<1){ + log.warn("考勤记录：卡号： {}没找到对应学生或老师，考勤时间： {}",cardNo,DateUtils.date2String(new Date(), DateUtils.format2)); + return; } + User user = users.get(0); int deviceType; if (deviceId.startsWith("ytj")){ deviceType = 29; }else { deviceType = 22; } + if(messageCode==32){ + return; + } //失败记录 SendRecordBean sendRecordBean = new SendRecordBean(); sendRecordBean.setSchoolId(user.getSchoolId()); sendRecordBean.setSchoolName(userDao.getSchoolName(String.valueOf(user.getSchoolId()))); sendRecordBean.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - sendRecordBean.setUserType(2); + sendRecordBean.setUserType(EnumSzBusinessType.EnumUserType.STUDENT.code); sendRecordBean.setNum(cardNo); sendRecordBean.setName(user.getName()); sendRecordBean.setImgPath(imageUrl); sendRecordBean.setCustomerid(String.valueOf(user.getStudentId())); - sendRecordBean.setFailType(8); + sendRecordBean.setFailType(messageCode); sendRecordBean.setFailContent("人脸认证失败"); sendRecordBean.setDeviceID(deviceId); sendRecordDao.addFaceFail(sendRecordBean.getCustomerid(), sendRecordBean.getDeviceID(), sendRecordBean.getNum(), sendRecordBean.getName(), sendRecordBean.getTime(), 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 c344378..26adddf 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 @@ -336,20 +336,16 @@ public class SendUserInfoTask { * 若存在记录集编号，则表示用户已下发过，执行修改用户信息，反之，则新增下发用户人脸、卡信息 */ - //人脸下发成功标识：false:失败 true:成功 - boolean bFaceFalgs = false; - //卡下发成功标识：false:失败 true:成功 - boolean bCardFlags = false; - //卡操作错误号 - String cardErrNum =""; - //人脸操作错误号 - String faceErrNum =""; + //人脸操作错误号:1 为成功，其他为相应错误号 + int bFaceFalgs = 0; + //卡操作错误号 ：1 为成功，其他为相应错误号 + int bCardFlags = 0; //新的记录集编号 int newRecordNo = 0; //获取记录集编号 String recordNo = userDao.getRecordNo(user_id, attendanceBean.getClint_id()); if(!StringUtils.isEmpty(recordNo)){ - bCardFlags = true; + bCardFlags = 1; } //登录设备 NetSDKLib.LLong loginHandleLong = MyTask.lLongMap.get(attendanceBean.getClint_id()); @@ -373,55 +369,79 @@ public class SendUserInfoTask { } else { log.info("=================开始执行下发人脸及卡号任务================="); //卡号取反 - String cardNum = cardNo(student_num); + String cardNum =""; + if(attendanceBean.getClint_id().startsWith("ytj")&&Integer.parseInt(attendanceBean.getSchool_id())!=126&&Integer.parseInt(attendanceBean.getSchool_id())!=393) + {cardNum = student_num;} + else + {cardNum = cardNo(student_num);} //bCardFlags = true, 存在下发记录，则存在下发记录集编号，执行修改卡、人脸信息 - if (bCardFlags) { + if (bCardFlags ==1) { //修改设备卡信息 - boolean isEditCard = GateModule.modifyCard(Integer.parseInt(recordNo),cardNum, user_id, name, "123456", Res.string().getCardStatusInt(1), - Res.string().getCardTypeInt(1), 0, 0, 1, startTime, endTime, loginHandleLong, userType,cardErrNum,channel); + bCardFlags = GateModule.modifyCard(Integer.parseInt(recordNo),cardNum, user_id, name, "123456", Res.string().getCardStatusInt(1), + Res.string().getCardTypeInt(1), 0, 0, 1, startTime, endTime, loginHandleLong, userType,channel); - if (isEditCard) { + if (bCardFlags ==1) { //修改卡成功, 更新下发记录集编号表 userDao.updateRecordNo(user_id, Integer.parseInt(recordNo), attendanceBean.getClint_id()); //修改卡成功, 更新设备用户人脸信息 - boolean isEditFace = GateModule.modifyFaceInfo(user_id, memory, loginHandleLong,faceErrNum); + bFaceFalgs = GateModule.modifyFaceInfo(user_id, memory, loginHandleLong); //修改卡信息成功，但是人脸修改不成功的话，就需要新增人脸 - if (!isEditFace) { - bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong,faceErrNum); + if (bFaceFalgs !=1) { + bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong); + //添加人脸失败，且错误号为1029 用户ID不存在，则删除下发记录集编号表记录:SZ_Student_RecoderNo,重新下发. + if(bFaceFalgs !=1 && String.valueOf(bFaceFalgs).equals(EnumSendFaceErrorType.NOT_EXIST_USER_1029.code)){ + //删除记录 + userDao.deleteRecordNo(user_id, Integer.parseInt(recordNo)); + //重新下发卡号至设备 + newRecordNo = GateModule.insertCard(cardNum, user_id, name, "123456", Res.string().getCardStatusInt(1), + Res.string().getCardTypeInt(1), 0, 1, 1, startTime, endTime, loginHandleLong,userType,channel); + //下发卡至设备,返回值不为-1为下发成功,保存下发记录集编号表 + if (newRecordNo > 0) { + userDao.saveRecordNo(user_id, newRecordNo, name, attendanceBean.getClint_id());//存储记录集编号 + }else{ + bCardFlags = newRecordNo; + } + //添加人脸 + bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong); + } } }else{ //设备修改卡信息失败,则删除下发记录集编号表记录:SZ_Student_RecoderNo,重新下发. userDao.deleteRecordNo(user_id, Integer.parseInt(recordNo)); //重新下发卡号至设备 newRecordNo = GateModule.insertCard(cardNum, user_id, name, "123456", Res.string().getCardStatusInt(1), - Res.string().getCardTypeInt(1), 0, 1, 1, startTime, endTime, loginHandleLong,userType,cardErrNum,channel); + Res.string().getCardTypeInt(1), 0, 1, 1, startTime, endTime, loginHandleLong,userType,channel); //下发卡至设备,返回值不为-1为下发成功,保存下发记录集编号表 - if (newRecordNo != -1) { + if (newRecordNo > 0) { userDao.saveRecordNo(user_id, newRecordNo, name, attendanceBean.getClint_id());//存储记录集编号 + }else{ + bCardFlags = newRecordNo; } //添加人脸 - bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong,faceErrNum); + bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong); } } else { //新增卡信息, 新增人脸信息至设备 newRecordNo = GateModule.insertCard(cardNum, user_id, name, "123456" , Res.string().getCardStatusInt(1), Res.string().getCardTypeInt(1), 0, 1 - , 1, startTime, endTime, loginHandleLong,userType,cardErrNum,channel); + , 1, startTime, endTime, loginHandleLong,userType,channel); //下发卡至设备,返回值不为-1为下发成功,保存下发记录集编号表 - if (newRecordNo != -1) { + if (newRecordNo >0) { + bCardFlags = newRecordNo; userDao.saveRecordNo(user_id, newRecordNo, name, attendanceBean.getClint_id()); } + //添加人脸 - bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong,faceErrNum); + bFaceFalgs = GateModule.addFaceInfo(user_id, memory, loginHandleLong); } /** * 人脸和卡都下发成功 */ - if (bCardFlags && bFaceFalgs) { + if (bCardFlags > 0 && bFaceFalgs==1) { FileUtils.getInstance().writeLogs("下发人脸和卡号成功:" + cardNum + " " + attendanceBean.getClint_id(), FileUtils.sendUserSucTxt); log.info("下发人脸和卡号成功, sendRecordBean: "+ JSON.toJSONString(sendRecordBean)); @@ -445,11 +465,11 @@ public class SendUserInfoTask { /** * 人脸和卡都下发失败 */ - if (!bCardFlags && !bFaceFalgs) { + if (bCardFlags < 0 && bFaceFalgs!=1) { FileUtils.getInstance().writeLogs("下发人脸和卡号失败:" + cardNum + " user_id: " + user_id + " loginHandleLong: " + loginHandleLong, FileUtils.sendUserErrTxt); log.info("下发人脸和卡号失败, sendRecordBean: "+ JSON.toJSONString(sendRecordBean)); //失败信息 - String failContent = analysisErrorMsg(cardErrNum,faceErrNum); + String failContent = analysisErrorMsg(String.valueOf(Math.abs(bCardFlags)),String.valueOf(bFaceFalgs)); sendRecordBean.setFailType(EnumSendFaceType.FACE_AND_CARD_FAIL.code); sendRecordBean.setFailContent(failContent); sendRecordDao.updateFace(sendRecordBean.getNum(), sendRecordBean.getDeviceID(), sendRecordBean.getFailType(), EnumSendFaceType.FACE_AND_CARD_FAIL.code); @@ -458,11 +478,11 @@ public class SendUserInfoTask { /** * 下发卡号成功，下发人脸失败, */ - if (bCardFlags && !bFaceFalgs) { + if (bCardFlags >0 && bFaceFalgs !=1) { FileUtils.getInstance().writeLogs("下发卡号成功，下发人脸失败:" + cardNum + " " + attendanceBean.getClint_id(), FileUtils.sendUserErrTxt); log.info("下发卡号成功，下发人脸失败, sendRecordBean: " + JSON.toJSONString(sendRecordBean)); //失败信息 - String failContent = analysisErrorMsg(cardErrNum,faceErrNum); + String failContent = analysisErrorMsg(String.valueOf(bCardFlags),String.valueOf(bFaceFalgs)); sendRecordBean.setFailType(EnumSendFaceType.FACE_FAIL_CARD_SUCCESS.code); sendRecordBean.setFailContent(failContent); sendRecordDao.updateFace(sendRecordBean.getNum(), sendRecordBean.getDeviceID(), sendRecordBean.getFailType(), EnumSendFaceType.FACE_FAIL_CARD_SUCCESS.code); @@ -472,7 +492,7 @@ public class SendUserInfoTask { * 下发卡号失败，下发人脸成功, * 注：此一般不存在 */ - if (!bCardFlags && bFaceFalgs) { + if (bCardFlags !=1 && bFaceFalgs !=1) { FileUtils.getInstance().writeLogs("卡信息已存在，下发人脸成功:" + cardNum + " " + attendanceBean.getClint_id(), FileUtils.sendUserSucTxt); log.info("-----------卡信息已存在，添加人脸成功----------"); } @@ -504,6 +524,10 @@ public class SendUserInfoTask { } } } + if(StringUtils.isEmpty(channel)){ + log.warn("未获取到学校权限通道号！"); + return 0; + } return Integer.parseInt(channel); } diff --git a/cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java b/cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java index 17e5045..e1b6043 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java +++ b/cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java @@ -13,6 +13,8 @@ public interface UserDao { @Select(" select student_num from SZ_V_School_Student where school_id = #{school_id} and studentcode = #{studentcode}") public String getStudentNum(@Param("school_id") String school_id, @Param("studentcode") String studentcode); + @Select("select school_id from SZ_Attendance where clint_id = #{clint_id} ") + int getSchoolIdbyClint_id( @Param("clint_id") String clint_id); @Select("select * from SZ_Attendance where school_id = #{school_id} and clint_type = #{clint_type}") List getAttendanceBeans(@Param("school_id") String school_id, @Param("clint_type") String clint_type); @@ -50,7 +52,7 @@ public interface UserDao { * @param customerid * @return */ - @Select(" select Top(1)* student_type from SZ_V_School_Student where school_id = #{school_id} and student_id = #{customerid}") + @Select(" select Top(1) student_type from SZ_V_School_Student where school_id = #{school_id} and student_id = #{customerid}") String getStudentType(@Param("school_id") String school_id, @Param("customerid") String customerid); @Insert("insert into SZ_Student_RecoderNo values(#{user_id},#{recordNo},#{student_name},#{deviceId})") @@ -184,7 +186,7 @@ public interface UserDao { * @param cardNum * @return */ - @Select(" select school_id , class_id ,name ,student_id from\n" + + @Select(" select school_id as schoolId , class_id as classId ,name ,student_id as studentId from\n" + " (select top 1 b.school_id, b.class_id, b.name, student_id from SZ_V_Card a\n" + " inner join SZ_V_School_Student b on a.user_id = b.student_id\n" + " and b.role_state = 1 where a.type = 2 and a.num = #{cardNum}\n" + @@ -193,14 +195,14 @@ public interface UserDao { " inner join SZ_V_School_Teacher b on a.user_id = b.teacher_id\n" + " and b.role_state = 1 where a.type = 0 and a.num = #{cardNum}\n" + " ) x ") - List selectUserByCardNum(@Param("studentcode") String cardNum); + List selectUserByCardNum(@Param("cardNum") String cardNum); /** * 获取卡号 * @param cardNo * @return */ - @Select("select Top(1) StudentNum from HS_LeaveExaminePassList where StudentNum= #{cardNo} and GETDATE() ]]> LeaveTime and GETDATE() ReturnTime") + @Select("select Top(1) StudentNum from HS_LeaveExaminePassList where StudentNum= #{cardNo} and GETDATE() > LeaveTime and GETDATE() < ReturnTime") String checkLeave(@Param("cardNo") String cardNo); /** diff --git a/cloud/dahua/src/main/java/com/example/dahua/enums/EnumSendFaceType.java b/cloud/dahua/src/main/java/com/example/dahua/enums/EnumSendFaceType.java index 16e7b37..8073c57 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/enums/EnumSendFaceType.java +++ b/cloud/dahua/src/main/java/com/example/dahua/enums/EnumSendFaceType.java @@ -12,7 +12,8 @@ public enum EnumSendFaceType { NOT_ONLINE_DEVICE(2, "设备不在线"), FACE_AND_CARD_FAIL(3, "人脸信息、卡信息下发失败"), FACE_FAIL_CARD_SUCCESS(4, "人脸信息下发失败，卡信息下发成功"), - FACE_SUCCESS_CARD_FAIl(5, "人脸信息下发成功，卡信息下发失败"); + FACE_SUCCESS_CARD_FAIl(5, "人脸信息下发成功，卡信息下发失败"), + TIME_INTERVAL_ERROR(6, "刷卡时段验证错误"); public final int code; public final String message; 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 31691ca..f593671 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 @@ -204,7 +204,7 @@ public class GateModule { public static synchronized int insertCard(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,String cardErrNum,int channel) { + String userType,int channel) { /** * 门禁卡记录集信息 */ @@ -290,18 +290,17 @@ public class GateModule { String ret=ToolKits.getErrorCodePrint(); String number = ret.substring(ret.indexOf("|") + 1, ret.indexOf(")")); log.info("添加卡信息失败，错误信息：{} ,错误码:{} ",ret,number); - cardErrNum = number; //146用户已存在，21对返回数据的校验出错,1162未知错误 if(number.equals(EnumSendCardErrorType.CHECK_DATA_ERR_21.code)||number.equals(EnumSendCardErrorType.EXIST_USER_146.code)) { //用户已存在/返回数据校验出错时,执行删除用户 deleteUser( userId, lLong); //重新下发卡至设备 - cardErrNum = ""; return insertCard(cardNo, userId, cardName, cardPwd, cardStatus, cardType, useTimes, isFirstEnter, - isValid, startValidTime, endValidTime, lLong, userType,cardErrNum,channel); + isValid, startValidTime, endValidTime, lLong, userType,channel); } //新增卡失败，错误码,返回-1 - return -1; + int result = 0- Integer.parseInt(number); + return result; } else { log.info("添加卡信息成功,卡信息记录集编号 : "+ insert.stuCtrlRecordSetResult.nRecNo); return insert.stuCtrlRecordSetResult.nRecNo; @@ -310,6 +309,14 @@ public class GateModule { // return true; } + public static void main(String[] args) { + int i =200; + int a = 0-i; + int b = Math.abs(a); + System.out.println(b); + System.out.println(a); + } + /* public static synchronized int insertCard(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) { @@ -687,10 +694,10 @@ public class GateModule { * @param userType * @return */ - 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,String cardErrNum,int channel) { + String userType,int channel) { /** * 门禁卡记录集信息 */ @@ -779,13 +786,12 @@ public class GateModule { String ret=ToolKits.getErrorCodePrint(); //结果码 String number = ret.substring(ret.indexOf("|") + 1, ret.indexOf(")")); - cardErrNum = number; log.error("修改卡信息失败，错误信息：{} ,错误码:{} ",ret,number); - return false; + return Integer.parseInt(number); } log.info("修改卡信息成功!"); - return true; + return 1; } /** @@ -1141,7 +1147,7 @@ public class GateModule { return true; } - public static synchronized boolean addFaceInfo(String userId, Memory memory, LLong lLong,String faceErrNum) { + public static synchronized int addFaceInfo(String userId, Memory memory, LLong lLong) { int emType = EM_FACEINFO_OPREATE_TYPE.EM_FACEINFO_OPREATE_ADD; // 添加 /** @@ -1176,21 +1182,18 @@ public class GateModule { } else { String ret=ToolKits.getErrorCodePrint(); String number = ret.substring(ret.indexOf("|") + 1, ret.indexOf(")")); - faceErrNum = number; log.error("添加信息失败，错误信息：{} ,错误码:{} ",ret,number); //照片已存在 if(number.equals(EnumSendFaceErrorType.EXIST_IMG_1031.code)){ - faceErrNum = ""; - return modifyFaceInfo(userId, memory, lLong,faceErrNum); + return modifyFaceInfo(userId, memory, lLong); } //用户Id不存在 if(number.equals(EnumSendFaceErrorType.NOT_EXIST_USER_1029.code)) { - faceErrNum = ""; - return addFaceInfo( userId, memory, lLong,faceErrNum); + return Integer.parseInt(number); } - return false; + return Integer.parseInt(number); } - return true; + return 1; } /** @@ -1244,7 +1247,7 @@ public class GateModule { } - public static boolean modifyFaceInfo(String userId, Memory memory, LLong lLong,String faceErrNum) { + public static int modifyFaceInfo(String userId, Memory memory, LLong lLong) { int emType = EM_FACEINFO_OPREATE_TYPE.EM_FACEINFO_OPREATE_UPDATE; // 修改 /** @@ -1274,17 +1277,16 @@ public class GateModule { boolean bRet = LoginModule.netsdk.CLIENT_FaceInfoOpreate(lLong, emType, stIn.getPointer(), stOut.getPointer(), 5000); stIn.read(); stOut.read(); - + Map map = new HashMap(); if (bRet) { log.info("修改人脸成功!"); } else { String ret=ToolKits.getErrorCodePrint(); String number = ret.substring(ret.indexOf("|") + 1, ret.indexOf(")")); - faceErrNum = number; log.error("修改人脸失败，错误信息：{} ,错误码:{} ",ret,number); - return false; + return Integer.parseInt(number); } - return true; + return 1; } /** diff --git a/cloud/dahua/src/main/java/com/example/dahua/utils/HttpUtils.java b/cloud/dahua/src/main/java/com/example/dahua/utils/HttpUtils.java index 2c4cbee..4e7ed34 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/utils/HttpUtils.java +++ b/cloud/dahua/src/main/java/com/example/dahua/utils/HttpUtils.java @@ -105,7 +105,8 @@ public class HttpUtils { * @return */ public static boolean sendPermission(PermissionBean permissionBean) { - String url = "http://121.40.109.21:8991/file/sendPermission"; +// String url = "http://121.40.109.21:8991/file/sendPermission"; + String url = "http://localhost:8991/file/sendPermission"; RestTemplate restTemplate = new RestTemplate(); HttpHeaders headers = new HttpHeaders(); diff --git a/cloud/dahua/src/main/resources/mapper/PermissionFaceMapper.xml b/cloud/dahua/src/main/resources/mapper/PermissionFaceMapper.xml index f180f3f..58632cf 100644 --- a/cloud/dahua/src/main/resources/mapper/PermissionFaceMapper.xml +++ b/cloud/dahua/src/main/resources/mapper/PermissionFaceMapper.xml @@ -18,6 +18,8 @@ + + -- libgit2 0.21.0