Failed commit: Default

sujinwen

2017-07-26 9a09d6bbed781afdc171297ea368cfd1ac25952f

Failed commit: Default

git-svn-id: http://192.168.1.226/svn/proxy@922 454eff88-639b-444f-9e54-f578c98de674

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/RegisterDao.java

@@ -4,21 +4,13 @@
import android.database.Cursor;

import android.database.sqlite.SQLiteDatabase;



import org.xutils.http.RequestParams;



import java.io.File;

import java.util.ArrayList;

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.Register;

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.OfflineVisitorRegisterItem;

import cn.com.basic.face.discern.query.item.UnknownQueryItem;

import cn.com.basic.face.util.FileUtil;



public class RegisterDao {



@@ -313,4 +305,70 @@
            e.printStackTrace();

        }

    }



    /**

     * 加载注册人员信息集合

     * @param deviceCompanyId

     * @return

     */

    public List<Register>  getRegisterList(String deviceCompanyId){

        List<Register> list=new ArrayList<Register>();

        Register result=null;

        String sql="select * from register where is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId);

        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});

        if(c.moveToFirst()){

            result=new Register();

            result.setCreateTime(c.getString(c.getColumnIndex("create_time")));

            result.setIsValid(c.getString(c.getColumnIndex("is_valid")));

            result.setRegisterId(c.getString(c.getColumnIndex("register_id")));

            result.setUsername(c.getString(c.getColumnIndex("username")));

            result.setNameEn(c.getString(c.getColumnIndex("name_en")));

            result.setGenderId(c.getString(c.getColumnIndex("gender_id")));

            result.setCountryId(c.getString(c.getColumnIndex("country_id")));

            result.setProvince(c.getString(c.getColumnIndex("province")));

            result.setCity(c.getString(c.getColumnIndex("city")));

            result.setBirthday(c.getString(c.getColumnIndex("birthday")));

            result.setTel(c.getString(c.getColumnIndex("tel")));

            result.setMobilePhone(c.getString(c.getColumnIndex("mobile_phone")));

            result.setIdentityTypeId(c.getString(c.getColumnIndex("identity_type_id")));

            result.setIdentifyNum(c.getString(c.getColumnIndex("identify_num")));

            result.setCompanyId(c.getString(c.getColumnIndex("company_id")));

            result.setDepartmentId(c.getString(c.getColumnIndex("department_id")));

            result.setPostId(c.getString(c.getColumnIndex("post_id")));

            result.setRemark(c.getString(c.getColumnIndex("remark")));

            result.setWarning(c.getString(c.getColumnIndex("warning")));

            result.setIdCardPhoto(c.getString(c.getColumnIndex("id_card_photo")));

            result.setUploadCustomPhoto(c.getString(c.getColumnIndex("upload_custom_photo")));

            result.setSurveillancePhoto(c.getString(c.getColumnIndex("surveillance_photo")));

            result.setSurveillancePhotoId(c.getString(c.getColumnIndex("surveillance_photo_id")));

            result.setVisitorTypeId(c.getString(c.getColumnIndex("visitor_type_id")));

            result.setAuthentication(c.getString(c.getColumnIndex("authentication")));

            result.setIdCardHeadPhoto(c.getString(c.getColumnIndex("id_card_head_photo")));

            result.setAttenderTypeId(c.getString(c.getColumnIndex("attender_type_id")));

            result.setCardNumber(c.getString(c.getColumnIndex("card_number")));

            result.setUpdateTime(c.getString(c.getColumnIndex("update_time")));

            result.setIsSynchron(c.getString(c.getColumnIndex("is_synchron")));

            result.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id")));

            result.setRawSurveillancePhotoPath(c.getString(c.getColumnIndex("raw_surveillance_photo_path")));

            result.setRawSurveillancePhotoWidth(c.getString(c.getColumnIndex("raw_surveillance_photo_width")));

            result.setRawSurveillancePhotoHeight(c.getString(c.getColumnIndex("raw_surveillance_photo_height")));

            list.add(result);

        }

        return list;

    }



    //删除已上传给你服务器的数据

    public void delRegiterList(){

        String sql="delete from register where is_synchron='N'";

        MainActivity.getInstance().db.execSQL(sql);

    }



    //获取未同步数据总数

    public int  getSynDataCount(){

        String sql="select count(*) from register where is_synchron='N' ";

        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});

        c.moveToFirst();

        return c.getInt(0);

    }



}


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/SurveillanceDao.java

@@ -2,22 +2,19 @@


import android.database.Cursor;

import android.database.sqlite.SQLiteDatabase;

import android.graphics.Bitmap;



import java.io.File;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

import java.util.UUID;



import cn.com.basic.face.base.Config;

