VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -13,8 +13,6 @@ import org.xutils.x; import cn.com.basic.face.discern.entity.Device; /** * Created by zhangbo on 2017/2/15. */ @@ -27,17 +25,17 @@ return application; } private Device place; private Device device; public void setPlace(Device place) { this.place = place; public void setDevice(Device device) { this.device = device; } public Device getPlace() { if (place == null) { place = new Device(); public Device getDevice() { if (device == null) { device = new Device(); } return place; return device; } @Override VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -3,40 +3,39 @@ public class CommonVariables { public static class ImageType { private static final int FACE1 = 1; //正面照片1（存放到EmployeeFace/VisitFace表） private static final int FACE2 = 2; //正面照片2（存放到EmployeeFace/VisitFace表） private static final int FACE_L_SIDE = 3; //（主体观察，<=45度）左侧脸照片（存放到EmployeeFace/VisitFace表） private static final int FACE_R_SIDE = 4; //（主体观察，<=45度）右侧脸照片（存放到EmployeeFace/VisitFace表） private static final int FACE_T_SIDE = 5; //（主体观察，<=45度）顶侧脸照片（存放到EmployeeFace/VisitFace表） private static final int FACE_B_SIDE = 6; //（主体观察，<=45度）底侧脸照片（存放到EmployeeFace/VisitFace表） private static final int FACE_UPLOADED = 7; //上传照片（存放到EmployeeFace/VisitFace表） private static final int ICON = 8; // 图标（存放到Image表） private static final int IDENTIFICATION_CARD = 9; //身份证照片（存放到Image表） private static final int BUSINESS_CARD = 10; //名片照片（存放到Image表） private static final int OTHER_CARD = 11; //其他证件（存放到Image表） public static final int FACE1 = 101; //正面照片1（存放到EmployeeFace/VisitFace表） public static final int FACE2 = 102; //正面照片2（存放到EmployeeFace/VisitFace表） public static final int FACE_L_SIDE = 103; //（主体观察，<=45度）左侧脸照片（存放到EmployeeFace/VisitFace表） public static final int FACE_R_SIDE = 104; //（主体观察，<=45度）右侧脸照片（存放到EmployeeFace/VisitFace表） public static final int FACE_T_SIDE = 105; //（主体观察，<=45度）顶侧脸照片（存放到EmployeeFace/VisitFace表） public static final int FACE_B_SIDE = 106; //（主体观察，<=45度）底侧脸照片（存放到EmployeeFace/VisitFace表） public static final int FACE_UPLOADED = 107; //上传照片（存放到EmployeeFace/VisitFace表） public static final int ICON = 108; // 图标（存放到Image表） public static final int IDENTIFICATION_CARD = 109; //身份证照片（存放到Image表） public static final int BUSINESS_CARD = 110; //名片照片（存放到Image表） public static final int OTHER_CARD = 111; //其他证件（存放到Image表） } public static class Type { private static final int NORMAL_VISITOR = 1; //普通访客 private static final int BLACK_LIST = 2; //黑名单 private static final int TEACHER = 3; //教师 private static final int STUDENT = 4; //学生 private static final int LEADER = 5; //领导干部 public static final int NORMAL_VISITOR = 201; //普通访客 public static final int BLACK_LIST = 202; //黑名单 public static final int TEACHER = 203; //教师 public static final int STUDENT = 204; //学生 public static final int LEADER = 205; //领导干部 } public static class StatusID { private static final int NO_REGISTER = 1; //未注册 private static final int REGISTERED = 2; //已注册（访客） private static final int VISITOR_ENTERED = 3; //来访登记（访客） private static final int VISITOR_EXITED = 4; //签离（访客） private static final int EMP_ENTERED = 5; //签到（员工） private static final int EMP_EXITED = 6; //签退（员工） public static final int NO_REGISTER = 301; //未注册 public static final int REGISTERED = 302; //已注册（访客） public static final int VISITOR_ENTERED = 303; //来访登记（访客） public static final int VISITOR_EXITED = 304; //签离（访客） public static final int EMP_ENTERED = 305; //签到（员工） public static final int EMP_EXITED = 306; //签退（员工） } public static class EnterOrExit { private static final int ENTER = 1; //进 private static final int EXIT = 2; //出 public static final int ENTER = 401; //进 public static final int EXIT = 402; //出 } public class DictionaryType { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -12,8 +12,10 @@ import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.base.BaseApplication; import cn.com.basic.face.base.LeftRightBaseFragment; import cn.com.basic.face.dialog.SelectDialog; import cn.com.basic.face.discern.entity.VisitDetail; import cn.com.basic.face.util.Constant; import cn.com.basic.face.util.OkClickedListener; import cn.com.basic.face.service.DictionaryMng; @@ -29,7 +31,9 @@ import org.xutils.http.RequestParams; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import cn.com.basic.face.discern.common.CommonVariables; @@ -141,6 +145,11 @@ Toast.makeText(MainActivity.getInstance(), "请选择被访人员", Toast.LENGTH_SHORT).show(); return; } String right_visitor_reason = fragment_check_in_right_visitor_reason.getText().toString().trim(); if (right_visitor_reason.length() == 0) { Toast.makeText(MainActivity.getInstance(), "拜访事由不能为空", Toast.LENGTH_SHORT).show(); return; } RequestParams params = new RequestParams(); params.addBodyParameter(Visit.FieldNames.visitReasonId, DictionaryMng.getInstance().getId(fragment_check_in_right_visitor_reason.getText().toString())); params.addBodyParameter(Visit.FieldNames.remark, fragment_check_in_right_remark.getText().toString()); @@ -148,6 +157,14 @@ params.addBodyParameter(Visit.FieldNames.visiteeId, interviewee.getRegisterId()); params.addBodyParameter(Visit.FieldNames.visitorCompanyId, visitor.getCompanyId()); params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, interviewee.getCompanyId()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); params.addBodyParameter(Visit.FieldNames.enterTime, sdf.format(new Date())); params.addBodyParameter(Visit.FieldNames.currentStateId, ""+CommonVariables.StatusID.VISITOR_ENTERED); //visit detail params.addBodyParameter(VisitDetail.FieldNames.stateId, ""+CommonVariables.StatusID.VISITOR_ENTERED); params.addBodyParameter(VisitDetail.FieldNames.createTime, sdf.format(new Date())); params.addBodyParameter(VisitDetail.FieldNames.deviceId, BaseApplication.getInstance().getDevice().getDeviceId()); CheckInMng.getInstance().add(params); } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -40,9 +40,9 @@ public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText) { RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.REGISTER_QUERY); if (isVisitorList) { params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId()); } else { params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getPlace().getCompanyId()); params.addBodyParameter(VisitorQueryCondition.FieldNames.companyId, BaseApplication.getInstance().getDevice().getCompanyId()); } params.addBodyParameter(VisitorQueryCondition.FieldNames.name, searchText); x.http().post(params, new BaseCommonCallBack() { VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -30,7 +30,7 @@ public void success() { List<Device> places = resultBean.getListBeanOfType(Device.class); if (places.size() > 0) { BaseApplication.getInstance().setPlace(places.get(0)); BaseApplication.getInstance().setDevice(places.get(0)); } else { Toast.makeText(BaseApplication.getInstance(), "数据库中找不到该设备", Toast.LENGTH_SHORT).show(); } VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/SurveillanceMng.java
@@ -23,7 +23,7 @@ public void findSupervisoryBottomList(final boolean isVisit) { RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.SURVEILLANCE_QUERY); // params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getPlace().getCompanyId()); // params.addBodyParameter(VisitorQueryCondition.FieldNames.notCompanyId, BaseApplication.getInstance().getDevice().getCompanyId()); x.http().post(params, new BaseCommonCallBack() { public void success() { List<SurveillanceQueryItem> list = getList(SurveillanceQueryItem.class);
