From 1facafc3199f398a7f1939799975b08d0a163ca8 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 七月 2017 13:49:01 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 6 ++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java | 6 +++++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java | 2 +-
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
index bc08bdd..3c600f0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/AttendanceMng.java
@@ -117,7 +117,7 @@
public void removeLastMonthData() {
try {
- String sql = "delete from attendance a where 1=1 and a.time< '" + DateUtil.getPreviousMonthLastDay() + "'";
+ String sql = "delete from attendance where 1=1 and time< '" + DateUtil.getPreviousMonthLastDay() + "'";
MainActivity.getInstance().db.execSQL(sql);
} catch (Exception e) {
e.printStackTrace();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index 45ee940..588f975 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -257,7 +257,7 @@
list.add(cqi);
}
for (CheckInQueryItem item : list) {
- String sql1 = "delete from register a where 1=1 and a.register_id = '" + item.getRegisterId() + "'";
+ String sql1 = "delete from register where 1=1 and register_id = '" + item.getRegisterId() + "'";
MainActivity.getInstance().db.execSQL(sql1);
}
} catch (Exception e) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index 15351cd..e207a66 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -9,6 +9,7 @@
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.fragment.DeviceFragment;
import cn.com.basic.face.service.sqlite.DeviceDao;
+import cn.com.basic.face.service.sync.DeleteLastMonthRecordAndPictureThread;
import cn.com.basic.face.service.sync.SyncDownThread;
import cn.com.basic.face.util.AppApi;
@@ -28,6 +29,7 @@
private SyncUpThread syncUpThread = null;
private SyncDownThread syncDownThread = null;
+ private DeleteLastMonthRecordAndPictureThread deleteLastMonthRecordAndPictureThread = null;
public static String authorationId = "101";
@@ -157,6 +159,10 @@
syncDownThread = new SyncDownThread();
syncDownThread.start();
}
+ if (deleteLastMonthRecordAndPictureThread == null) {
+ deleteLastMonthRecordAndPictureThread = new DeleteLastMonthRecordAndPictureThread();
+ deleteLastMonthRecordAndPictureThread.start();
+ }
}
} else {
Toast.makeText(BaseApplication.getInstance(), "鏁版嵁搴撲腑鎵句笉鍒拌璁惧", Toast.LENGTH_SHORT).show();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
index 7817d88..2de0adc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/VisitMng.java
@@ -87,7 +87,7 @@
public void removeLastMonthData() {
try {
- String sql = "delete from visit a where 1=1 and a.enter_time< '" + DateUtil.getPreviousMonthLastDay() + "'";
+ String sql = "delete from visit where 1=1 and enter_time< '" + DateUtil.getPreviousMonthLastDay() + "'";
MainActivity.getInstance().db.execSQL(sql);
} catch (Exception e) {
e.printStackTrace();
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
index d68d7ac..92aa481 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java
@@ -36,8 +36,12 @@
String headPicture = "";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String createTime = sdf.format(new Date());
+ String surveillanceId = UUID.randomUUID().toString();
+ String deviceId = BaseApplication.getInstance().getAndroidDevice().getDeviceId();
MainActivity.getInstance().db.execSQL(
- "insert into offline_surveillance(raw_data_path, camera_in_or_out, create_time) values('" +
+ "insert into offline_surveillance(surveillance_id,device_id,raw_data_path, camera_in_or_out, create_time) values('" +
+ surveillanceId + "','" +
+ deviceId + "','" +
rawDataFileName + "','" +
cameraInOrOut + "','" +
createTime + "'" +")"
--
Gitblit v1.8.0