import cn.com.basic.face.base.MainActivity;

import cn.com.basic.face.discern.query.item.SurveillancePhotoQueryItem;

import cn.com.basic.face.discern.entity.OfflineSurveillance;

import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;

import cn.com.basic.face.discern.query.item.UnknownQueryItem;

import cn.com.basic.face.util.FileUtil;

import cn.com.basic.face.util.SurveillanceQueryItemUtil;

import cn.com.basic.face.util.UnknownSurveillanceQueryItemUtil;



public class SurveillanceDao {



@@ -92,4 +89,38 @@
        return hasMore;

    }



    /**

     * 加载OfflineSurllance表

     * @return

     */

    public List<OfflineSurveillance>  getSurveillanceList(){

            String sql="select * from offline_surveillance";

        List<OfflineSurveillance> list=new ArrayList<OfflineSurveillance>();

        OfflineSurveillance result=null;

        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});

        if(c.moveToFirst()){

            result=new OfflineSurveillance();

            result.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id")));

            result.setCamera_in_or_out(c.getString(c.getColumnIndex("camera_in_or_out")));

            result.setCreate_time(c.getString(c.getColumnIndex("create_time")));

            result.setRawDataPath(c.getString(c.getColumnIndex("raw_data_path")));

            result.setSurveillanceId(c.getString(c.getColumnIndex("surveillance_id")));

            list.add(result);

        }

        return  list;

    }



    //删除已上传给服务器的数据

    public void delSurllanceList(){

        String sql="delete from offline_surveillance";

        MainActivity.getInstance().db.execSQL(sql);

    }



    //获取未同步数据总数

    public int  getSynDataCount(){

        String sql="select count(*) from offline_surveillance";

        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});

        c.moveToFirst();

        return c.getInt(0);

    }

}


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/VisitDao.java

@@ -9,7 +9,7 @@
import cn.com.basic.face.base.MainActivity;

import cn.com.basic.face.discern.common.CommonVariables;

import cn.com.basic.face.discern.common.ResultBean;

import cn.com.basic.face.discern.query.item.AttendanceQueryItem;

import cn.com.basic.face.discern.entity.Visit;

import cn.com.basic.face.discern.query.item.VisitQueryItem;



public class VisitDao extends BaseDao{

@@ -102,4 +102,48 @@
        return resultBean;

    }



    public List<Visit>  getVisitList(String deviceCompanyId) {

        List<Visit> list=new ArrayList<Visit>();

        Visit visit=null;

        String sql="select * from visit where is_synchron='N' and device_company_id="+Integer.parseInt(deviceCompanyId);

        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});

        if(c.moveToFirst()){

            visit=new Visit();

            visit.setVisitId(c.getString(c.getColumnIndex("visit_id")));

            visit.setVisitReasonId(c.getString(c.getColumnIndex("visit_reason_id")));

            visit.setRemark(c.getString(c.getColumnIndex("remark")));

            visit.setEnterTime(c.getString(c.getColumnIndex("enter_time")));

            visit.setExitTime(c.getString(c.getColumnIndex("exit_time")));

            visit.setVisitorTypeId(c.getString(c.getColumnIndex("visitor_type_id")));

            visit.setVisitorId(c.getString(c.getColumnIndex("visitor_id")));

            visit.setVisitorCompanyId(c.getString(c.getColumnIndex("visitor_company_id")));

            visit.setVisiteeId(c.getString(c.getColumnIndex("visitee_id")));

            visit.setVisiteeCompanyId(c.getString(c.getColumnIndex("visitee_company_id")));

            visit.setCurrentStateId(c.getString(c.getColumnIndex("current_state_id")));

            visit.setWarning(c.getString(c.getColumnIndex("warning")));

            visit.setUpdateTime(c.getString(c.getColumnIndex("update_time")));

            visit.setIsSynchron(c.getString(c.getColumnIndex("is_synchron")));

            visit.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id")));

            visit.setIsValid(c.getString(c.getColumnIndex("is_valid")));

            visit.setCreateTime(c.getString(c.getColumnIndex("create_time")));

            visit.setVisitReason(c.getString(c.getColumnIndex("visit_reason")));

            list.add(visit);

        }

          return  list;

    }



    //删除已上传给你服务器的数据

    public void delVisitList(){

        String sql="delete from visit where is_synchron='N'";

        MainActivity.getInstance().db.execSQL(sql);



    }



    //获取未同步数据总数

    public int  getSynDataCount(){

        String sql="select count(*) from visit where is_synchron='N' ";

        Cursor c =MainActivity.getInstance().db.rawQuery(sql,new String[]{});

        c.moveToFirst();

        return c.getInt(0);

    }

}