From 252c803d51fa07a55adc46efa9467741801e66c4 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 04 八月 2017 15:16:55 +0800
Subject: [PATCH] bug fix
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 7 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 7dba226..704e120 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,15 +1,14 @@
package cn.com.basic.face.service.sqlite;
+import android.content.ContentValues;
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;
+import cn.com.basic.face.discern.query.item.DeviceQueryItem;
/**
* 璁惧Dao
@@ -84,9 +83,9 @@
* @param belongId 鎵�灞炶澶嘔d锛堜富璁惧锛�
* @return
*/
- public List<Device> loadCamera(String type, String belongId) {
+ public List<DeviceQueryItem> loadCamera(String type, String belongId) {
- List<Device> list = new ArrayList<Device>();
+ List<DeviceQueryItem> list = new ArrayList<DeviceQueryItem>();
try {
@@ -106,11 +105,11 @@
sb.append(" AND a.belong_id = ").append(belongId) ;
}
- Device aqi = null;
+ DeviceQueryItem aqi = null;
Cursor c = MainActivity.getInstance().db.rawQuery(sb.toString(), new String[]{});
while (c.moveToNext()) {
- aqi = new Device();
+ aqi = new DeviceQueryItem();
aqi.setDeviceId(c.getString(c.getColumnIndex("device_id")));
aqi.setCompanyId(c.getString((c.getColumnIndex("company_id"))));
aqi.setDeviceName(c.getString((c.getColumnIndex("device_name"))));
@@ -137,4 +136,82 @@
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);
+ }
+
+ public void updateCamera(Device camera) {
+ String strFilter = "device_id=" + camera.getDeviceId();
+ ContentValues args = new ContentValues();
+ args.put("brand", camera.getBrand());
+ args.put("brand_id", camera.getBrandId());
+ args.put("ip", camera.getIp());
+ args.put("port", camera.getPort());
+ args.put("resolution", camera.getResolution());
+ args.put("resolutionId", camera.getResolutionId());
+ args.put("username", camera.getUsername());
+ args.put("password", camera.getPassword());
+ MainActivity.getInstance().db.update("device", args, strFilter, null);
+ }
+
+ public void updateAndroidDevice(Device androidDevice) {
+ String strFilter = "device_id=" + androidDevice.getDeviceId();
+ ContentValues args = new ContentValues();
+ args.put("school_name", androidDevice.getSchoolName());
+ args.put("sn", androidDevice.getSn());
+ args.put("install_address", androidDevice.getInstallAddress());
+ MainActivity.getInstance().db.update("device", args, strFilter, null);
+ }
+
}
--
Gitblit v1.8.0