sujinwen

2017-07-21 9f86ecd1435f386b778538df5eb0d769c3171db0

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

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java

@@ -45,6 +45,11 @@
         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

         private static final String  deviceCompanyId="device_company_id";



    }



    // 签到事件主键

@@ -65,6 +70,16 @@
    //是否同步

    private String isSynchron;



    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    public String getUpdateTime() {

        return updateTime;


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java

@@ -32,6 +32,11 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";

    }



    // 公司主键

@@ -45,6 +50,17 @@
    //是否同步

    private String isSynchron;



    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }





    public String getUpdateTime() {

        return updateTime;


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java

@@ -28,6 +28,11 @@
        public static final String deptNameEn = "deptNameEn";



        /**

         * 所在公司id

         */

        private static final String companyId="companyId";



        /**

         * 同步时间

         */

        public static final String updateTime="update_time";

@@ -36,6 +41,11 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";

    }



    // 部门主键

@@ -45,12 +55,32 @@
    // 部门首字母

    private String deptNameEn;



    private String companyId;



    //同步时间

    private String updateTime;



    //是否同步

    private String isSynchron;



    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    public String getCompanyId() {

        return companyId;

    }



    public void setCompanyId(String companyId) {

        this.companyId = companyId;

    }



    public String getUpdateTime() {

        return updateTime;


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java

@@ -75,7 +75,60 @@
         */

        public static final String belongId = "belongId";



        public  static final String  installAdress= "installAdress";

        /**

         * 负责人

         */

        public static final String principal="principal";



        /**

         * 安装时间

         */

        public static final String installTime="installTime";



        /**

         * 安装公司

         */

        public static final String installCompany="installCompany";



        /**

         * 生产厂家

         */

        public static final String manufacturer="manufacturer";



        /**

         * 生产日期

         */

        public static final String productionDate="productionDate";



        /**

         * 备注

         */

        public static final String remark="remark";



        /**

         * 报废日期

         */

        public static final String scrappedDate="scrappedDate";



        /**

         *设备id

         */

        public static final String snId="snId";



        /**

         * 同步时间

         */

        public static final String updateTime="update_time";



        /**

         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";

    }



    // 设备主键

@@ -108,10 +161,147 @@
    private String sn;

    // 所属设备id

    private String belongId;

    //安装地址

    private String installAdress;



    public  String getInstallAdress(){return installAdress;}

    /**

     * 负责人

     */

    private  String principal;



    /**

     * 安装时间

     */

    private  String installTime;



    /**

     * 安装公司

     */

    private   String installCompany;



    /**

     * 生产厂家

     */

    private  String manufacturer;



    /**

     * 生产日期

     */

    private String productionDate;



    /**

     * 备注

     */

    private String remark;



    /**

     * 报废日期

     */

    private   String scrappedDate;



    /**

     * 设备id



     */

    private String snId;



    //同步时间

    private String updateTime;



    //是否同步

    private String isSynchron;



    //设备所在机构id

    private String deviceCompanyId;



    public void setPrincipal(String principal) {

        this.principal = principal;

    }



    public void setInstallTime(String installTime) {

        this.installTime = installTime;

    }



    public void setInstallCompany(String installCompany) {

        this.installCompany = installCompany;

    }



    public void setManufacturer(String manufacturer) {

        this.manufacturer = manufacturer;

    }



    public void setProductionDate(String productionDate) {

        this.productionDate = productionDate;

    }



    public void setRemark(String remark) {

        this.remark = remark;

    }



    public void setScrappedDate(String scrappedDate) {

        this.scrappedDate = scrappedDate;

    }



    public void setSnId(String snId) {

        this.snId = snId;

    }



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }





    public String getUpdateTime() {

        return updateTime;

    }



    public void setUpdateTime(String updateTime) {

        this.updateTime = updateTime;

    }



    public String getIsSynchron() {

        return isSynchron;

    }



    public void setIsSynchron(String isSynchron) {

        this.isSynchron = isSynchron;

    }





    public String getPrincipal() {

        return principal;

    }



    public String getInstallTime() {

        return installTime;

    }



    public String getInstallCompany() {

        return installCompany;

    }



    public String getManufacturer() {

        return manufacturer;

    }



    public String getProductionDate() {

        return productionDate;

    }



    public String getRemark() {

        return remark;

    }



    public String getScrappedDate() {

        return scrappedDate;

    }



    public String getSnId() {

        return snId;

    }



    /**

     * Get 设备主键

     */

