安防-厂内人员信息-人员轨迹 v2 更换新接口完成

master
wenfei 2 weeks ago
parent bcaebbc9e3
commit 8ff126d8d8

@ -578,7 +578,9 @@ public class Contans {
//人员详细信息 //人员详细信息
public final static String CONTRACTOR_PERSONNEL_INFORMATION = "api/real_time_data/contractor_personnel_information"; public final static String CONTRACTOR_PERSONNEL_INFORMATION = "api/real_time_data/contractor_personnel_information";
//人员轨迹 //人员轨迹
public final static String MEMBER_TRACK_URL = "api/real_time_data/personnel_trajectory"; //public final static String MEMBER_TRACK_URL = "api/real_time_data/personnel_trajectory";
//人员轨迹V2
public final static String MEMBER_TRACK_V2_URL = "sc_v1/api/staff/trajectory/list";
//厂内人员信息,每个常维队伍人数 //厂内人员信息,每个常维队伍人数
public final static String REGULAR_MAINTENANCE_STAFF_STATISTICS = "api/real_time_data/regular_maintenance_staff_statistics"; public final static String REGULAR_MAINTENANCE_STAFF_STATISTICS = "api/real_time_data/regular_maintenance_staff_statistics";
//厂内人员信息,每个常维队伍人数, 实时查询常维队伍人员明细 //厂内人员信息,每个常维队伍人数, 实时查询常维队伍人员明细

@ -10,28 +10,26 @@ import androidx.annotation.NonNull;
import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.bean.GetRadioListBean; import com.rehome.zhdcoa.bean.GetRadioListBean;
import com.rehome.zhdcoa.bean.MemberTrackBean; import com.rehome.zhdcoa.bean.MemberTrackBean;
import com.rehome.zhdcoa.bean.MemberTrackV2Bean;
import com.rehome.zhdcoa.bean.XfscxBean; import com.rehome.zhdcoa.bean.XfscxBean;
import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder; import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.List; import java.util.List;
public class FactoryMemberTrackAdapter extends CommonAdapter<MemberTrackBean.RowsBean> { public class FactoryMemberTrackAdapter extends CommonAdapter<MemberTrackV2Bean.TrackV2Bean> {
private final Context context; private final Context context;
public FactoryMemberTrackAdapter(Context context, List<MemberTrackV2Bean.TrackV2Bean> datas) {
public FactoryMemberTrackAdapter(Context context, List<MemberTrackBean.RowsBean> datas) {
super(context, R.layout.item_factory_member_track, datas); super(context, R.layout.item_factory_member_track, datas);
this.context = context; this.context = context;
} }
@Override @Override
protected void convert(ViewHolder viewHolder, MemberTrackBean.RowsBean item, final int position) { protected void convert(ViewHolder viewHolder, MemberTrackV2Bean.TrackV2Bean item, final int position) {
viewHolder.setText(R.id.tv_address, item.getLocationName()); viewHolder.setText(R.id.tv_address, item.getPositionName());
if(item.getRecognitionTime()!=null&&item.getRecognitionTime().length()>19){ if(item.getEventTime()!=null&&item.getEventTime().length()==19){
viewHolder.setText(R.id.tv_time, item.getRecognitionTime().substring(0,19)); viewHolder.setText(R.id.tv_time, item.getEventTime().substring(0,19));
} }
} }
} }

@ -0,0 +1,155 @@
package com.rehome.zhdcoa.bean;
import java.util.List;
public class MemberTrackV2Bean extends AIRiskListBaseBean{
private RowsBean data;
public RowsBean getData() {
return data;
}
public void setData(RowsBean data) {
this.data = data;
}
public static class RowsBean {
//id
private int pageNo;
//id
private int pageSize;
//id
private int totalRow;
//id
private int totalPage;
private List<TrackV2Bean> dataList;
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getTotalRow() {
return totalRow;
}
public void setTotalRow(int totalRow) {
this.totalRow = totalRow;
}
public int getTotalPage() {
return totalPage;
}
public void setTotalPage(int totalPage) {
this.totalPage = totalPage;
}
public List<TrackV2Bean> getDataList() {
return dataList;
}
public void setDataList(List<TrackV2Bean> dataList) {
this.dataList = dataList;
}
}
public static class TrackV2Bean {
//轨迹主键
private Long id;
//定位卡编号
private String fid;
//姓名
private String name;
//身份证号码
private String cardNo;
//位置主键
private String positionId;
//位置名称
private String positionName;
//进入该区域的时间
private String startTime;
//最后定位的时间
private String eventTime;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getFid() {
return fid;
}
public void setFid(String fid) {
this.fid = fid;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCardNo() {
return cardNo;
}
public void setCardNo(String cardNo) {
this.cardNo = cardNo;
}
public String getPositionId() {
return positionId;
}
public void setPositionId(String positionId) {
this.positionId = positionId;
}
public String getPositionName() {
return positionName;
}
public void setPositionName(String positionName) {
this.positionName = positionName;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEventTime() {
return eventTime;
}
public void setEventTime(String eventTime) {
this.eventTime = eventTime;
}
}
}

@ -13,6 +13,7 @@ import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.rehome.zhdcoa.bean.MemberTrackBean; import com.rehome.zhdcoa.bean.MemberTrackBean;
import com.rehome.zhdcoa.bean.MemberTrackV2Bean;
import com.rehome.zhdcoa.bean.WorkerInfoStatisticsBean; import com.rehome.zhdcoa.bean.WorkerInfoStatisticsBean;
import com.rehome.zhdcoa.utils.HttpListener; import com.rehome.zhdcoa.utils.HttpListener;
import com.rehome.zhdcoa.utils.NohttpUtils; import com.rehome.zhdcoa.utils.NohttpUtils;
@ -43,7 +44,7 @@ public class ActivityFactoryMemberTrack extends BaseActivity {
TextView tv_suName; TextView tv_suName;
private List<MemberTrackBean.RowsBean> datas; private List<MemberTrackV2Bean.TrackV2Bean> datas;
private FactoryMemberTrackAdapter mAdapter; private FactoryMemberTrackAdapter mAdapter;
String card_no = ""; String card_no = "";
@ -149,7 +150,7 @@ public class ActivityFactoryMemberTrack extends BaseActivity {
} }
} }
getMemberTrack(); getMemberTrackV2();
} }
@Override @Override
@ -159,10 +160,57 @@ public class ActivityFactoryMemberTrack extends BaseActivity {
}); });
} }
public void getMemberTrack() { // public void getMemberTrack() {
Log.i("app",Contans.BASE_URL_AI_3D_SERVER + Contans.MEMBER_TRACK_URL); // Log.i("app",Contans.BASE_URL_AI_3D_SERVER + Contans.MEMBER_TRACK_URL);
Request<String> request = NoHttp.createStringRequest(Contans.BASE_URL_AI_3D_SERVER + Contans.MEMBER_TRACK_URL, RequestMethod.GET); // Request<String> request = NoHttp.createStringRequest(Contans.BASE_URL_AI_3D_SERVER + Contans.MEMBER_TRACK_URL, RequestMethod.GET);
request.add("identification_number", card_no); // request.add("identification_number", card_no);
//
// if(Contans.BASE_URL_AI_3D_SERVER.equals(Contans.BASE_URL_AI_3D_SERVER_EXTRANET)){
// SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(context);
// if (socketFactory != null) {
// request.setSSLSocketFactory(socketFactory);
// request.setHostnameVerifier(new HostnameVerifier() {
// @Override
// public boolean verify(String s, SSLSession sslSession) {
// return true;
// }
// });
// }
// }
//
// NohttpUtils.getInstance().add(this,0, request, new HttpListener<String>() {
//
// @Override
// public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
//
// String result = response.get();
// MemberTrackBean bean = GsonToBean(result, MemberTrackBean.class);
// if(bean!=null&&bean.getData()!=null){
// List<MemberTrackBean.RowsBean> infoList=bean.getData();
// if(infoList!=null&&infoList.size()>0){
// lv_member_nodata.setVisibility(View.GONE);
// datas.clear();
// datas.addAll(infoList);
// mAdapter.notifyDataSetChanged();
// }else{
// lv_member_nodata.setVisibility(View.VISIBLE);
// }
// }
// }
//
// @Override
// public void onFailed(int what, com.yolanda.nohttp.rest.Response<String> response) {
//
// }
// });
// }
public void getMemberTrackV2() {
Log.i("app",Contans.BASE_URL_AI_3D_SERVER + Contans.MEMBER_TRACK_V2_URL);
Request<String> request = NoHttp.createStringRequest(Contans.BASE_URL_AI_3D_SERVER + Contans.MEMBER_TRACK_V2_URL, RequestMethod.GET);
request.add("cardNo", card_no);
request.add("pageNo", 1);
request.add("pageSize", 500);
if(Contans.BASE_URL_AI_3D_SERVER.equals(Contans.BASE_URL_AI_3D_SERVER_EXTRANET)){ if(Contans.BASE_URL_AI_3D_SERVER.equals(Contans.BASE_URL_AI_3D_SERVER_EXTRANET)){
SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(context); SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(context);
@ -183,13 +231,18 @@ public class ActivityFactoryMemberTrack extends BaseActivity {
public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) { public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
String result = response.get(); String result = response.get();
MemberTrackBean bean = GsonToBean(result, MemberTrackBean.class); showLog(result);
if(bean!=null&&bean.getData()!=null){ /**
List<MemberTrackBean.RowsBean> infoList=bean.getData(); * {"data":{"pageNo":1,"pageSize":100,"totalRow":141,"totalPage":2,"dataList":[{"id":2399856,"fi
if(infoList!=null&&infoList.size()>0){ * {"data":{"pageNo":1,"pageSize":100,"totalRow":103,"totalPage":2,"dataList":[{"id":4121,"ticketId":272244
*/
MemberTrackV2Bean bean = GsonToBean(result, MemberTrackV2Bean.class);
if(bean!=null&&bean.getData()!=null&&bean.getData().getTotalRow()>0){
List<MemberTrackV2Bean.TrackV2Bean> dataList = bean.getData().getDataList();
if (dataList != null && !dataList.isEmpty()) {
lv_member_nodata.setVisibility(View.GONE); lv_member_nodata.setVisibility(View.GONE);
datas.clear(); datas.clear();
datas.addAll(infoList); datas.addAll(dataList);
mAdapter.notifyDataSetChanged(); mAdapter.notifyDataSetChanged();
} else { } else {
lv_member_nodata.setVisibility(View.VISIBLE); lv_member_nodata.setVisibility(View.VISIBLE);

@ -241,8 +241,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (isApkInDebug(context)) { if (isApkInDebug(context)) {
// 管理员 // 管理员
// binding.etUsername.setText("ZHPS_Admin") binding.etUsername.setText("ZHPS_Admin")
// binding.etPassword.setText("Rehome.zhps@996") binding.etPassword.setText("Rehome.zhps@996")
// binding.etUsername.setText("310187") // binding.etUsername.setText("310187")
// binding.etPassword.setText("4321@cwxING") // binding.etPassword.setText("4321@cwxING")

Loading…
Cancel
Save