From f2ed4ad2f969689f6c5bc721343b8bee63c8e105 Mon Sep 17 00:00:00 2001 From: wenfei Date: Mon, 5 Jan 2026 17:41:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E4=BF=A1=E6=81=AF=20=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rehome/zhdcoa/Contans.java | 6 +- .../bean/DeviceAlarmListResultBean.java | 457 ++++++++++++++++++ .../ui/activity/DeviceAlarmInfofoActivity.kt | 74 +-- .../utils/AuthenticationLoginAIUtils.java | 15 +- .../com/rehome/zhdcoa/utils/NohttpUtils.java | 4 +- 5 files changed, 493 insertions(+), 63 deletions(-) create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmListResultBean.java diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index 61ed65d..ace4159 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -528,7 +528,11 @@ public class Contans { public static String PRINTIP_BIANXIE = "10.19.110.24";//便携打印机的IP //设备状态智能监测及分析平台 登录 - public final static String DeviceAlermInfoLoginUrl = "dserver/user/loginRsa"; + public final static String DeviceAlermInfoLoginUrl = "dserver/user/login"; + public final static String DeviceAlermInfoLoginRsaUrl = "dserver/user/loginRsa"; + //设备预警信息列表 + //http://192.168.2.28:1700/dserver/warning/page?v=1765422183414&keyword=&pageNo=1&pageSize=10 + public final static String DeviceAlermInfoListUrl = "dserver/warning/page"; //人员组织结构模块 用户验证接口token public final static String AUTHENTICATIONLOGINTOKEN = "AUTHENTICATIONLOGINTOKEN"; //人员组织结构模块 下次登录时间 diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmListResultBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmListResultBean.java new file mode 100644 index 0000000..138cca7 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/DeviceAlarmListResultBean.java @@ -0,0 +1,457 @@ +package com.rehome.zhdcoa.bean; + +import java.util.List; + +public class DeviceAlarmListResultBean extends AIBaseBean{ + private RowsBean data; + + public RowsBean getData() { + return data; + } + + public void setData(RowsBean data) { + this.data = data; + } + + public static class Params { + private Double tptAlarmMaxValue;// + private Double spdAlarmMaxValue;// + private Double dpmAlarmMinValue;// + private Double tptAlarmMinValue;// + private Double spdAlarmMinValue;// + private Double dpmAlarmMaxValue;// + + public Double getSpdAlarmMaxValue() { + return spdAlarmMaxValue; + } + + public void setSpdAlarmMaxValue(Double spdAlarmMaxValue) { + this.spdAlarmMaxValue = spdAlarmMaxValue; + } + + public Double getTptAlarmMaxValue() { + return tptAlarmMaxValue; + } + + public void setTptAlarmMaxValue(Double tptAlarmMaxValue) { + this.tptAlarmMaxValue = tptAlarmMaxValue; + } + + public Double getDpmAlarmMinValue() { + return dpmAlarmMinValue; + } + + public void setDpmAlarmMinValue(Double dpmAlarmMinValue) { + this.dpmAlarmMinValue = dpmAlarmMinValue; + } + + public Double getTptAlarmMinValue() { + return tptAlarmMinValue; + } + + public void setTptAlarmMinValue(Double tptAlarmMinValue) { + this.tptAlarmMinValue = tptAlarmMinValue; + } + + public Double getSpdAlarmMinValue() { + return spdAlarmMinValue; + } + + public void setSpdAlarmMinValue(Double spdAlarmMinValue) { + this.spdAlarmMinValue = spdAlarmMinValue; + } + + public Double getDpmAlarmMaxValue() { + return dpmAlarmMaxValue; + } + + public void setDpmAlarmMaxValue(Double dpmAlarmMaxValue) { + this.dpmAlarmMaxValue = dpmAlarmMaxValue; + } + } + + public static class RowsBean { + private int pageNo;//当前页 + private int pageSize;//每页条数 + private int totalRow;//总条数 + private int totalPage;//总页数 + private List 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 getDataList() { + return dataList; + } + + public void setDataList(List dataList) { + this.dataList = dataList; + } + } + public static class DeviceData{ + private Long id;//id + private String mqttIp;//设备ip + private String deviceCode;//设备编码 + private Long deviceTime;//设备时间缀 + private Long pkNum;// + private Integer status;//状态 + private Double voltage;// + private Double temperature;//温度 + private Double xAcceleration;// + private Double yAcceleration;// + private Double zAcceleration;// + private Double xSpeed;// + private Double ySpeed;// + private Double zSpeed;// + private Double xDisplacement;// + private Double yDisplacement;// + private Double zDisplacement;// + private Double xDcComponent;// + private Double yDcComponent;// + private Double zDcComponent;// + private Double xFrequency;// + private Double yFrequency;// + private Double zFrequency;// + private Double xFreq;// + private Double yFreq;// + private Double zFreq;// + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMqttIp() { + return mqttIp; + } + + public void setMqttIp(String mqttIp) { + this.mqttIp = mqttIp; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public Long getDeviceTime() { + return deviceTime; + } + + public void setDeviceTime(Long deviceTime) { + this.deviceTime = deviceTime; + } + + public Long getPkNum() { + return pkNum; + } + + public void setPkNum(Long pkNum) { + this.pkNum = pkNum; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Double getVoltage() { + return voltage; + } + + public void setVoltage(Double voltage) { + this.voltage = voltage; + } + + public Double getxAcceleration() { + return xAcceleration; + } + + public void setxAcceleration(Double xAcceleration) { + this.xAcceleration = xAcceleration; + } + + public Double getTemperature() { + return temperature; + } + + public void setTemperature(Double temperature) { + this.temperature = temperature; + } + + public Double getyAcceleration() { + return yAcceleration; + } + + public void setyAcceleration(Double yAcceleration) { + this.yAcceleration = yAcceleration; + } + + public Double getzAcceleration() { + return zAcceleration; + } + + public void setzAcceleration(Double zAcceleration) { + this.zAcceleration = zAcceleration; + } + + public Double getxSpeed() { + return xSpeed; + } + + public void setxSpeed(Double xSpeed) { + this.xSpeed = xSpeed; + } + + public Double getySpeed() { + return ySpeed; + } + + public void setySpeed(Double ySpeed) { + this.ySpeed = ySpeed; + } + + public Double getzSpeed() { + return zSpeed; + } + + public void setzSpeed(Double zSpeed) { + this.zSpeed = zSpeed; + } + + public Double getxDisplacement() { + return xDisplacement; + } + + public void setxDisplacement(Double xDisplacement) { + this.xDisplacement = xDisplacement; + } + + public Double getyDisplacement() { + return yDisplacement; + } + + public void setyDisplacement(Double yDisplacement) { + this.yDisplacement = yDisplacement; + } + + public Double getzDisplacement() { + return zDisplacement; + } + + public void setzDisplacement(Double zDisplacement) { + this.zDisplacement = zDisplacement; + } + + public Double getxDcComponent() { + return xDcComponent; + } + + public void setxDcComponent(Double xDcComponent) { + this.xDcComponent = xDcComponent; + } + + public Double getyDcComponent() { + return yDcComponent; + } + + public void setyDcComponent(Double yDcComponent) { + this.yDcComponent = yDcComponent; + } + + public Double getzDcComponent() { + return zDcComponent; + } + + public void setzDcComponent(Double zDcComponent) { + this.zDcComponent = zDcComponent; + } + + public Double getxFrequency() { + return xFrequency; + } + + public void setxFrequency(Double xFrequency) { + this.xFrequency = xFrequency; + } + + public Double getyFrequency() { + return yFrequency; + } + + public void setyFrequency(Double yFrequency) { + this.yFrequency = yFrequency; + } + + public Double getzFrequency() { + return zFrequency; + } + + public void setzFrequency(Double zFrequency) { + this.zFrequency = zFrequency; + } + + public Double getxFreq() { + return xFreq; + } + + public void setxFreq(Double xFreq) { + this.xFreq = xFreq; + } + + public Double getyFreq() { + return yFreq; + } + + public void setyFreq(Double yFreq) { + this.yFreq = yFreq; + } + + public Double getzFreq() { + return zFreq; + } + + public void setzFreq(Double zFreq) { + this.zFreq = zFreq; + } + } + public static class DataListBean { + private Long id;//id + private String warningTime;//预警时间 + private String createTime;//创䢖时间 + private String description;//报警类型 + private String deviceCode;//设备编号 + private String deviceName;//设备名称 + private Params params;//参数 + private DeviceData data;//设备信息 + private String statusStr;//设备状态描述 + private String specialtyStr;//专业 + private String typeStr;//类型描述 + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWarningTime() { + return warningTime; + } + + public void setWarningTime(String warningTime) { + this.warningTime = warningTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public Params getParams() { + return params; + } + + public void setParams(Params params) { + this.params = params; + } + + public DeviceData getData() { + return data; + } + + public void setData(DeviceData data) { + this.data = data; + } + + public String getStatusStr() { + return statusStr; + } + + public void setStatusStr(String statusStr) { + this.statusStr = statusStr; + } + + public String getSpecialtyStr() { + return specialtyStr; + } + + public void setSpecialtyStr(String specialtyStr) { + this.specialtyStr = specialtyStr; + } + + public String getTypeStr() { + return typeStr; + } + + public void setTypeStr(String typeStr) { + this.typeStr = typeStr; + } + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfofoActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfofoActivity.kt index c6e6707..ac5d913 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfofoActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DeviceAlarmInfofoActivity.kt @@ -5,19 +5,16 @@ package com.rehome.zhdcoa.ui.activity import android.content.Intent import android.text.TextUtils import android.view.View -import android.widget.TextView import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import com.rehome.zhdcoa.Contans import com.rehome.zhdcoa.R import com.rehome.zhdcoa.adapter.WorkRiskLevelListAdapter -import com.rehome.zhdcoa.base.BaseActivityOaToolbarTwoViewBinding import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding +import com.rehome.zhdcoa.bean.DeviceAlarmListResultBean +import com.rehome.zhdcoa.bean.DeviceAlarmListResultBean.DataListBean import com.rehome.zhdcoa.bean.WorkRiskLevelListBean -import com.rehome.zhdcoa.completionUtil.ReplaceSpan -import com.rehome.zhdcoa.completionUtil.ReplaceSpan.OnClickListener import com.rehome.zhdcoa.databinding.ActivityDeviceAlarmInfofoBinding -import com.rehome.zhdcoa.databinding.ActivityWorkRiskListBinding import com.rehome.zhdcoa.utils.AuthenticationLoginAIUtils import com.rehome.zhdcoa.utils.GsonUtils import com.rehome.zhdcoa.utils.HttpListener @@ -28,7 +25,6 @@ import com.yolanda.nohttp.RequestMethod import com.yolanda.nohttp.rest.Response import java.text.SimpleDateFormat import java.util.Calendar -import javax.net.ssl.HostnameVerifier /** * Create By HuangWenFei @@ -39,7 +35,9 @@ class DeviceAlarmInfofoActivity : BaseActivityOaToolbarViewBinding = mutableListOf() + private var datas: MutableList = mutableListOf()//报警数据列表 + + private lateinit var mAdapter: WorkRiskLevelListAdapter private var selectList: MutableList = mutableListOf() @@ -57,7 +55,6 @@ class DeviceAlarmInfofoActivity : BaseActivityOaToolbarViewBinding = mutableListOf() private var dataC3: MutableList = mutableListOf() private var dataLowRisk: MutableList = mutableListOf() - private var isNetworkNormal = false private lateinit var launcherResultQRCode: ActivityResultLauncher @@ -165,9 +162,8 @@ class DeviceAlarmInfofoActivity : BaseActivityOaToolbarViewBinding if (token != null && token == "") { showToast("设备状态智能监测及分析平台登录失败") - isNetworkNormal = false } else { - //getWorkRiskListData() + getAlermListData() //登录成功 } } @@ -192,7 +188,6 @@ class DeviceAlarmInfofoActivity : BaseActivityOaToolbarViewBinding if (token != null && token == "") { showToast("设备状态智能监测及分析平台登录失败") - isNetworkNormal = false } else { //getWorkRiskListData() //登录成功 @@ -203,21 +198,14 @@ class DeviceAlarmInfofoActivity : BaseActivityOaToolbarViewBinding true } - } - } + request.add("pageNo",1) + request.add("pageSize",10) NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { @@ -227,44 +215,22 @@ class DeviceAlarmInfofoActivity : BaseActivityOaToolbarViewBinding 0) { - binding.tvNodata.visibility = View.GONE - headView.visibility = View.VISIBLE - datas.clear() - datas.addAll(workRiskLevelLists) - mAdapter.notifyDataSetChanged() - - dataA.clear() - dataB.clear() - dataC1.clear() - dataC2.clear() - dataC3.clear() - dataLowRisk.clear() - - - selectList.clear() - jobNoList.clear() - - selectListAssistant.clear() - jobNoListAssistant.clear() - - selectListCustom.clear() - jobNoListCustom.clear() - } else { - binding.tvNodata.visibility = View.VISIBLE - } + if (bean != null && bean.code == 20000 && bean.isSuccess && bean.data != null && bean.data.dataList != null && bean.data.dataList.size>0) { + datas.clear() + datas.addAll(bean.data.dataList) + mAdapter.notifyDataSetChanged() + binding.tvNodata.visibility = View.GONE + headView.visibility = View.VISIBLE }else{ - isNetworkNormal = false + binding.tvNodata.visibility = View.VISIBLE + headView.visibility = View.VISIBLE } } override fun onFailed(what: Int, response: Response?) { - isNetworkNormal = false + } }) } diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java index 5034212..5db68ef 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java @@ -258,15 +258,18 @@ public class AuthenticationLoginAIUtils { Request request = NoHttp.createStringRequest(Contans.IP + Contans.DeviceAlermInfoLoginUrl, RequestMethod.POST); - Map params = new HashMap<>(); - params.put("username", account); - params.put("password", password); - - String json = GsonUtils.GsonString(params); +// Map params = new HashMap<>(); +// params.put("username", account); +// params.put("password", password); +// +// String json = GsonUtils.GsonString(params); //showLog(json); //String jsonEncrypt = RSAUtils.encryptBASE64Str(json); //showLog(jsonEncrypt); - request.setDefineRequestBodyForJson(json); + //request.setDefineRequestBodyForJson(json); + + request.add("username", account); + request.add("password", password); if (Contans.IP.equals(Contans.IP_EXTRANET)) { SSLSocketFactory socketFactory = NohttpUtils.getSSLSocketFactory(mActivity); diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java index 3f40674..7bac774 100644 --- a/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java +++ b/app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java @@ -148,8 +148,8 @@ public class NohttpUtils { String credential = "Bearer " + token; request.addHeader("Authorization", credential); showLog(request.url(),mActivity); - showLog("-----token------",mActivity); - showLog(credential,mActivity); +// showLog("-----token------",mActivity); +// showLog(credential,mActivity); //showLog(new Gson().toJson(request.headers())); } if(!TextUtils.isEmpty(request.url())){