日志调整

pom.xml

@@ -80,6 +80,12 @@
             <version>2.6.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/greentech/gateservice/init/BatchLogin.java

@@ -3,7 +3,9 @@ package com.greentech.gateservice.init;
 import com.greentech.gateservice.entity.GateInfo;
 import com.greentech.gateservice.entity.GateInfoImpl;
 import com.greentech.gateservice.mapper.GateInfoMapper;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,15 +15,18 @@ import com.sun.jna.Pointer;
 import java.util.List;
 
 @Component
+@Data
 @RequestMapping("crud")
 public class BatchLogin implements CommandLineRunner {
     @Autowired
     GateInfoMapper crudMapper;
 
+    @Value("${customer.project}")
+    private int project;
+
     @Override
     public void run(String... args) throws Exception {
         System.out.println("--初始化设备连接开始--");
-
         LoginModule.init(new NetSDKLib.fDisConnect() {
             @Override
             public void invoke(NetSDKLib.LLong lLong, String s, int i, Pointer pointer) {
@@ -54,10 +59,13 @@ public class BatchLogin implements CommandLineRunner {
             @Override
             public void invoke(NetSDKLib.LLong lLong, String s, int i, Pointer pointer) {
                 //重新连接写入map 配置 更新数据库状态
+                System.out.println("断线重连:"+s);
             }
         });
         //查询所有的门禁设备 并登录
         GateInfoImpl gateImpl = new GateInfoImpl();
+        GateInfoImpl.Criteria criteria = gateImpl.createCriteria();
+        criteria.andProjectIdEqualTo(project);
         List<GateInfo> list = crudMapper.selectByExample(gateImpl);
         for (GateInfo row: list) {
             boolean flag = LoginModule.login(row.getIp(),row.getPort(),row.getUserName(),row.getPassword());

src/main/java/com/greentech/gateservice/task/GateLogService.java

@@ -7,8 +7,11 @@ import com.netsdk.common.Res;
 import com.netsdk.lib.NetSDKLib;
 import com.netsdk.lib.ToolKits;
 import com.sun.jna.Memory;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -20,13 +23,18 @@ import java.util.Calendar;
 import java.util.Date;
 
 @RequestMapping("crud")
+@Data
+@Component
 @Service
 public class GateLogService {
 
     @Autowired
     GateOplogMapper gateOplogMapper;
 
-    @Scheduled(cron = "0 * * * * *")
+    @Value("${customer.project}")
+    private int project;
+
+    @Scheduled(cron = "0 0 * * * *")
     public void syncLog() {
         System.out.println("--开始执行日志查询同步任务--");
         String format = "yyyy-MM-dd HH:mm:ss";
@@ -35,9 +43,9 @@ public class GateLogService {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime startTime = now.minusHours(1);
         NetSDKLib.NET_TIME s = new NetSDKLib.NET_TIME();
-        s.setTime(startTime.getYear(),startTime.getMonthValue(),startTime.getDayOfMonth(),0,0,0);
+        s.setTime(startTime.getYear(),startTime.getMonthValue(),startTime.getDayOfMonth(),startTime.getHour(),0,0);
         NetSDKLib.NET_TIME e = new NetSDKLib.NET_TIME();
-        e.setTime(startTime.getYear(),startTime.getMonthValue(),startTime.getDayOfMonth(),23,59,59);
+        e.setTime(startTime.getYear(),startTime.getMonthValue(),startTime.getDayOfMonth(),startTime.getHour(),59,59);
 
         synchronized(LoginModule.lock){
             for (NetSDKLib.LLong key : LoginModule.m_stDeviceInfo.keySet()) {
@@ -85,6 +93,7 @@ public class GateLogService {
                 System.out.println("CLIENT_FindNextRecord success!");
                 ToolKits.GetPointerDataToStructArr(outNextParam.pRecordList, rets);
 
+                System.out.println("开始时间："+s.toStringTimeEx() + "结束时间："+e.toStringTimeEx());
                 System.out.println("查询到的结果数量:"+outNextParam.nRetRecordNum+"最大数量："+outNextParam.nMaxRecordNum);
                 for (int i = 0; i < outNextParam.nRetRecordNum; i++) {
                     String szCardName = new String(rets[i].szCardName);
@@ -94,10 +103,16 @@ public class GateLogService {
                     //bStatus 开门结果
                     GateOplog opLog = new GateOplog();
                     opLog.setGateName("");
-                    opLog.setProjectId(0);
+                    opLog.setProjectId(project);
                     opLog.setUserName(szCardName);
                     opLog.setEventType(openMethod);
-                    opLog.setStatus("");
+                    if (rets[i].emDirection == NetSDKLib.NET_ENUM_DIRECTION_ACCESS_CTL.NET_ENUM_DIRECTION_ENTRY) {
+                        opLog.setStatus("进门");
+                    } else if (rets[i].emDirection ==  NetSDKLib.NET_ENUM_DIRECTION_ACCESS_CTL.NET_ENUM_DIRECTION_EXIT) {
+                        opLog.setStatus("出门");
+                    } else {
+                        opLog.setStatus("");
+                    }
                     opLog.setSerialNum(new String(value.sSerialNumber));
 
                     Date d = new Date();
@@ -107,10 +122,10 @@ public class GateLogService {
                         System.err.println("解析时间发生错误: " + excep.getMessage());
                     }
                     opLog.setCreatedTime(d);
+                    opLog.setCheckType("");
                     byte isDelete = 0;
                     opLog.setIsDelete(isDelete);
-                    opLog.setId(0);
-                    opLog.setCheckType("");
+
                     gateOplogMapper.insert(opLog);
                 }
                 //断开查询句柄

src/main/resources/application-dev.yml

@@ -5,4 +5,7 @@ spring:
     url: jdbc:mysql://47.96.12.136:33069/ws_iot?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
     username: root
     password: PXDN93VRKU221107
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+customer:
+  project: 92