点检,巡检 详情页新增sis显示

master
hwf452 9 months ago
parent 2ee45456be
commit 06ba8b2a74

@ -3,7 +3,7 @@
<!-- 数据库名字 -->
<dbname value="rehomeDywoa"></dbname>
<!-- 版本号 -->
<version value="12"></version>
<version value="14"></version>
<!-- 配置表 -->
<list>
<!-- 配置表的路径需要继承DataSupport -->

@ -77,6 +77,7 @@ public class Contans {
//海康人脸识别
public static final String FACE_RECOGNITION_APP_URL = "api/app/face/faceRecognition";
public static String YHPC = "AJH/AJH_YHPCSC.ashx";//隐患排查
//-----------------------免检申请---------------------//
@ -125,7 +126,7 @@ public class Contans {
public static final String HISTORY_DJ_FINISH_TJ = "api/app/pointTask/getPointTaskHistoryState";
//点检过程单条数据上传
public static String DJ_SINGLE_SC = "api/app/pointTask/uploadTaskOne";
public static String GET_SIS_DATA_DJ = "api/app/pointTask/getSisValue";//点检获取sis数据
//-----------------------点检结束--------------------------//
//==============================巡视抄表=========================================//
@ -136,6 +137,7 @@ public class Contans {
public final static String XSCB_PLAN_UPLOAD_TASK_ONE = "api/app/task/uploadTaskOne";//上传单个巡检点数据
public final static String XJ_GET_DROWDOWN_DATA = "api/app/task/getInspectionBasicData";//巡检统计获取下拉数据,专业,类型,值次
public final static String XJ_GET_ZH_TJ = "api/app/task/getIntegrativeStatisticsData";//巡检终合统计
public static String GET_SIS_DATA_XJ = "api/app/task/getSisValue";//巡检获取sis数据
//==============================巡视抄表结束=========================================//
//==============================缺陷工单=========================================//

@ -55,6 +55,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable {
private String username;
private String second;
private String sisno;//sis编号
public boolean isBYZT() {
return BYZT;
@ -377,6 +378,14 @@ public class DjjhRwQy extends DataSupport implements Parcelable {
this.status = status;
}
public String getSisno() {
return sisno;
}
public void setSisno(String sisno) {
this.sisno = sisno;
}
public DjjhRwQy() {
}
@ -427,6 +436,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable {
dest.writeString(this.username);
dest.writeString(this.second);
dest.writeString(this.status);
dest.writeString(this.sisno);
}
protected DjjhRwQy(Parcel in) {
@ -470,6 +480,7 @@ public class DjjhRwQy extends DataSupport implements Parcelable {
this.username = in.readString();
this.second = in.readString();
this.status = in.readString();
this.sisno = in.readString();
}
public static final Creator<DjjhRwQy> CREATOR = new Creator<DjjhRwQy>() {

@ -85,6 +85,7 @@ public class XSJJHDataBean extends DataSupport implements Parcelable {
private String LOWERWARNINGSTOP;//停机报警下限
private String firstAssembling;//#1机组运行状态 0停机1开机
private String secondAssembling;//#2机组运行状态 0停机1开机
private String sisno;//sis编号
public long getId() {
@ -576,6 +577,14 @@ public class XSJJHDataBean extends DataSupport implements Parcelable {
this.secondAssembling = secondAssembling;
}
public String getSisno() {
return sisno;
}
public void setSisno(String sisno) {
this.sisno = sisno;
}
@Override
public int describeContents() {
return 0;
@ -644,6 +653,7 @@ public class XSJJHDataBean extends DataSupport implements Parcelable {
dest.writeString(this.LOWERWARNINGSTOP);
dest.writeString(this.firstAssembling);
dest.writeString(this.secondAssembling);
dest.writeString(this.sisno);
}
@ -713,6 +723,7 @@ public class XSJJHDataBean extends DataSupport implements Parcelable {
this.LOWERWARNINGSTOP = in.readString();
this.firstAssembling = in.readString();
this.secondAssembling = in.readString();
this.sisno = in.readString();
}

@ -97,4 +97,4 @@ public class DjZhTjBean extends BaseListBean{
this.MJDS = MJDS;
}
}
}
}

@ -21,6 +21,7 @@ public class KksDataBean extends BaseListBean{
private String equipmentDesc;
private String clasessCode;
private String parentCode;
private String sisno;
public String getId() {
return id;
@ -77,5 +78,13 @@ public class KksDataBean extends BaseListBean{
public void setKksDesc(String kksDesc) {
this.kksDesc = kksDesc;
}
public String getSisno() {
return sisno;
}
public void setSisno(String sisno) {
this.sisno = sisno;
}
}
}

@ -0,0 +1,47 @@
package com.rehome.dywoa.bean;
import java.util.List;
public class SisReaultBean extends BaseListBean{
private List<Row> Rows;
public List<Row> getRows() {
return Rows;
}
public void setRows(List<Row> rows) {
Rows = rows;
}
public static class Row {
private String sisDesc;
private String sisValue;
private String dw;
public String getSisDesc() {
return sisDesc;
}
public void setSisDesc(String sisDesc) {
this.sisDesc = sisDesc;
}
public String getDw() {
return dw;
}
public void setDw(String dw) {
this.dw = dw;
}
public String getSisValue() {
return sisValue;
}
public void setSisValue(String sisValue) {
this.sisValue = sisValue;
}
}
}

@ -138,6 +138,9 @@ class KksSearchActivity : BaseActivityOaToolbarViewBinding<ActivityKksSearchBind
binding.tvDeviceDesc.text = row.equipmentDesc
binding.tvDeviceFl.text = row.clasessCode
binding.tvParentCode.text = row.parentCode
if(!TextUtils.isEmpty(row.sisno)){
binding.tvSisValue.text = row.sisno
}
qrCodeStrSearch = row.kksCode
}else {
binding.tvNodata.visibility=View.VISIBLE

@ -16,14 +16,26 @@ import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.ScrollView;
import android.widget.TextView;
import com.rehome.dywoa.Contans;
import com.rehome.dywoa.DBModel.DjjhRwQy;
import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseFragment;
import com.rehome.dywoa.bean.SisReaultBean;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.UiUtlis;
import com.rehome.dywoa.weiget.ListDialog;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -54,6 +66,7 @@ public class CJFragment extends BaseFragment {
RadioButton rb3;
TextView tv_bz;
TextView tv_kks;
TextView tv_sis_value;
//Button btn_next;
Button btn_selectCheckResult;
@ -126,6 +139,7 @@ public class CJFragment extends BaseFragment {
rb3 = view.findViewById(R.id.rb3);
rg = view.findViewById(R.id.rg);
tv_bz = view.findViewById(R.id.tv_bz);
tv_sis_value = view.findViewById(R.id.tv_sis_value);
//btn_next = view.findViewById(R.id.btn_next);
btn_selectCheckResult = view.findViewById(R.id.btn_selectCheckResult);
ll_bz = view.findViewById(R.id.ll_bz);
@ -194,6 +208,75 @@ public class CJFragment extends BaseFragment {
});
}
private void getSisDate(String sisNo){
Map<String,String> param = new HashMap<>();
param.put("sisno",sisNo);
String json = GsonUtils.GsonString(param);
String url = Contans.IP + Contans.GET_SIS_DATA_XJ;
showLog(url);
showLog(json);
Request<String> request = NoHttp.createStringRequest(
url,
RequestMethod.POST
);
request.setDefineRequestBodyForJson(json);
NoProgresshttpUtils.getInstance().add(requireActivity(), 3, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----onSucceed----");
showLog(result);
SisReaultBean sisReaultBean = GsonUtils.GsonToBean(result,SisReaultBean.class);
if(sisReaultBean!=null&&sisReaultBean.getTotal()>0&&sisReaultBean.getRows()!=null&& !sisReaultBean.getRows().isEmpty()){
SisReaultBean.Row itemSis = sisReaultBean.getRows().get(0);
if(itemSis!=null&&itemSis.getSisValue()!=null){
tv_sis_value.setText(itemSis.getSisValue());
}
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("connect server onFailed");
}
});
}
//检查服务器连接状态
private void checkServerConnectStatus(String sisNo) {
Map<String,String> param = new HashMap<>();
param.put("login","dywoa");
String json = GsonUtils.GsonString(param);
String url = Contans.IP + Contans.check_server_connect;
showLog(url);
showLog(json);
Request<String> request = NoHttp.createStringRequest(
url,
RequestMethod.POST
);
request.setDefineRequestBodyForJson(json);
NoProgresshttpUtils.getInstance().add(requireActivity(), 3, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----onSucceed----");
showLog(result);
if(result.equals("1")){
showLog("connect server success");
//可以连接到服务器,请求数据
getSisDate(sisNo);
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("connect server onFailed");
}
});
}
/**
*
@ -230,6 +313,10 @@ public class CJFragment extends BaseFragment {
tv_dw.setVisibility(View.GONE);
}
if(!TextUtils.isEmpty(info.getSisno())){
checkServerConnectStatus(info.getSisno());
}
if(!TextUtils.isEmpty(info.getMEAMETHOD())){
if(info.getMEAMETHOD().equals("抄表")){
//android:digits="0123456789.-"

@ -346,16 +346,19 @@ class QxgdListActivity : BaseActivityOaToolbarViewBinding<ActivityQxgdListBindin
showLog("缺陷工单上传失败")
showToast("缺陷工单上传失败")
} else {
showLog("缺陷工单上传失败")
showLog("服务端异常,缺陷工单上传失败")
showLog(info.msg)
showToast(info.msg)
showToast("服务端异常,缺陷工单上传失败")
}
}else{
showLog("缺陷工单上传失败")
showToast("缺陷工单上传失败")
}
}
override fun onFailed(what: Int, response: Response<String>?) {
showLog("缺陷工单上传失败,无法连接到服务器,请检查网络环境")
showToast("缺陷工单上传失败,无法连接到服务器,请检查网络环境")
dialog.dismiss()
}

@ -476,47 +476,47 @@ public class SQxgdlrfActivity extends BaseActivity {
}
}
private void scData() {
//缺陷工单,如果缺陷工单为空,就没有上传
List<QxgdInfo> infos = DataSupport.findAll(QxgdInfo.class);
if (infos.size() != 0) {
Request<String> request1 = NoHttp.createStringRequest(Contans.IP + Contans.DJJHQXGD, RequestMethod.POST);
String qxgdjson = "{\"Rows\":" + GsonUtils.GsonString(infos) + ",\"Total\": " + infos.size() + "}";
showLog(qxgdjson);
System.out.println(qxgdjson);
qxgdjson = new String(qxgdjson.getBytes(), StandardCharsets.UTF_8);
request1.setDefineRequestBodyForJson(UiUtlis.encoder(qxgdjson));
NohttpUtils.getInstance().add(this, 1, request1, callback, true, true, "上传中...");
}
}
private HttpListener<String> callback = new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
try {
StatusInfo info = GsonUtils.GsonToBean(response.get(), StatusInfo.class);
if (info != null) {
if (info.getTotal() != 0) {
if (info.getRows().get(0).getStatus().equals("1")) {
showToast("上传成功");
DataSupport.deleteAll(QxgdInfo.class);
} else {
showToast("上传失败");
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public void onFailed(int what, Response<String> response) {
}
};
// private void scData() {
//
//
// //缺陷工单,如果缺陷工单为空,就没有上传
// List<QxgdInfo> infos = DataSupport.findAll(QxgdInfo.class);
// if (infos.size() != 0) {
// Request<String> request1 = NoHttp.createStringRequest(Contans.IP + Contans.DJJHQXGD, RequestMethod.POST);
// String qxgdjson = "{\"Rows\":" + GsonUtils.GsonString(infos) + ",\"Total\": " + infos.size() + "}";
// showLog(qxgdjson);
// System.out.println(qxgdjson);
// qxgdjson = new String(qxgdjson.getBytes(), StandardCharsets.UTF_8);
// request1.setDefineRequestBodyForJson(UiUtlis.encoder(qxgdjson));
// NohttpUtils.getInstance().add(this, 1, request1, callback, true, true, "上传中...");
// }
// }
// private HttpListener<String> callback = new HttpListener<String>() {
// @Override
// public void onSucceed(int what, Response<String> response) {
// try {
// StatusInfo info = GsonUtils.GsonToBean(response.get(), StatusInfo.class);
// if (info != null) {
// if (info.getTotal() != 0) {
// if (info.getRows().get(0).getStatus().equals("1")) {
// showToast("上传成功");
// DataSupport.deleteAll(QxgdInfo.class);
// } else {
// showToast("上传失败");
// }
// }
// }
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
//
// @Override
// public void onFailed(int what, Response<String> response) {
//
// }
// };
//加载数据库中已经下载的计划
private void getDataInSqlite() {
@ -757,8 +757,11 @@ public class SQxgdlrfActivity extends BaseActivity {
showLog("缺陷工单上传失败");
showToast("缺陷工单上传失败");
}else{
// showLog(info.getMsg());
// showToast(info.getMsg());
showLog("服务端异常,缺陷工单上传失败");
showLog(info.getMsg());
showToast(info.getMsg());
showToast("服务端异常,缺陷工单上传失败");
}
}else{
showLog("缺陷工单上传失败");
@ -768,6 +771,8 @@ public class SQxgdlrfActivity extends BaseActivity {
@Override
public void onFailed(int what, Response<String> response) {
showLog("缺陷工单上传失败,无法连接到服务器,请检查网络环境");
showToast("缺陷工单上传失败,无法连接到服务器,请检查网络环境");
if (dialog != null && dialog.isShowing()) {
dialog.dismiss();
}

@ -16,11 +16,21 @@ import com.rehome.dywoa.Contans;
import com.rehome.dywoa.DBModel.XSJJHDataBean;
import com.rehome.dywoa.R;
import com.rehome.dywoa.base.BaseFragment;
import com.rehome.dywoa.bean.SisReaultBean;
import com.rehome.dywoa.utils.GsonUtils;
import com.rehome.dywoa.utils.HttpListener;
import com.rehome.dywoa.utils.NoProgresshttpUtils;
import com.rehome.dywoa.utils.SPUtils;
import com.rehome.dywoa.weiget.ListDialog;
import com.yolanda.nohttp.NoHttp;
import com.yolanda.nohttp.RequestMethod;
import com.yolanda.nohttp.rest.Request;
import com.yolanda.nohttp.rest.Response;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class XJCJFragment extends BaseFragment {
@ -54,6 +64,8 @@ public class XJCJFragment extends BaseFragment {
TextView tv_kks;
TextView tv_point_type;
TextView tv_kks_desc;
TextView tv_sis_value;
// LinearLayout ll_action;
// LinearLayout ll_warnning;
@ -147,6 +159,7 @@ public class XJCJFragment extends BaseFragment {
tv_kks = view.findViewById(R.id.tv_kks);
tv_point_type = view.findViewById(R.id.tv_point_type);
tv_kks_desc = view.findViewById(R.id.tv_kks_desc);
tv_sis_value = view.findViewById(R.id.tv_sis_value);
// ll_action = view.findViewById(R.id.ll_action);
// ll_warnning = view.findViewById(R.id.ll_warnning);
@ -214,6 +227,75 @@ public class XJCJFragment extends BaseFragment {
}
private void getSisDate(String sisNo){
Map<String,String> param = new HashMap<>();
param.put("sisno",sisNo);
String json = GsonUtils.GsonString(param);
String url = Contans.IP + Contans.GET_SIS_DATA_XJ;
showLog(url);
showLog(json);
Request<String> request = NoHttp.createStringRequest(
url,
RequestMethod.POST
);
request.setDefineRequestBodyForJson(json);
NoProgresshttpUtils.getInstance().add(requireActivity(), 3, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----onSucceed----");
showLog(result);
SisReaultBean sisReaultBean = GsonUtils.GsonToBean(result,SisReaultBean.class);
if(sisReaultBean!=null&&sisReaultBean.getTotal()>0&&sisReaultBean.getRows()!=null&& !sisReaultBean.getRows().isEmpty()){
SisReaultBean.Row itemSis = sisReaultBean.getRows().get(0);
if(itemSis!=null&&itemSis.getSisValue()!=null){
tv_sis_value.setText(itemSis.getSisValue());
}
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("connect server onFailed");
}
});
}
//检查服务器连接状态
private void checkServerConnectStatus(String sisNo) {
Map<String,String> param = new HashMap<>();
param.put("login","dywoa");
String json = GsonUtils.GsonString(param);
String url = Contans.IP + Contans.check_server_connect;
showLog(url);
showLog(json);
Request<String> request = NoHttp.createStringRequest(
url,
RequestMethod.POST
);
request.setDefineRequestBodyForJson(json);
NoProgresshttpUtils.getInstance().add(requireActivity(), 3, request, new HttpListener<String>() {
@Override
public void onSucceed(int what, Response<String> response) {
String result = response.get();
showLog("-----onSucceed----");
showLog(result);
if(result.equals("1")){
showLog("connect server success");
//可以连接到服务器,请求数据
getSisDate(sisNo);
}
}
@Override
public void onFailed(int what, Response<String> response) {
showLog("connect server onFailed");
}
});
}
/**
*
*/
@ -250,6 +332,10 @@ public class XJCJFragment extends BaseFragment {
tv_point_type.setText(info.getPOINTNAME());
tv_kks_desc.setText(info.getKksDesc());
if(!TextUtils.isEmpty(info.getSisno())){
checkServerConnectStatus(info.getSisno());
}
// Log.e("XJCJFragment", "lrlx = " + info.getLRFS() + ", cjjg=" + info.getCJJG());
if(!TextUtils.isEmpty(info.getDlxmc())){

@ -46,7 +46,10 @@ public class PrimaryAuthActivity extends BaseActivity implements SFAuthResultLis
// private String mUserPassword = "test@1234"; //密码
//服务器地址
private String mServerAddress = "https://vpn.dywzhny.com.cn:8443";
//private String mServerAddress = "https://vpn.dywzhny.com.cn:8443";
private String mServerAddress = "https://vpn2.dywzhny.com.cn:9443";
//用户名
private String mUserName = "";
//密码

@ -241,6 +241,34 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:gravity="center_vertical"
style="@style/logItemStyle">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/selector_list_item"
android:gravity="center_vertical"
android:padding="20px"
android:text="sis实时数据:"
android:textColor="@color/black"
style="@style/logItemTextStyle" />
<TextView
android:id="@+id/tv_sis_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="left|center_vertical"
android:text=""
android:background="@drawable/selector_list_item"
android:textColor="@color/black"
android:textSize="18sp"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="15px" />

@ -80,7 +80,27 @@
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/px_5"
android:minHeight="@dimen/px_40">
<TextView
android:layout_width="@dimen/cjwidth"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:text="sis实时数据"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_sis_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical|left"
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

@ -470,7 +470,29 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/px_2"
android:minHeight="@dimen/px_50"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/cjwidth"
android:layout_height="match_parent"
android:gravity="center_vertical|right"
android:text="sis实时数据"
android:textSize="@dimen/sbtextSize" />
<TextView
android:id="@+id/tv_sis_value"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical|left"
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
style="@style/dagerListMarginTopStyle"
android:layout_width="match_parent"
@ -528,7 +550,6 @@
android:text=""
android:textSize="@dimen/sbtextSize" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

Loading…
Cancel
Save