xuxiuxi

2017-04-10 82399d7ee4a1702c3089f0cca0c579f56f50e543

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

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java

@@ -2,6 +2,7 @@

import android.app.Application;

import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.DeviceMng;

@@ -12,7 +13,7 @@

import org.xutils.x;

import cn.com.basic.face.discern.entity.Place;
import cn.com.basic.face.discern.entity.Device;

/**
 * Created by zhangbo on 2017/2/15.
@@ -26,15 +27,15 @@
        return application;
    }

    private Place place;
    private Device place;

    public void setPlace(Place place) {
    public void setPlace(Device place) {
        this.place = place;
    }

    public Place getPlace() {
    public Device getPlace() {
        if (place == null) {
            place = new Place();
            place = new Device();
        }
        return place;
    }

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java

@@ -64,7 +64,7 @@

    protected abstract int getLayoutId();

    protected abstract void initViews(View view, Bundle savedInstanceState);
    protected void initViews(View view, Bundle savedInstanceState) {};

    protected void initToolbar(Bundle savedInstanceState){};


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

New file
@@ -0,0 +1,126 @@
package cn.com.basic.face.discern.entity;



import java.io.Serializable;

import java.util.Date;



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



/**

 * Attendance

 */

public class Attendance extends BaseEntity implements Serializable {



    private static final long serialVersionUID = 1L;



    public static final String MODEL_NAME = "Attendance";



    public static final class FieldNames {

        /**

         * 签到事件主键

         */

        public static final String attendanceId = "attendanceId";

        /**

         * 人员主键

         */

        public static final String registerId = "registerId";

        /**

         * 签到状态

         */

        public static final String attendanceTypeId = "attendanceTypeId";

        /**

         * 签到时间

         */

        public static final String time = "time";

        /**

         * 签到位置

         */

        public static final String deviceId = "deviceId";

    }



    // 签到事件主键

    private String attendanceId;

    // 人员主键

    private String registerId;

    // 签到状态

    private String attendanceTypeId;

    // 签到时间

    private String time;

    // 签到位置

    private String deviceId;



    /**

     * Get 签到事件主键

     */

    public String getAttendanceId() {

        return attendanceId;

    }



    /**

     * Set 签到事件主键

     */

    public void setAttendanceId(String attendanceId) {

        this.attendanceId = attendanceId;

    }



    /**

     * Get 人员主键

     */

    public String getRegisterId() {

        return registerId;

    }



    /**

     * Set 人员主键

     */

    public void setRegisterId(String registerId) {

        this.registerId = registerId;

    }



    /**

     * Get 签到状态

     */

    public String getAttendanceTypeId() {

        return attendanceTypeId;

    }



    /**

     * Set 签到状态

     */

    public void setAttendanceTypeId(String attendanceTypeId) {

        this.attendanceTypeId = attendanceTypeId;

    }



    /**

     * Get 签到时间

     */

    public String getTime() {

        return time;

    }



    /**

     * Set 签到时间

     */

    public void setTime(String time) {

        this.time = time;

    }



    /**

     * Get 签到位置

     */

    public String getDeviceId() {

        return deviceId;

    }



    /**

     * Set 签到位置

     */

    public void setDeviceId(String deviceId) {

        this.deviceId = deviceId;

    }



    public String toString() {

        return 
             ",签到事件主键 ="+ attendanceId +  ",人员主键 =" + registerId +  ",签到状态 =" + attendanceTypeId + 
             ",签到时间 =" + time       +  ",签到位置 =" + deviceId  ;

    }

}


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

File was deleted

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

File was deleted

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

