From d00ea6bb3daa0ee1be1c7f8dbe57cc7a16342474 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 12:00:12 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java |   73 ++++++++++++++++++++++++++----------
 1 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java
index 13ef440..7349cb9 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java
@@ -1,15 +1,10 @@
 package cn.com.basic.face.service.sqlite;
 
 import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
-import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.base.Config;
 import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.entity.Dictionary;
@@ -23,15 +18,15 @@
     public static DictionaryDao getInstance() {
         return instance;
     }
-    private  static StringBuffer sb = new StringBuffer("select dict_id, name from dictionary ");
-
-
 
     private  static  List<Dictionary>load(String type){
         List<Dictionary> list = new ArrayList<Dictionary>();
+        StringBuffer sb = new StringBuffer("select dict_id, name from dictionary ");
         try {
             sb.append("where 1 = 1 and type = ");
+            sb.append("'");
             sb.append(type);
+            sb.append("'");
             Dictionary aqi = null;
             Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
             while (c.moveToNext()) {
@@ -113,17 +108,13 @@
         return   load(CommonVariables.DictionaryType.VISITOR_TYPE);
     }
 
-
-
-        /**
-         * 鍔犺浇鑰冨嫟绫诲瀷
-         * @return
-         */
-        public List<Dictionary> loadAttenderTypeList() {
-            return load(CommonVariables.DictionaryType.ATTENDER_TYPE);
-        }
-
-
+    /**
+     * 鍔犺浇鑰冨嫟绫诲瀷
+     * @return
+     */
+    public List<Dictionary> loadAttenderTypeList() {
+        return load(CommonVariables.DictionaryType.ATTENDER_TYPE);
+    }
 
     public List<Dictionary> addDictionary(String type, String name) {
         List<Dictionary> list = new ArrayList<Dictionary>();
@@ -131,12 +122,14 @@
             StringBuilder sb = new StringBuilder(40);
 
             sb.append("insert into dictionary ( dict_id, name) values (")
+                    .append("'")
                     .append(type)
+                    .append("'")
                     .append(" , ")
                     .append(")");
             MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
             Dictionary aqi = null;
-            Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
+            Cursor c = MainActivity.getInstance().db.rawQuery("select dict_id,name from dictionary", new String[]{});
             while (c.moveToNext()) {
                 aqi = new Dictionary();
                 aqi.setDictId(c.getString(c.getColumnIndex("dict_id")));
@@ -149,4 +142,42 @@
         return  list;
     }
 
-}
+    //鍔犺浇闇�瑕佸悓姝ョ殑鏁版嵁
+ public List<Dictionary>  getDictionayList(String deviceCompanyId){
+     String sql="select * from dictionary WHERE is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId);
+     Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});
+     List<Dictionary> result=new ArrayList<Dictionary>();
+     Dictionary dic=null;
+     if(c.moveToFirst()){
+         dic=new Dictionary();
+         dic.setSn(c.getString(c.getColumnIndex("sn")));
+         dic.setType(c.getString(c.getColumnIndex("type")));
+         dic.setCompnayId(c.getString(c.getColumnIndex("compnay_id")));
+         dic.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id")));
+         dic.setDictId(c.getString(c.getColumnIndex("dict_id")));
+         dic.setIsSynchron(c.getString(c.getColumnIndex("is_synchron")));
+         dic.setUpdateTime(c.getString(c.getColumnIndex("update_time")));
+         dic.setName(c.getString(c.getColumnIndex("name")));
+         dic.setOrderBy(c.getString(c.getColumnIndex("order_by")));
+         dic.setPid(c.getString(c.getColumnIndex("pid")));
+         dic.setRemark(c.getString(c.getColumnIndex("remark")));
+         result.add(dic);
+     }
+      return result;
+ }
+
+ //鍒犻櫎宸茬粡涓婁紶鍒版湇鍔″櫒鐨勬暟鎹�
+ public  void delDictionary(String deviceCompanyId){
+     String sql="delete from dictionary where is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId);
+     MainActivity.getInstance().db.execSQL(sql);
+
+ }
+    //鑾峰彇鏈悓姝ユ暟鎹�绘暟
+    public int  getSynDataCount(){
+        String sql="select count(*) from dictionary where is_synchron='N' ";
+        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});
+        return c.getCount();
+    }
+
+ }
+

--
Gitblit v1.8.0