diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/task/KitchenStaffInfoFaceTask.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/task/KitchenStaffInfoFaceTask.java
index 027fafc..5c67a7e 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/task/KitchenStaffInfoFaceTask.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/task/KitchenStaffInfoFaceTask.java
@@ -108,8 +108,13 @@ public class KitchenStaffInfoFaceTask {
/**
* 定时初始化厨房门禁设备权柄;防止设备突发出现断联
*/
+ boolean flage=true;
@Scheduled(fixedDelay = 10 * 60 * 1000)
public void InitDev() throws InterruptedException {
+ if(flage){
+ flage=false;
+ return;
+ }
System.out.println("检查门禁设备及初始化设备!");
boolean dd=initServer.hCNetSDK.NET_DVR_RemoteControl(initServer.lUserID,20005,null,0);
if(dd){
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/initServer.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/initServer.java
index da1d573..383ff90 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/initServer.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/utils/initServer.java
@@ -60,22 +60,20 @@ public class initServer implements CommandLineRunner {
}
}
boolean dd=initServer.hCNetSDK.NET_DVR_RemoteControl(initServer.lUserID,20005,null,0);
- if(dd){
+ if(!dd){
System.out.println("初始:"+devIp);
Login(devIp,devUser,devPass,(short) 8000,1); //登陆
- Thread.sleep(2000);
Alarm.SetAlarm(initServer.lUserID);
}
dd=initServer.hCNetSDK.NET_DVR_RemoteControl(initServer.lUserID2,20005,null,0);
- if(dd){
+ if(!dd){
System.out.println("初始:"+devIp2);
Login(devIp2,devUser,devPass,(short) 8000,2); //登陆
}
dd=initServer.hCNetSDK.NET_DVR_RemoteControl(initServer.lUserID3,20005,null,0);
- if(dd){
+ if(!dd){
System.out.println("初始:"+devIp3);
Login(devIp3,devUser,devPass,(short) 8000,3); //登陆
- Thread.sleep(2000);
Alarm.SetAlarm(initServer.lUserID3);
}
System.err.println("hCNetSDK1111111111111=="+hCNetSDK);
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml
index 762ce61..f638717 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffEnterExitRecordMapper.xml
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (kst.staff_name like concat('%', #{articleTitle}, '%') or kst.mobile like concat('%', #{articleTitle}, '%'))
and kseer.staff_id = #{staffId}
and kseer.enter_img_url = #{enterImgUrl}
- and substring(kseer.enter_time,1,10) >= #{startDate} and #{endDate}>= substring(kseer.enter_time,1,10)
+ and substring(kseer.create_time,1,10) >= #{startDate} and #{endDate}>= substring(kseer.create_time,1,10)
and kst.area_id = #{areaId}
and kst.canteen_id = #{canteenId}