@@ -17,48 +17,48 @@
        /**

         * 公司主键

         */

        public static final String id = "id";

        public static final String companyId = "companyId";

        /**

         * 公司名称

         */

        public static final String name = "name";

        public static final String companyName = "companyName";

    }



    // 公司主键

    private String id;

    private String companyId;

    // 公司名称

    private String name;

    private String companyName;



    /**

     * Get 公司主键

     */

    public String getId() {

        return id;

    public String getCompanyId() {

        return companyId;

    }



    /**

     * Set 公司主键

     */

    public void setId(String id) {

        this.id = id;

    public void setCompanyId(String companyId) {

        this.companyId = companyId;

    }



    /**

     * Get 公司名称

     */

    public String getName() {

        return name;

    public String getCompanyName() {

        return companyName;

    }



    /**

     * Set 公司名称

     */

    public void setName(String name) {

        this.name = name;

    public void setCompanyName(String companyName) {

        this.companyName = companyName;

    }



    public String toString() {

        return 

             ",公司主键 =" + id         +  ",公司名称 =" + name      ;

             ",公司主键 =" + companyId  +  ",公司名称 =" + companyName;

    }

}


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

@@ -17,69 +17,69 @@
        /**

         * 部门主键

         */

        public static final String id = "id";

        public static final String deptId = "deptId";

        /**

         * 部门名称

         */

        public static final String label = "label";

        public static final String deptName = "deptName";

        /**

         * 部门首字母

         */

        public static final String labelSpell = "labelSpell";

        public static final String deptNameEn = "deptNameEn";

    }



    // 部门主键

    private String id;

    private String deptId;

    // 部门名称

    private String label;

    private String deptName;

    // 部门首字母

    private String labelSpell;

    private String deptNameEn;



    /**

     * Get 部门主键

     */

    public String getId() {

        return id;

    public String getDeptId() {

        return deptId;

    }



    /**

     * Set 部门主键

     */

    public void setId(String id) {

        this.id = id;

    public void setDeptId(String deptId) {

        this.deptId = deptId;

    }



    /**

     * Get 部门名称

     */

    public String getLabel() {

        return label;

    public String getDeptName() {

        return deptName;

    }



    /**

     * Set 部门名称

     */

    public void setLabel(String label) {

        this.label = label;

    public void setDeptName(String deptName) {

        this.deptName = deptName;

    }



    /**

     * Get 部门首字母

     */

    public String getLabelSpell() {

        return labelSpell;

    public String getDeptNameEn() {

        return deptNameEn;

    }



    /**

     * Set 部门首字母

     */

    public void setLabelSpell(String labelSpell) {

        this.labelSpell = labelSpell;

    public void setDeptNameEn(String deptNameEn) {

        this.deptNameEn = deptNameEn;

    }



    public String toString() {

        return 

             ",部门主键 =" + id         +  ",部门名称 =" + label      +  ",部门首字母 ="+ labelSpell

             ",部门主键 =" + deptId     +  ",部门名称 =" + deptName   +  ",部门首字母 ="+ deptNameEn

            ;

    }

}


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

File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Place.java
@@ -5,19 +5,19 @@
import cn.com.basic.face.discern.common.BaseEntity;



/**

 * Place

 * Device

 */

public class Place extends BaseEntity implements Serializable {

public class Device extends BaseEntity implements Serializable {



    private static final long serialVersionUID = 1L;



    public static final String MODEL_NAME = "Place";

    public static final String MODEL_NAME = "Device";



    public static final class FieldNames {

        /**

         * 设备主键

         */

        public static final String id = "id";

        public static final String deviceId = "deviceId";

        /**

         * 公司主键

         */

@@ -25,7 +25,7 @@
        /**

         * 设备地点

         */

        public static final String label = "label";

        public static final String deviceName = "deviceName";

        /**

         * 设备授权码

         */

@@ -33,26 +33,26 @@
    }



    // 设备主键

    private String id;

    private String deviceId;

    // 公司主键

    private String companyId;

    // 设备地点

    private String label;

    private String deviceName;

    // 设备授权码

    private String authorizationId;



    /**

     * Get 设备主键

     */

    public String getId() {

        return id;

    public String getDeviceId() {

        return deviceId;

    }



    /**

     * Set 设备主键

     */

    public void setId(String id) {

        this.id = id;

    public void setDeviceId(String deviceId) {

        this.deviceId = deviceId;

    }



    /**

@@ -72,15 +72,15 @@
    /**

     * Get 设备地点

     */

    public String getLabel() {

        return label;

    public String getDeviceName() {

        return deviceName;

    }



    /**

     * Set 设备地点

     */

    public void setLabel(String label) {

        this.label = label;

    public void setDeviceName(String deviceName) {

        this.deviceName = deviceName;

    }



    /**

@@ -99,7 +99,7 @@


    public String toString() {

        return 

             ",设备主键 =" + id         +  ",公司主键 =" + companyId  +  ",设备地点 =" + label      + 
             ",设备主键 =" + deviceId   +  ",公司主键 =" + companyId  +  ",设备地点 =" + deviceName + 
             ",设备授权码 ="+ authorizationId;

    }

}


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

@@ -17,7 +17,7 @@
        /**

         * 主键

         */

        public static final String id = "id";

        public static final String dictId = "dictId";

        /**

         * 编码

         */

@@ -42,10 +42,14 @@
         * 备注

         */

        public static final String remark = "remark";

        /**

         * 公司主键

         */

        public static final String compnayId = "compnayId";

    }



    // 主键

    private String id;

    private String dictId;

    // 编码

    private String sn;

    // 名称

@@ -58,19 +62,21 @@
    private String pid;

    // 备注

    private String remark;

    // 公司主键

    private String compnayId;



    /**

     * Get 主键

     */

    public String getId() {

        return id;

    public String getDictId() {

        return dictId;

    }



    /**

     * Set 主键

     */

    public void setId(String id) {

        this.id = id;

    public void setDictId(String dictId) {

        this.dictId = dictId;

    }



    /**

@@ -157,10 +163,24 @@
        this.remark = remark;

    }



    /**

     * Get 公司主键

     */

    public String getCompnayId() {

        return compnayId;

    }



    /**

     * Set 公司主键

     */

    public void setCompnayId(String compnayId) {

        this.compnayId = compnayId;

    }



    public String toString() {

        return 

             ",主键 ="   + id         +  ",编码 ="   + sn         +  ",名称 ="   + name       + 
             ",主键 ="   + dictId     +  ",编码 ="   + sn         +  ",名称 ="   + name       + 
             ",类型 ="   + type       +  ",排序 ="   + orderBy    +  ",父级id =" + pid        + 

             ",备注 ="   + remark    ;

             ",备注 ="   + remark     +  ",公司主键 =" + compnayId ;

    }

}


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

File was deleted

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

File was deleted

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

File was deleted

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

File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Calling.java
@@ -6,23 +6,23 @@
import cn.com.basic.face.discern.common.BaseEntity;



/**

 * Calling

 * PhoneCall

 */

public class Calling extends BaseEntity implements Serializable {

public class PhoneCall extends BaseEntity implements Serializable {



    private static final long serialVersionUID = 1L;



    public static final String MODEL_NAME = "Calling";

    public static final String MODEL_NAME = "PhoneCall";



    public static final class FieldNames {

        /**

         * 签到事件主键

         */

        public static final String id = "id";

        public static final String phoneCallId = "phoneCallId";

        /**

         * 呼叫时间

         */

        public static final String callDt = "callDt";

        public static final String callDatetime = "callDatetime";

        /**

         * 呼叫人员主键

         */

@@ -34,46 +34,46 @@
        /**

         * 呼叫发生所在设备(地点)

         */

        public static final String placeId = "placeId";

        public static final String deviceId = "deviceId";

    }



    // 签到事件主键

    private String id;

    private String phoneCallId;

    // 呼叫时间

    private String callDt;

    private String callDatetime;

    // 呼叫人员主键

    private String callerPersonId;

    // 被呼叫人员主键

    private String calleePersonId;

    // 呼叫发生所在设备(地点)

    private String placeId;

    private String deviceId;



    /**

     * Get 签到事件主键

     */

    public String getId() {

        return id;

    public String getPhoneCallId() {

        return phoneCallId;

    }



    /**

     * Set 签到事件主键

     */

    public void setId(String id) {

        this.id = id;

    public void setPhoneCallId(String phoneCallId) {

        this.phoneCallId = phoneCallId;

    }



    /**

     * Get 呼叫时间

     */

    public String getCallDt() {

        return callDt;

    public String getCallDatetime() {

        return callDatetime;

    }



    /**

     * Set 呼叫时间

     */

    public void setCallDt(String callDt) {

        this.callDt = callDt;

    public void setCallDatetime(String callDatetime) {

        this.callDatetime = callDatetime;

    }



    /**

@@ -107,20 +107,20 @@
    /**

     * Get 呼叫发生所在设备(地点)

     */

    public String getPlaceId() {

        return placeId;

    public String getDeviceId() {

        return deviceId;

    }



    /**

     * Set 呼叫发生所在设备(地点)

     */

    public void setPlaceId(String placeId) {

        this.placeId = placeId;

    public void setDeviceId(String deviceId) {

        this.deviceId = deviceId;

    }



    public String toString() {

        return 

             ",签到事件主键 ="+ id         +  ",呼叫时间 =" + callDt     +  ",呼叫人员主键 ="+ callerPersonId + 
             ",被呼叫人员主键 ="+ calleePersonId +  ",呼叫发生所在设备(地点) ="+ placeId   ;

             ",签到事件主键 ="+ phoneCallId +  ",呼叫时间 =" + callDatetime +  ",呼叫人员主键 ="+ callerPersonId + 
             ",被呼叫人员主键 ="+ calleePersonId +  ",呼叫发生所在设备(地点) ="+ deviceId  ;

    }

}


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

@@ -17,48 +17,48 @@
        /**

         * 职位主键

         */

        public static final String id = "id";

        public static final String postId = "postId";

        /**

         * 职位名称

         */

        public static final String label = "label";

        public static final String postName = "postName";

    }



    // 职位主键

    private String id;

    private String postId;

    // 职位名称

    private String label;

    private String postName;



    /**

     * Get 职位主键

     */

    public String getId() {

        return id;

    public String getPostId() {

        return postId;

    }



    /**

     * Set 职位主键

     */

    public void setId(String id) {

        this.id = id;

    public void setPostId(String postId) {

        this.postId = postId;

    }



    /**

     * Get 职位名称

     */

    public String getLabel() {

        return label;

    public String getPostName() {

        return postName;

    }



    /**

     * Set 职位名称

     */

    public void setLabel(String label) {

        this.label = label;

    public void setPostName(String postName) {

        this.postName = postName;

    }



    public String toString() {

        return 

             ",职位主键 =" + id         +  ",职位名称 =" + label     ;

             ",职位主键 =" + postId     +  ",职位名称 =" + postName  ;

    }

}


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

File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Person.java
@@ -6,23 +6,23 @@
import cn.com.basic.face.discern.common.BaseEntity;



/**

 * Person

 * Register

 */

public class Person extends BaseEntity implements Serializable {

public class Register extends BaseEntity implements Serializable {



    private static final long serialVersionUID = 1L;



    public static final String MODEL_NAME = "Person";

    public static final String MODEL_NAME = "Register";



    public static final class FieldNames {

        /**

         * 人员主键

         */

        public static final String id = "id";

        public static final String registerId = "registerId";

        /**

         * 人员名字

         */

        public static final String name = "name";

        public static final String username = "username";

        /**

         * 人员名首字母

         */

@@ -30,11 +30,11 @@
        /**

         * 性别

         */

        public static final String gender = "gender";

        public static final String genderId = "genderId";

        /**

         * 国籍

         */

        public static final String country = "country";

        public static final String countryId = "countryId";

        /**

         * 省

         */

@@ -50,7 +50,7 @@
        /**

         * 座机电话

         */

        public static final String phone = "phone";

        public static final String tel = "tel";

        /**

         * 移动电话

         */

@@ -58,11 +58,11 @@
        /**

         * 证件类型

         */

        public static final String identityType = "identityType";

        public static final String identityTypeId = "identityTypeId";

        /**

         * 证件编号

         */

        public static final String identify = "identify";

        public static final String identifyNum = "identifyNum";

        /**

         * 公司主键

         */

@@ -86,15 +86,15 @@
    }



    // 人员主键

    private String id;

    private String registerId;

    // 人员名字

    private String name;

    private String username;

    // 人员名首字母

    private String nameSpell;

    // 性别

    private String gender;

    private String genderId;

    // 国籍

    private String country;

    private String countryId;

    // 省

    private String province;

    // 市

@@ -102,13 +102,13 @@
    // 出生日期

    private String birthday;

    // 座机电话

    private String phone;

    private String tel;

    // 移动电话

    private String mobilePhone;

    // 证件类型

    private String identityType;

    private String identityTypeId;

    // 证件编号

    private String identify;

    private String identifyNum;

    // 公司主键

    private String companyId;

    // 部门主键

@@ -123,29 +123,29 @@
    /**

     * Get 人员主键

     */

    public String getId() {

        return id;

    public String getRegisterId() {

        return registerId;

    }



    /**

     * Set 人员主键

     */

    public void setId(String id) {

        this.id = id;

    public void setRegisterId(String registerId) {

        this.registerId = registerId;

    }



    /**

     * Get 人员名字

     */

    public String getName() {

        return name;

    public String getUsername() {

        return username;

    }



    /**

     * Set 人员名字

     */

    public void setName(String name) {

        this.name = name;

    public void setUsername(String username) {

        this.username = username;

    }



    /**

@@ -165,29 +165,29 @@
    /**

     * Get 性别

     */

    public String getGender() {

        return gender;

    public String getGenderId() {

        return genderId;

    }



    /**

     * Set 性别

     */

    public void setGender(String gender) {

        this.gender = gender;

    public void setGenderId(String genderId) {

        this.genderId = genderId;

    }



    /**

     * Get 国籍

     */

    public String getCountry() {

        return country;

    public String getCountryId() {

        return countryId;

    }



    /**

     * Set 国籍

     */

    public void setCountry(String country) {

        this.country = country;

    public void setCountryId(String countryId) {

        this.countryId = countryId;

    }



    /**

@@ -235,15 +235,15 @@
    /**

     * Get 座机电话

     */

    public String getPhone() {

        return phone;

    public String getTel() {

        return tel;

    }



    /**

     * Set 座机电话

     */

    public void setPhone(String phone) {

        this.phone = phone;

    public void setTel(String tel) {

        this.tel = tel;

    }



    /**

@@ -263,29 +263,29 @@
    /**

     * Get 证件类型

     */

    public String getIdentityType() {

        return identityType;

    public String getIdentityTypeId() {

        return identityTypeId;

    }



    /**

     * Set 证件类型

     */

    public void setIdentityType(String identityType) {

        this.identityType = identityType;

    public void setIdentityTypeId(String identityTypeId) {

        this.identityTypeId = identityTypeId;

    }



    /**

     * Get 证件编号

     */

    public String getIdentify() {

        return identify;

    public String getIdentifyNum() {

        return identifyNum;

    }



    /**

     * Set 证件编号

     */

    public void setIdentify(String identify) {

        this.identify = identify;

    public void setIdentifyNum(String identifyNum) {

        this.identifyNum = identifyNum;

    }



    /**

@@ -360,10 +360,10 @@


    public String toString() {

        return 

             ",人员主键 =" + id         +  ",人员名字 =" + name       +  ",人员名首字母 ="+ nameSpell  + 
             ",性别 ="   + gender     +  ",国籍 ="   + country    +  ",省 ="    + province   + 
             ",市 ="    + city       +  ",出生日期 =" + birthday   +  ",座机电话 =" + phone      + 
             ",移动电话 =" + mobilePhone +  ",证件类型 =" + identityType +  ",证件编号 =" + identify   + 
             ",人员主键 =" + registerId +  ",人员名字 =" + username   +  ",人员名首字母 ="+ nameSpell  + 
             ",性别 ="   + genderId   +  ",国籍 ="   + countryId  +  ",省 ="    + province   + 
             ",市 ="    + city       +  ",出生日期 =" + birthday   +  ",座机电话 =" + tel        + 
             ",移动电话 =" + mobilePhone +  ",证件类型 =" + identityTypeId +  ",证件编号 =" + identifyNum + 
             ",公司主键 =" + companyId  +  ",部门主键 =" + departmentId +  ",职务主键 =" + postId     + 

             ",人员备注消息 ="+ remark     +  ",危险人员警告消息 ="+ warning   ;

    }


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

New file
@@ -0,0 +1,105 @@
package cn.com.basic.face.discern.entity;



import java.io.Serializable;



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



/**

 * RegisterDetail

 */

public class RegisterDetail extends BaseEntity implements Serializable {



    private static final long serialVersionUID = 1L;



    public static final String MODEL_NAME = "RegisterDetail";



    public static final class FieldNames {

        /**

         * 员工图片主键

         */

        public static final String detailId = "detailId";

        /**

         * 人员主键

         */

        public static final String registerId = "registerId";

        /**

         * 图片地址

         */

        public static final String imagePath = "imagePath";

        /**

         * 图片类型

         */

        public static final String imageTypeId = "imageTypeId";

    }



    // 员工图片主键

    private String detailId;

    // 人员主键

    private String registerId;

    // 图片地址

    private String imagePath;

    // 图片类型

    private String imageTypeId;



    /**

     * Get 员工图片主键

     */

    public String getDetailId() {

        return detailId;

    }



    /**

     * Set 员工图片主键

     */

    public void setDetailId(String detailId) {

        this.detailId = detailId;

    }



    /**

     * Get 人员主键

     */

    public String getRegisterId() {

        return registerId;

    }



    /**

     * Set 人员主键

     */

    public void setRegisterId(String registerId) {

        this.registerId = registerId;

    }



    /**

     * Get 图片地址

     */

    public String getImagePath() {

        return imagePath;

    }



    /**

     * Set 图片地址

     */

    public void setImagePath(String imagePath) {

        this.imagePath = imagePath;

    }



    /**

     * Get 图片类型

     */

    public String getImageTypeId() {

        return imageTypeId;

    }



    /**

     * Set 图片类型

     */

    public void setImageTypeId(String imageTypeId) {

        this.imageTypeId = imageTypeId;

    }



    public String toString() {

        return 
             ",员工图片主键 ="+ detailId   +  ",人员主键 =" + registerId +  ",图片地址 =" + imagePath  + 
             ",图片类型 =" + imageTypeId;

    }

}


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

@@ -18,47 +18,47 @@
        /**

         * 访问事件主键

         */

        public static final String id = "id";

        /**

         * 访问人员主键

         */

        public static final String visitorPersonId = "visitorPersonId";

        /**

         * 被访问人员主键

         */

        public static final String visiteePersonId = "visiteePersonId";

        public static final String visitId = "visitId";

        /**

         * 访问事由主键

         */

        public static final String matterId = "matterId";

        public static final String visitReasonId = "visitReasonId";

        /**

         * 访问备注

         */

        public static final String remark = "remark";

        /**

         * 最新的访问状态

         */

        public static final String lastStatus = "lastStatus";

        /**

         * 来访时间

         */

        public static final String startTime = "startTime";

        public static final String enterTime = "enterTime";

        /**

         * 签离时间

         */

        public static final String lastTime = "lastTime";

        public static final String exitTime = "exitTime";

        /**

         * 访客类型

         */

        public static final String visitorTypeId = "visitorTypeId";

        /**

         * 访问人员主键

         */

        public static final String visitorId = "visitorId";

        /**

         * visitorCompanyId

         */

        public static final String visitorCompanyId = "visitorCompanyId";

        /**

         * 被访问人员主键

         */

        public static final String visiteeId = "visiteeId";

        /**

         * visiteeCompanyId

         */

        public static final String visiteeCompanyId = "visiteeCompanyId";

        /**

         * 访客类型

         * 最新的访问状态

         */

        public static final String visitorTypeId = "visitorTypeId";

        public static final String currentStateId = "currentStateId";

        /**

         * 当前访问的警告状态

         */

@@ -66,84 +66,56 @@
    }



    // 访问事件主键

    private String id;

    // 访问人员主键

    private String visitorPersonId;

    // 被访问人员主键

    private String visiteePersonId;

    private String visitId;

    // 访问事由主键

    private String matterId;

    private String visitReasonId;

    // 访问备注

    private String remark;

    // 最新的访问状态

    private String lastStatus;

    // 来访时间

    private String startTime;

    private String enterTime;

    // 签离时间

    private String lastTime;

    // visitorCompanyId

    private String visitorCompanyId;

    // visiteeCompanyId

    private String visiteeCompanyId;

    private String exitTime;

    // 访客类型

    private String visitorTypeId;

    // 访问人员主键

    private String visitorId;

    // visitorCompanyId

    private String visitorCompanyId;

    // 被访问人员主键

    private String visiteeId;

    // visiteeCompanyId

    private String visiteeCompanyId;

    // 最新的访问状态

    private String currentStateId;

    // 当前访问的警告状态

    private String warning;



    /**

     * Get 访问事件主键

     */

    public String getId() {

        return id;

    public String getVisitId() {

        return visitId;

    }



    /**

     * Set 访问事件主键

     */

    public void setId(String id) {

        this.id = id;

    }



    /**

     * Get 访问人员主键

     */

    public String getVisitorPersonId() {

        return visitorPersonId;

    }



    /**

     * Set 访问人员主键

     */

    public void setVisitorPersonId(String visitorPersonId) {

        this.visitorPersonId = visitorPersonId;

    }



    /**

     * Get 被访问人员主键

     */

    public String getVisiteePersonId() {

        return visiteePersonId;

    }



    /**

     * Set 被访问人员主键

     */

    public void setVisiteePersonId(String visiteePersonId) {

        this.visiteePersonId = visiteePersonId;

    public void setVisitId(String visitId) {

        this.visitId = visitId;

    }



    /**

     * Get 访问事由主键

     */

    public String getMatterId() {

        return matterId;

    public String getVisitReasonId() {

        return visitReasonId;

    }



    /**

     * Set 访问事由主键

     */

    public void setMatterId(String matterId) {

        this.matterId = matterId;

    public void setVisitReasonId(String visitReasonId) {

        this.visitReasonId = visitReasonId;

    }



    /**

@@ -161,45 +133,59 @@
    }



    /**

     * Get 最新的访问状态

     */

    public String getLastStatus() {

        return lastStatus;

    }



    /**

     * Set 最新的访问状态

     */

    public void setLastStatus(String lastStatus) {

        this.lastStatus = lastStatus;

    }



    /**

     * Get 来访时间

     */

    public String getStartTime() {

        return startTime;

    public String getEnterTime() {

        return enterTime;

    }



    /**

     * Set 来访时间

     */

    public void setStartTime(String startTime) {

        this.startTime = startTime;

    public void setEnterTime(String enterTime) {

        this.enterTime = enterTime;

    }



    /**

     * Get 签离时间

     */

    public String getLastTime() {

        return lastTime;

    public String getExitTime() {

        return exitTime;

    }



    /**

     * Set 签离时间

     */

    public void setLastTime(String lastTime) {

        this.lastTime = lastTime;

    public void setExitTime(String exitTime) {

        this.exitTime = exitTime;

    }



    /**

     * Get 访客类型

     */

    public String getVisitorTypeId() {

        return visitorTypeId;

    }



    /**

     * Set 访客类型

     */

    public void setVisitorTypeId(String visitorTypeId) {

        this.visitorTypeId = visitorTypeId;

    }



    /**

     * Get 访问人员主键

     */

    public String getVisitorId() {

        return visitorId;

    }



    /**

     * Set 访问人员主键

     */

    public void setVisitorId(String visitorId) {

        this.visitorId = visitorId;

    }



    /**

@@ -217,6 +203,20 @@
    }



    /**

     * Get 被访问人员主键

     */

    public String getVisiteeId() {

        return visiteeId;

    }



    /**

     * Set 被访问人员主键

     */

    public void setVisiteeId(String visiteeId) {

        this.visiteeId = visiteeId;

    }



    /**

     * Get visiteeCompanyId

     */

    public String getVisiteeCompanyId() {

@@ -231,17 +231,17 @@
    }



    /**

     * Get 访客类型

     * Get 最新的访问状态

     */

    public String getVisitorTypeId() {

        return visitorTypeId;

    public String getCurrentStateId() {

        return currentStateId;

    }



    /**

     * Set 访客类型

     * Set 最新的访问状态

     */

    public void setVisitorTypeId(String visitorTypeId) {

        this.visitorTypeId = visitorTypeId;

    public void setCurrentStateId(String currentStateId) {

        this.currentStateId = currentStateId;

    }



    /**

@@ -260,10 +260,10 @@


    public String toString() {

        return 

             ",访问事件主键 ="+ id         +  ",访问人员主键 ="+ visitorPersonId +  ",被访问人员主键 ="+ visiteePersonId + 
             ",访问事由主键 ="+ matterId   +  ",访问备注 =" + remark     +  ",最新的访问状态 ="+ lastStatus + 
             ",来访时间 =" + startTime  +  ",签离时间 =" + lastTime   +  ",visitorCompanyId ="+ visitorCompanyId + 
             ",visiteeCompanyId ="+ visiteeCompanyId +  ",访客类型 =" + visitorTypeId +  ",当前访问的警告状态 ="+ warning   
             ",访问事件主键 ="+ visitId    +  ",访问事由主键 ="+ visitReasonId +  ",访问备注 =" + remark     + 
             ",来访时间 =" + enterTime  +  ",签离时间 =" + exitTime   +  ",访客类型 =" + visitorTypeId + 
             ",访问人员主键 ="+ visitorId  +  ",visitorCompanyId ="+ visitorCompanyId +  ",被访问人员主键 ="+ visiteeId  + 
             ",visiteeCompanyId ="+ visiteeCompanyId +  ",最新的访问状态 ="+ currentStateId +  ",当前访问的警告状态 ="+ warning   
            ;

    }

}


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

File was renamed from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visiting.java
@@ -6,13 +6,13 @@
import cn.com.basic.face.discern.common.BaseEntity;



/**

 * Visiting

 * VisitDetail

 */

public class Visiting extends BaseEntity implements Serializable {

public class VisitDetail extends BaseEntity implements Serializable {



    private static final long serialVersionUID = 1L;



    public static final String MODEL_NAME = "Visiting";

    public static final String MODEL_NAME = "VisitDetail";



    public static final class FieldNames {

        /**

@@ -26,15 +26,15 @@
        /**

         * 当前访问状态

         */

        public static final String statusId = "statusId";

        public static final String stateId = "stateId";

        /**

         * 更新状态时间

         */

        public static final String statusDt = "statusDt";

        public static final String createTime = "createTime";

        /**

         * 设备位置主键

         */

        public static final String placeId = "placeId";

        public static final String deviceId = "deviceId";

    }



    // 访问事件流水id

@@ -42,11 +42,11 @@
    // 访问事件id

    private String visitId;

    // 当前访问状态

    private String statusId;

    private String stateId;

    // 更新状态时间

    private String statusDt;

    private String createTime;

    // 设备位置主键

    private String placeId;

    private String deviceId;



    /**

     * Get 访问事件流水id

@@ -79,48 +79,48 @@
    /**

     * Get 当前访问状态

     */

    public String getStatusId() {

        return statusId;

    public String getStateId() {

        return stateId;

    }



    /**

     * Set 当前访问状态

     */

    public void setStatusId(String statusId) {

        this.statusId = statusId;

    public void setStateId(String stateId) {

        this.stateId = stateId;

    }



    /**

     * Get 更新状态时间

     */

    public String getStatusDt() {

        return statusDt;

    public String getCreateTime() {

        return createTime;

    }



    /**

     * Set 更新状态时间

     */

    public void setStatusDt(String statusDt) {

        this.statusDt = statusDt;

    public void setCreateTime(String createTime) {

        this.createTime = createTime;

    }



    /**

     * Get 设备位置主键

     */

    public String getPlaceId() {

        return placeId;

    public String getDeviceId() {

        return deviceId;

    }



    /**

     * Set 设备位置主键

     */

    public void setPlaceId(String placeId) {

        this.placeId = placeId;

    public void setDeviceId(String deviceId) {

        this.deviceId = deviceId;

    }



    public String toString() {

        return 

             ",访问事件流水id ="+ id         +  ",访问事件id ="+ visitId    +  ",当前访问状态 ="+ statusId   + 
             ",更新状态时间 ="+ statusDt   +  ",设备位置主键 ="+ placeId   ;

             ",访问事件流水id ="+ id         +  ",访问事件id ="+ visitId    +  ",当前访问状态 ="+ stateId    + 
             ",更新状态时间 ="+ createTime +  ",设备位置主键 ="+ deviceId  ;

    }

}


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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java

@@ -136,10 +136,10 @@
            return;

        }

        RequestParams params = new RequestParams();

        params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_REASON + fragment_check_in_right_visitor_reason.getText().toString()));

        params.addBodyParameter(Visit.FieldNames.visitReasonId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_REASON + fragment_check_in_right_visitor_reason.getText().toString()));

        params.addBodyParameter(Visit.FieldNames.remark, fragment_check_in_right_remark.getText().toString());

        params.addBodyParameter(Visit.FieldNames.visitorPersonId, visitor.getRegisterId());

        params.addBodyParameter(Visit.FieldNames.visiteePersonId, interviewee.getRegisterId());

        params.addBodyParameter(Visit.FieldNames.visitorId, visitor.getRegisterId());

        params.addBodyParameter(Visit.FieldNames.visiteeId, interviewee.getRegisterId());

        params.addBodyParameter(Visit.FieldNames.visitorCompanyId, visitor.getCompanyId());

        params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, interviewee.getCompanyId());




 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java

@@ -13,6 +13,7 @@


import com.bsk.zhangbo.demoforbsk.R;

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

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

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

import cn.com.basic.face.service.DictionaryMng;

import cn.com.basic.face.service.RegisterMng;

@@ -37,8 +38,6 @@
import java.util.Date;



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

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

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



public class RegisterFragment extends BaseFragment implements View.OnClickListener{



@@ -66,9 +65,10 @@
    private SimpleDraweeView fragment_register_choose_photo;

    @ViewInject(R.id.fragment_register_update__photo)

    private ImageView fragment_register_update__photo;

    @ViewInject(R.id.fragment_register_linear_layout)

    private LinearLayout fragment_register_linear_layout;



    private static final int PICK_IMAGE_REQUEST = 1;

    private LinearLayout fragment_register_linear_layout;



    private static RegisterFragment instance = new RegisterFragment();



@@ -80,12 +80,6 @@
        return R.layout.fragment_register;

    }



    @Override

    protected void initViews(View view, Bundle savedInstanceState) {

        fragment_register_linear_layout = (LinearLayout) view.findViewById(R.id.fragment_register_linear_layout);

        //ViewUtils.inject(this, fragment_register_linear_layout);

    }



    @OnClick(R.id.fragment_register_save)

    public void fragment_register_save_click(View view) { }



@@ -93,16 +87,52 @@
    public void fragment_register_add_click(View v) {

        RequestParams params = new RequestParams();



        params.addBodyParameter(Person.FieldNames.name, register_name.getValue());

        params.addBodyParameter(Person.FieldNames.phone, register_phone.getValue());

        params.addBodyParameter(Person.FieldNames.gender, DictionaryMng.getInstance().getId(register_gender.getValue()));

        params.addBodyParameter(Person.FieldNames.identityType, DictionaryMng.getInstance().getId(register_id_class.getValue()));

        params.addBodyParameter(Person.FieldNames.country, DictionaryMng.getInstance().getId(register_country.getValue()));

        params.addBodyParameter(Person.FieldNames.identify, register_id_num.getValue());

        params.addBodyParameter(Person.FieldNames.birthday, register_birthday.getValue());

        String name = register_name.getValue();

        if (name.trim().length() < 0) {

            Toast.makeText(MainActivity.getInstance(), "姓名不能为空", Toast.LENGTH_SHORT).show();

            return;

        }

        String phone = register_phone.getValue();

        if (phone.trim().length() < 0) {

            Toast.makeText(MainActivity.getInstance(), "电话不能为空", Toast.LENGTH_SHORT).show();

            return;

        }

        String gender = register_gender.getValue();

        if (gender.trim().length() < 0) {

            Toast.makeText(MainActivity.getInstance(), "性别不能为空", Toast.LENGTH_SHORT).show();

            return;

        }

        String id_class = register_id_class.getValue();

        if (id_class.trim().length() < 0) {

            Toast.makeText(MainActivity.getInstance(), "证件类型不能为空", Toast.LENGTH_SHORT).show();

            return;

        }

        String country = register_country.getValue();

        if (country.trim().length() < 0) {

            Toast.makeText(MainActivity.getInstance(), "证件类型不能为空", Toast.LENGTH_SHORT).show();

            return;

        }

        String id_num = register_id_num.getValue();

        if (id_num.trim().length() < 0) {

            Toast.makeText(MainActivity.getInstance(), "证件类型不能为空", Toast.LENGTH_SHORT).show();

            return;

        }

        String company = register_company.getValue();

        if (company.trim().length() < 0) {

            Toast.makeText(MainActivity.getInstance(), "证件类型不能为空", Toast.LENGTH_SHORT).show();

            return;

        }

        params.addBodyParameter(Register.FieldNames.username, name);

        params.addBodyParameter(Register.FieldNames.mobilePhone, phone);

        params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(gender));

        params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(id_class));

        params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(country));

        params.addBodyParameter(Register.FieldNames.identifyNum, id_num);

        params.addBodyParameter(Register.FieldNames.birthday, company);

//        params.addBodyParameter(Person.FieldNames.Re);

        params.addBodyParameter("companyName", register_company.getValue());



        params.addBodyParameter(VisitPersonType.FieldNames.registerCompanyId, "0");

        //params.addBodyParameter(VisitPersonType.FieldNames.registerCompanyId, "0");



        RegisterMng.getInstance().add(params);

    }


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

@@ -11,7 +11,7 @@
import java.util.List;



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

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

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



public class DeviceMng {

    public static DeviceMng instance = new DeviceMng();

@@ -25,10 +25,10 @@
    public void findPlace() {

        try {

            RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);

            params.addBodyParameter(Place.FieldNames.authorizationId, authorationId);

            params.addBodyParameter(Device.FieldNames.authorizationId, authorationId);

            x.http().post(params, new BaseCommonCallBack() {

                public void success() {

                    List<Place> places = resultBean.getListBeanOfType(Place.class);

                    List<Device> places = resultBean.getListBeanOfType(Device.class);

                    if (places.size() > 0) {

                        BaseApplication.getInstance().setPlace(places.get(0));

                    } else {


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

@@ -50,7 +50,7 @@
                List<String> uniqueFirstLetterList = new ArrayList<String>();

                HashMap<String,List<String>> countriesGroupByFirstLetter = new HashMap<String,List<String>>();

                for (Dictionary item : items) {

                    idMap.put(item.getName(), item.getId()+"");

                    idMap.put(item.getName(), item.getDictId()+"");

                    String firstLetter = item.getRemark();

                    List list = countriesGroupByFirstLetter.get(firstLetter);

                    if (list == null) {

@@ -100,7 +100,7 @@
    public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {

        List nameList = new ArrayList();

        for (Dictionary dictionary : dictionaryList) {

            idMap.put(dictionary.getName(), dictionary.getId()+"");

            idMap.put(dictionary.getName(), dictionary.getDictId()+"");

            nameList.add(dictionary.getName());

        }

        return nameList;