From 784f977cc7f9b9aad8cc3528a4f2026c1f686a0a Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 13:44:20 +0800
Subject: [PATCH] JsonCpp和CapnpProtocol功能初步实现
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 159 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 111 insertions(+), 48 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
index 84311c6..7b5c1b0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
@@ -1,5 +1,6 @@
package cn.com.basic.face.service.sqlite;
+import android.content.ContentValues;
import android.database.Cursor;
import android.database.CursorJoiner;
import android.database.sqlite.SQLiteDatabase;
@@ -17,6 +18,7 @@
import cn.com.basic.face.discern.entity.Visit;
import cn.com.basic.face.discern.entity.VisitDetail;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
+import cn.com.basic.face.discern.query.item.OfflineAttenderRegisterItem;
import cn.com.basic.face.discern.query.item.OfflineVisitItem;
@@ -53,7 +55,8 @@
"d.company_id," +
"e.post_name," +
"a.mobile_phone," +
- "a.warning" +
+ "a.warning," +
+ "a.company" +
" FROM" +
" register a" +
" LEFT JOIN company d ON d.company_id = a.company_id" +
@@ -64,9 +67,9 @@
" 1 = 1";
String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
if(isVisitorList) {
- sql += " AND f.device_company_id = " + deviceCompanyId;
- }else{
sql += " AND ( f.device_company_id != " + deviceCompanyId+" OR f.device_company_id IS NULL"+")";
+ }else{
+ sql += " AND ( f.device_company_id = " + deviceCompanyId + " or a.visitor_or_attender='attender')";
}
if(searchText != null && !searchText.trim().isEmpty()) {
@@ -93,6 +96,10 @@
cqi.setCompanyId(c.getString(c.getColumnIndex("company_id")));
cqi.setPostName(c.getString(c.getColumnIndex("post_name")));
cqi.setMobilePhone(c.getString(c.getColumnIndex("mobile_phone")));
+ String company = c.getString(c.getColumnIndex("company"));
+ if (company != null && !"".equals(company)) {
+ cqi.setCompanyName(company);
+ }
cqi.setWarning(c.getString(c.getColumnIndex("warning")));
list.add(cqi);
}
@@ -111,56 +118,13 @@
}
}
- /**
- * 娣诲姞璁垮璁板綍
- */
- public void add(OfflineVisitItem entity) {
- String sql =
- "INSERT INTO visit (\n" +
- " visit_id,\n" +
- " visit_reason_id,\n" +
- " remark,\n" +
- " enter_time,\n" +
- " exit_time,\n" +
- " visitor_type_id,\n" +
- " visitor_id,\n" +
- " visitor_company_id,\n" +
- " visitee_id,\n" +
- " visitee_company_id,\n" +
- " current_state_id,\n" +
- " warning,\n" +
- " update_time,\n" +
- " is_synchron,\n" +
- " device_company_id\n" +
- ")\n" +
- "VALUES\n" +
- " (\n" +
- " '"+entity.getVisitId()+"', "+
- " '"+entity.getVisitReasonId()+"', "+
- " '"+entity.getRemark()+"', "+
- " '"+entity.getEnterTime()+"', "+
- " '"+entity.getExitTime()+"', "+
- " '"+entity.getVisitorTypeId()+"', "+
- " '"+entity.getVisitorId()+"', "+
- " '"+entity.getVisitorCompanyId()+"', "+
- " '"+entity.getVisiteeId()+"', "+
- " '"+entity.getVisiteeCompanyId()+"', "+
- " '"+entity.getCurrentStateId()+"', "+
- " '"+entity.getWarning()+"', "+
- " '"+entity.getUpdateTime()+"', "+
- " '"+entity.getIsSynchron()+"', "+
- " '"+entity.getDeviceCompanyId()+"' "+
- " )";
- MainActivity.getInstance().db.execSQL(sql);
- }
-
public boolean hasOfflineCheckInData() {
- Cursor c = MainActivity.getInstance().db.rawQuery("select count(*) from visit", new String[]{});
+ Cursor c = MainActivity.getInstance().db.rawQuery("select count(*) from visit where 1=1 and is_synchron='N'", new String[]{});
c.moveToFirst();
return c.getInt(0) > 0 ? true : false;
}
- public ResultBean findCheckInLeftVisitorListByVisitorId(long registerId) {
+ public ResultBean findCheckInLeftVisitorListByVisitorId(String registerId) {
SQLiteDatabase db = MainActivity.getInstance().db;
ResultBean resultBean = new ResultBean();
try {
@@ -221,4 +185,103 @@
}
return resultBean;
}
+
+ public List<OfflineVisitItem> readOfflineVisitItemFromLocal() {
+ String sql = "SELECT\n" +
+ " a.visit_id,\n" +
+ " a.visit_reason_id,\n" +
+ " a.remark,\n" +
+ " a.enter_time,\n" +
+ " a.exit_time,\n" +
+ " a.visitor_type_id,\n" +
+ " a.visitor_id,\n" +
+ " a.visitor_company_id,\n" +
+ " a.visitee_id,\n" +
+ " a.visitee_company_id,\n" +
+ " a.current_state_id,\n" +
+ " a.warning,\n" +
+ " a.update_time,\n" +
+ " a.is_synchron,\n" +
+ " a.create_time,\n" +
+ " a.device_company_id\n" +
+ "FROM\n" +
+ " visit a\n" +
+ "WHERE\n" +
+ " 1 = 1\n" +
+ "AND a.is_synchron = 'N'\n" +
+ " limit 1";
+// "AND visitor_id = '"+registerId+"'";
+ List<OfflineVisitItem> items = new ArrayList<>();
+ Cursor c = MainActivity.getInstance().db.rawQuery(sql, new String[]{});
+ while (c.moveToNext()) {
+ OfflineVisitItem item = new OfflineVisitItem();
+ item.setVisitId(c.getString(c.getColumnIndex("visit_id")));
+ item.setVisitReasonId(c.getString(c.getColumnIndex("visit_reason_id")));
+ item.setRemark(c.getString(c.getColumnIndex("remark")));
+ item.setEnterTime(c.getString(c.getColumnIndex("enter_time")));
+ item.setExitTime(c.getString(c.getColumnIndex("exit_time")));
+ item.setVisitorTypeId(c.getString(c.getColumnIndex("visitor_type_id")));
+ item.setVisitorId(c.getString(c.getColumnIndex("visitor_id")));
+ item.setVisitorCompanyId(c.getString(c.getColumnIndex("visitor_company_id")));
+ item.setVisiteeId(c.getString(c.getColumnIndex("visitee_id")));
+ item.setVisiteeCompanyId(c.getString(c.getColumnIndex("visitee_company_id")));
+ item.setCurrentStateId(c.getString(c.getColumnIndex("current_state_id")));
+ item.setWarning(c.getString(c.getColumnIndex("warning")));
+ item.setUpdateTime(c.getString(c.getColumnIndex("update_time")));
+ item.setIsSynchron(c.getString(c.getColumnIndex("is_synchron")));
+ item.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id")));
+ item.setCreateTime(c.getString(c.getColumnIndex("create_time")));
+ items.add(item);
+ }
+ return items;
+ }
+
+ /**
+ * 绂荤嚎瀛樺偍璁垮鐧昏淇℃伅
+ * @param item
+ */
+ public long addOfflineVisit(OfflineVisitItem item) {
+ ContentValues contentValues = new ContentValues();
+ contentValues.put("visit_id",item.getVisitId());
+ contentValues.put("visit_reason_id",item.getVisitReasonId());
+ contentValues.put("visit_reason",item.getVisitReason());
+ contentValues.put("remark",item.getRemark());
+ contentValues.put("enter_time",item.getEnterTime());
+ contentValues.put("exit_time",item.getExitTime());
+ contentValues.put("visitor_type_id",item.getVisitorTypeId());
+ contentValues.put("visitor_id",item.getVisitorId());
+ contentValues.put("visitor_company_id",item.getVisitorCompanyId());
+ contentValues.put("visitee_id",item.getVisiteeId());
+ contentValues.put("visitee_company_id",item.getVisiteeCompanyId());
+ contentValues.put("current_state_id",item.getCurrentStateId());
+ contentValues.put("warning",item.getWarning());
+ contentValues.put("update_time",item.getUpdateTime());
+ contentValues.put("is_synchron",item.getIsSynchron());
+ contentValues.put("device_company_id",item.getDeviceCompanyId());
+ contentValues.put("create_time",item.getCreateTime());
+ contentValues.put("device_id", item.getDeviceId());
+
+ long registerId = MainActivity.getInstance().db.insert("visit", "", contentValues);
+ return registerId;
+ }
+
+
+ public void updateVisitorId(String sqliteVisitorId, String mysqlVisitorId) {
+ if (sqliteVisitorId == null || "".equals(sqliteVisitorId.trim())
+ || mysqlVisitorId == null || "".equals(mysqlVisitorId.trim())
+ ) {
+ return;
+ }
+ MainActivity.getInstance().db.execSQL("update visit set visitor_id='"+mysqlVisitorId+"' where 1=1 and visitor_id='"+sqliteVisitorId+"'");
+ }
+
+ public void updateVisiteeId(String sqliteVisiteeId, String mysqlVisiteeId) {
+ if (sqliteVisiteeId == null || "".equals(sqliteVisiteeId.trim())
+ || mysqlVisiteeId == null || "".equals(mysqlVisiteeId.trim())
+ ) {
+ return;
+ }
+ MainActivity.getInstance().db.execSQL("update visit set visitee_id='"+mysqlVisiteeId+"' where 1=1 and visitee_id='"+sqliteVisiteeId+"'");
+ }
+
}
--
Gitblit v1.8.0