From b55e4a856a84dfeada680b099eeb0f2850c0488e Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 18:26:19 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PostDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/CompanyDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java | 17 +++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PhoneCallDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DeviceDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDetailDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DepartmentDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/RegisterDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/AttendanceDownSync.java | 3 +--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DictionaryDownSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/EmployeeDownSync.java | 2 +-
12 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/AttendanceDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/AttendanceDownSync.java
index 323278a..73b8180 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/AttendanceDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/AttendanceDownSync.java
@@ -5,8 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
-import cn.com.basic.face.service.sync.up.BaseSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class AttendanceDownSync extends BaseDownSync {
@@ -21,6 +19,7 @@
RequestParams params = DataDownSyn.getParams("attendance");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java
index 5340a16..819f026 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/BaseDownSync.java
@@ -1,6 +1,12 @@
package cn.com.basic.face.service.sync.down;
+import java.text.SimpleDateFormat;
+
+import cn.com.basic.face.discern.common.ResultBean;
+import cn.com.basic.face.service.sqlite.SynchronRecordDao;
import cn.com.basic.face.service.sync.up.BaseSync;
+
+import static cn.com.basic.face.discern.entity.VisitTableSynchronRecord.FieldNames.tableName;
public abstract class BaseDownSync extends BaseSync {
public void sync() {
@@ -20,4 +26,15 @@
}
}
+ public void handleSynDate(ResultBean rb){
+ Long time=(Long)rb.getData();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String synTime = format.format(time);
+ if(SynchronRecordDao.getInstance().getSynRecord(tableName)==null){
+ SynchronRecordDao.getInstance().insertSynRecord(tableName,synTime);
+ }else{
+ SynchronRecordDao.getInstance().updateSynRecord(tableName,synTime);
+ }
+ }
+
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/CompanyDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/CompanyDownSync.java
index cb480ba..e2e69f4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/CompanyDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/CompanyDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class CompanyDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("company");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DepartmentDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DepartmentDownSync.java
index 357a3bb..7625961 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DepartmentDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DepartmentDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class DepartmentDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("department");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DeviceDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DeviceDownSync.java
index 4c46c09..fffd46f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DeviceDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DeviceDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class DeviceDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("device");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DictionaryDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DictionaryDownSync.java
index 4e4b870..9ac7dfa 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DictionaryDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/DictionaryDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class DictionaryDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("dictionary");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/EmployeeDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/EmployeeDownSync.java
index 816eec7..c82cec1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/EmployeeDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/EmployeeDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class EmployeeDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("employee");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PhoneCallDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PhoneCallDownSync.java
index fbceb28..48b6e09 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PhoneCallDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PhoneCallDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class PhoneCallDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("phone_call");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PostDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PostDownSync.java
index a0add28..3731a72 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PostDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/PostDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class PostDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("post");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/RegisterDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/RegisterDownSync.java
index 364c11f..a56cda1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/RegisterDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/RegisterDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class RegisterDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("register");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDetailDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDetailDownSync.java
index 5c24bef..d905614 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDetailDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDetailDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class VisitDetailDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("visit_detail");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDownSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDownSync.java
index cc940e8..994de84 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDownSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/down/VisitDownSync.java
@@ -5,7 +5,6 @@
import cn.com.basic.face.discern.common.BaseCommonCallBack;
import cn.com.basic.face.discern.common.SqliteSqlBean;
-import cn.com.basic.face.service.sync.up.AttenderRegisterUpSync;
import cn.com.basic.face.util.SqliteSqlUtil;
public class VisitDownSync extends BaseDownSync {
@@ -21,6 +20,7 @@
RequestParams params = DataDownSyn.getParams("visit");
x.http().post(params, new BaseCommonCallBack() {
public void success() {
+ handleSynDate(resultBean);
SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
syncNext();
}
--
Gitblit v1.8.0