From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:25:56 +0800 Subject: [PATCH] 1、实现万功能token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并相应修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 44 insertions(+), 9 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java index 2909d0b..5173e8f 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voLargeScreen/VoMonitorInfo.java @@ -10,24 +10,59 @@ */ @Data -@JsonPropertyOrder({"totalCountOfOnLine", - "totalCountOfOffLine" +@JsonPropertyOrder({"mTotalCountOfReport", + "mTotalCountOfNoReport", + "mTotalCountOfNeverReport", + "mTotalCountOfOpenValve", + "mTotalCountOfCloseValve", + "mTotalCountOfUnknownValve", + "mTotalCountOfAlarm", + "mTotalCountOfNoAlarm", + "mTotalCountOfUnknownAlarm" }) public class VoMonitorInfo { - private static final long serialVersionUID = 202502061348001L; + private static final long serialVersionUID = 202502061348321L; /** - * 浠庢煇鏃朵互鏉ワ紝鏇句笂鎶ヨ繃鏁版嵁鐨勬�绘暟 + * 浠庢煇鏃朵互鏉ワ紝鏇句笂鎶ヨ繃鏁版嵁鐨勫彇姘村彛鎬绘暟 */ - public Integer totalCountOfReport ; + public Integer mTotalCountOfReport; /** - * 浠庢煇鏃朵互鏉ワ紝鏈浘涓婃姤杩囨暟鎹殑鎬绘暟 + * 浠庢煇鏃朵互鏉ワ紝鏈浘涓婃姤杩囨暟鎹殑鍙栨按鍙f�绘暟 */ - public Integer totalCountOfNoReport ; + public Integer mTotalCountOfNoReport; /** - * 浠庢湭涓婃姤杩囨暟鎹殑鎬绘暟 + * 浠庢湭涓婃姤杩囨暟鎹殑鍙栨按鍙f�绘暟 */ - public Integer totalCountOfNeverReport ; + public Integer mTotalCountOfNeverReport; + + + /** + * 浠庢煇鏃朵互鏉ワ紝鏇鹃榾寮�鍙栨按鍙f�绘暟 + */ + public Integer mTotalCountOfOpenValve ; + /** + * 浠庢煇鏃朵互鏉ワ紝鏇鹃榾鍏冲彇姘村彛鎬绘暟 + */ + public Integer mTotalCountOfCloseValve ; + /** + * 浠庢湭寮�杩囬榾鐨勫彇姘村彛鎬绘暟 + */ + public Integer mTotalCountOfNeverOpenValve ; + + + /** + * 浠庢煇鏃朵互鏉ワ紝鏇炬姤璀﹀彇姘村彛鎬绘暟 + */ + public Integer mTotalCountOfAlarm ; + /** + * 浠庢煇鏃朵互鏉ワ紝鏇炬棤鎶ヨ鍙栨按鍙f�绘暟 + */ + public Integer mTotalCountOfNoAlarm ; + /** + * 浠庢湭鎶ヨ繃璀﹀彇姘村彛鎬绘暟 + */ + public Integer mTotalCountOfNeverAlarm ; } -- Gitblit v1.8.0