From c3235b53c9278b9b5b35e2f36d649304b4029a90 Mon Sep 17 00:00:00 2001
From: qiuyc <1026314800@qq.com>
Date: Mon, 16 Nov 2020 18:25:45 +0800
Subject: [PATCH] 大华一体机考勤和时段设置完成

---
 cloud/dahua/src/main/java/com/example/dahua/MyTask.java                | 37 ++++++++++++++++++++++++-------------
 cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java |  2 +-
 cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java           |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

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 b0e9355..650f2f7 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java
@@ -288,7 +288,6 @@ public class MyTask implements ApplicationRunner {
                 String card = new String(msg.szCardNo).trim();
                 //开门错误码
                 int messageCode = msg.nErrorCode;
-                System.out.println("sda:" + card + " 抓拍照片存储地址:");
 
                 //设备ID获取
                 NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
@@ -307,13 +306,22 @@ public class MyTask implements ApplicationRunner {
                         if (gateBufferedImage != null) {
                             ImageIO.write(gateBufferedImage, "png", new File(snapPicPath));
                         }
+                        log.info("设备ID: {},卡号: {},抓拍照片存储地址:{}" ,szSn,card,snapPicPath);
                         if(isMatch(REGEX_POSITIVE_Symbol, szSn)){//验证设备id是否存在特殊字符
-                            log.info("设备ID: {},卡号: {}",szSn,card);
+                            log.info("—设备ID异常: {},卡号: {}",szSn,card);
                             return 0;
                         }
-                        int schoolId=userDao.getSchoolIdbyClint_id(szSn);
+                        int schoolId=0;
+                        String schoolIdStr=userDao.getSchoolIdbyClint_id(szSn);
+                        if(org.apache.commons.lang.StringUtils.isNotBlank(schoolIdStr)){
+                            schoolId=Integer.parseInt(schoolIdStr);
+                        }
                         //卡号取反（大写）
-                        if(!szSn.startsWith("ytj")&&schoolId==126&&schoolId==393){
+                        //if(!szSn.startsWith("ytj")||(szSn.startsWith("ytj")&&schoolId==126&&schoolId==393)){
+                        if(szSn.startsWith("ytj")&&schoolId!=126&&schoolId!=393){
+                            card = card;
+                        }
+                        else{
                             card = cardNo(card);
                         }
                         //根据卡号获取卡身份信息
@@ -333,16 +341,19 @@ public class MyTask implements ApplicationRunner {
                                     time, card,messageCode ==32?EnumSendFaceType.TIME_INTERVAL_ERROR.message:"");
                         }
 
-                        // TODO 考勤记录
-                        //刷卡结果，1表示成功, 0表示失败
-                        int status = msg.bStatus;
-                        //门禁事件类型：1进2出
-                        int eventType = msg.emEventType;
-                        //刷卡时间
-                        String eventTime = DateUtils.date2String(new Date(), DateUtils.format2);
+                        if(szSn.startsWith("ytj")) {
 
-                        //保存考勤记录
-                        kaoQinRecord(status,eventType,card,szSn,eventTime,snapPicPath,messageCode);
+                            // TODO 考勤记录
+                            //刷卡结果，1表示成功, 0表示失败
+                            int status = msg.bStatus;
+                            //门禁事件类型：1进2出
+                            int eventType = msg.emEventType;
+                            //刷卡时间
+                            String eventTime = DateUtils.date2String(new Date(), DateUtils.format2);
+
+                            //保存考勤记录
+                            kaoQinRecord(status, eventType, card, szSn, eventTime, snapPicPath, messageCode);
+                        }
                     }
 
                 } catch (IOException e2) {
diff --git a/cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java b/cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java
index 50d9534..cb97198 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java
@@ -234,7 +234,7 @@ public class MyScheduledTask {
         isInitMQ = true;
 
     }
-
+    
     private void sendMQMess(String content) {
         String cardNum = content.substring(content.indexOf("卡号") + 3, content.indexOf("卡号") + 11);
 
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 e1b6043..a490316 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
@@ -14,7 +14,7 @@ public interface UserDao {
     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);
+    String getSchoolIdbyClint_id( @Param("clint_id") String clint_id);
 
     @Select("select * from SZ_Attendance where school_id = #{school_id} and clint_type = #{clint_type}")
     List<AttendanceBean> getAttendanceBeans(@Param("school_id") String school_id, @Param("clint_type") String clint_type);
--
libgit2 0.21.0