@@ -324,7 +514,6 @@
        this.belongId = belongId;

    }



    public void setInstallAdress(String installAdress){this.installAdress=installAdress;}

    public String toString() {

        return 

             ",设备主键 =" + deviceId   +  ",设备所属公司 ="+ companyId  +  ",设备名称 =" + deviceName + 


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java

@@ -56,6 +56,11 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";

    }



    // 主键

@@ -82,6 +87,16 @@
    //是否同步

    private String isSynchron;



    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    public String getUpdateTime() {

        return updateTime;


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java

@@ -44,6 +44,11 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";

    }



    // 签到事件主键

@@ -65,6 +70,17 @@
    private String isSynchron;





    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    public String getUpdateTime() {

        return updateTime;

    }


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java

@@ -32,6 +32,11 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";

    }



    // 职位主键

@@ -46,6 +51,17 @@
    private String isSynchron;





    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    public String getUpdateTime() {

        return updateTime;

    }


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java

@@ -100,6 +100,24 @@
        public static final String surveillancePhotoId = "surveillancePhotoId";



        public static final String visitorTypeId = "visitorTypeId";

        /**

         * 身份认证 ，0--未认证，1--已认证

         */

        public static final String authentication="authentication";



        public static final String idCardHeadPhoto="idCardHeadPhoto";

        /**

         * 考勤人员类型

         */

        public static final String attenderTypeId="attenderTypeId";



        /**

         * 卡号

         */

        public static final String card_number="cardNumber";







        public static final String department = "department";

        public static final String post = "post";



@@ -112,6 +130,11 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";



    }



@@ -159,16 +182,40 @@
    private String surveillancePhotoId;

    // 访客类型

    private String visitorTypeId;

    private String authentication;

    private String idCardHeadPhoto;

    private String department;

    private String post;

    /**

     * 身份认证 ，0--未认证，1--已认证

     */

    public  String authentication ;



    public  String idCardHeadPhoto;

    /**

     * 考勤人员类型

     */

    public  String attenderTypeId;



    /**

     * 卡号

     */

    public  String card_number;



    //同步时间

    private String updateTime;



    //是否同步

    private String isSynchron;



    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }





    public String getUpdateTime() {

@@ -187,6 +234,22 @@
        this.isSynchron = isSynchron;

    }



    public String getAttenderTypeId() {

        return attenderTypeId;

    }



    public void setAttenderTypeId(String attenderTypeId) {

        this.attenderTypeId = attenderTypeId;

    }



    public String getCard_number() {

        return card_number;

    }



    public void setCard_number(String card_number) {

        this.card_number = card_number;

    }



    /**

     * Get 人员主键

     */


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/RegisterDetail.java

@@ -40,6 +40,11 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";

    }



    // 员工图片主键

@@ -57,6 +62,17 @@
    //是否同步

    private String isSynchron;



    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }





    public String getUpdateTime() {

        return updateTime;


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java

@@ -76,6 +76,11 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";

    }



    // 访问事件主键

@@ -112,6 +117,17 @@
    private String isSynchron;





    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }



    public String getUpdateTime() {

        return updateTime;

    }


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java

@@ -44,6 +44,12 @@
         * 是否同步

         */

        public static final String  isSynchron="is_synchron";



        /**

         * 设备所在机构id

         */

        private static final String  deviceCompanyId="device_company_id";



    }



    // 访问事件流水id

@@ -63,6 +69,17 @@
    //是否同步

    private String isSynchron;



    //设备所在机构id

    private String deviceCompanyId;



    public String getDeviceCompanyId() {

        return deviceCompanyId;

    }



    public void setDeviceCompanyId(String deviceCompanyId) {

        this.deviceCompanyId = deviceCompanyId;

    }





    public String getUpdateTime() {

        return updateTime;