From d56dfe791f22ddcccd7de6fb2c4be1255a80f9c5 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 七月 2017 20:39:23 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java |   86 +++++++++++++++++++++++++++++++++----------
 1 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
index db2ab4f..73f456a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
@@ -1,14 +1,12 @@
 package cn.com.basic.face.service.sqlite;
 
 import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.com.basic.face.base.Config;
+import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.entity.Device;
-import cn.com.basic.face.discern.entity.Dictionary;
 
 /**
  * 璁惧Dao
@@ -29,8 +27,7 @@
     public List<Device> loadMainDevice(String type, String sn) {
 
         List<Device> list = new ArrayList<Device>();
-        SQLiteDatabase db = Config.sqlMap.getDb();
-        db.beginTransaction();
+
         try {
             StringBuilder sb = new StringBuilder(40);
                     sb.append("select a.device_id, ").append("a.company_id, ").
@@ -50,14 +47,15 @@
 
 
             Device aqi = null;
-            Cursor c = db.rawQuery(sb.toString(), new String[]{});
+
+            Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
             while (c.moveToNext()) {
                 aqi = new Device();
                 aqi.setDeviceId(c.getString(c.getColumnIndex("device_id")));
                 aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
                 aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));
                 aqi.setType(c.getString(c.getColumnIndex("type")));
-                aqi.setInstallAdress(c.getString((c.getColumnIndex("install_address"))));
+                aqi.setInstallAddress(c.getString((c.getColumnIndex("install_address"))));
                 aqi.setSchoolName(c.getString((c.getColumnIndex("school_name"))));
                 aqi.setBrandId(c.getString(c.getColumnIndex("brand_id")));
                 aqi.setIp(c.getString(c.getColumnIndex("ip")));
@@ -71,12 +69,8 @@
 
                 list.add(aqi);
             }
-            c.close();
-            db.setTransactionSuccessful();
         }catch (Exception e) {
             e.printStackTrace();
-        }finally {
-            db.endTransaction();
         }
         return list;
     }
@@ -90,8 +84,8 @@
     public List<Device> loadCamera(String type, String belongId) {
 
         List<Device> list = new ArrayList<Device>();
-        SQLiteDatabase db = Config.sqlMap.getDb();
-        db.beginTransaction();
+
+
         try {
             StringBuilder sb = new StringBuilder(40);
 
@@ -109,17 +103,16 @@
                 sb.append(" AND a.belong_id = ").append(belongId) ;
             }
 
-
-
             Device aqi = null;
-            Cursor c = db.rawQuery(sb.toString(), new String[]{});
+
+            Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
             while (c.moveToNext()) {
                 aqi = new Device();
                 aqi.setDeviceId(c.getString(c.getColumnIndex("device_id")));
                 aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
                 aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));
                 aqi.setType(c.getString(c.getColumnIndex("type")));
-                aqi.setInstallAdress(c.getString((c.getColumnIndex("install_address"))));
+                aqi.setInstallAddress(c.getString((c.getColumnIndex("install_address"))));
                 aqi.setSchoolName(c.getString((c.getColumnIndex("school_name"))));
                 aqi.setBrandId(c.getString(c.getColumnIndex("brand_id")));
                 aqi.setIp(c.getString(c.getColumnIndex("ip")));
@@ -134,13 +127,66 @@
                 list.add(aqi);
             }
             c.close();
-            db.setTransactionSuccessful();
+
         }catch (Exception e) {
             e.printStackTrace();
-        }finally {
-            db.endTransaction();
         }
         return list;
     }
 
+    public List<Device>  getDeviceList(String deviceCompanyId){
+        String sql="select * from device WHERE is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId);
+        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});
+        List<Device> result=new ArrayList<Device>();
+        Device device=null;
+        if(c.moveToFirst()){
+            device=new Device();
+            device.setUpdateTime(c.getString(c.getColumnIndex("update_time")));
+            device.setIsSynchron(c.getString(c.getColumnIndex("is_synchron")));
+            device.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id")));
+            device.setBelongId(c.getString(c.getColumnIndex("belong_id")));
+            device.setBrandId(c.getString(c.getColumnIndex("brand_id")));
+            device.setCompanyId(c.getString(c.getColumnIndex("company_id")));
+            device.setDeviceName(c.getString(c.getColumnIndex("device_name")));
+            device.setDeviceId(c.getString(c.getColumnIndex("device_id")));
+            device.setInstallAddress(c.getString(c.getColumnIndex("install_address")));
+            device.setInstallCompany(c.getString(c.getColumnIndex("install_company")));
+            device.setInstallTime(c.getString(c.getColumnIndex("install_time")));
+            device.setIp(c.getString(c.getColumnIndex("ip")));
+            device.setManufacturer(c.getString(c.getColumnIndex("manufacturer")));
+            device.setPassword(c.getString(c.getColumnIndex("password")));
+            device.setPort(c.getString(c.getColumnIndex("port")));
+            device.setPrincipal(c.getString(c.getColumnIndex("principal")));
+            device.setRemark(c.getString(c.getColumnIndex("remark")));
+            device.setResolutionId(c.getString(c.getColumnIndex("resolution_id")));
+            device.setProductionDate(c.getString(c.getColumnIndex("production_date")));
+            device.setProtocolId(c.getString(c.getColumnIndex("protocol_id")));
+            device.setUsername(c.getString(c.getColumnIndex("username")));
+            device.setSn(c.getString(c.getColumnIndex("sn")));
+            device.setType(c.getString(c.getColumnIndex("type")));
+            device.setSchoolName(c.getString(c.getColumnIndex("school_name")));
+            device.setScrappedDate(c.getString(c.getColumnIndex("scrapped_date")));
+            device.setIsValid(c.getString(c.getColumnIndex("is_valid")));
+            device.setCreateTime(c.getString(c.getColumnIndex("create_time")));
+            result.add(device);
+        }
+        return result;
+    }
+
+
+    //鍒犻櫎宸茬粡涓婁紶鍒版湇鍔″櫒鐨勫悓姝ユ暟鎹�
+    public void delDevice(){
+        String sql="delete from device where is_synchron='N'";
+        MainActivity.getInstance().db.execSQL(sql);
+
+    }
+
+    //鑾峰彇鏈悓姝ユ暟鎹�绘暟
+    public int  getSynDataCount(){
+        String sql="select count(*) from device where is_synchron='N' ";
+        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});
+        c.moveToFirst();
+        return c.getInt(0);
+    }
+
 }

--
Gitblit v1.8.0