1、报税口页面，进入时会发送两次请求，修复为1次

2、液位仪页面，包路径优化，增加两个子页面的权限

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/decoder/OpwMainDataUp.java → ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/decoder/opw/OpwMainDataUp.java

@@ -1,4 +1,4 @@
-package com.ruoyi.device.mqtt.domain.decoder;
+package com.ruoyi.device.mqtt.domain.decoder.opw;
 
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
 

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/decoder/OpwPassthroughDataUp.java → ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/decoder/opw/OpwPassthroughDataUp.java

@@ -1,4 +1,4 @@
-package com.ruoyi.device.mqtt.domain.decoder;
+package com.ruoyi.device.mqtt.domain.decoder.opw;
 
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
 

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/decoder/OpwQueryDataUp.java → ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/decoder/opw/OpwQueryDataUp.java

@@ -1,7 +1,6 @@
-package com.ruoyi.device.mqtt.domain.decoder;
+package com.ruoyi.device.mqtt.domain.decoder.opw;
 
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
-import com.ruoyi.device.mqtt.domain.decoder.opw.OpwTankRow;
 
 import java.util.List;
 

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/encoder/OpwMainDataDown.java → ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/encoder/opw/OpwMainDataDown.java

@@ -1,4 +1,4 @@
-package com.ruoyi.device.mqtt.domain.encoder;
+package com.ruoyi.device.mqtt.domain.encoder.opw;
 
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
 

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/encoder/OpwPassthroughDataDown.java → ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/encoder/opw/OpwPassthroughDataDown.java

@@ -1,4 +1,4 @@
-package com.ruoyi.device.mqtt.domain.encoder;
+package com.ruoyi.device.mqtt.domain.encoder.opw;
 
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
 

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/encoder/OpwQueryDataDown.java → ruoyi-device/src/main/java/com/ruoyi/device/mqtt/domain/encoder/opw/OpwQueryDataDown.java

@@ -1,4 +1,4 @@
-package com.ruoyi.device.mqtt.domain.encoder;
+package com.ruoyi.device.mqtt.domain.encoder.opw;
 
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
 

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/OpwMainDataUpService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.device.mqtt.annotation.JsonCmdUpHandler;
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
-import com.ruoyi.device.mqtt.domain.decoder.OpwMainDataUp;
+import com.ruoyi.device.mqtt.domain.decoder.opw.OpwMainDataUp;
 import com.ruoyi.device.mqtt.enums.CmdTypeEnum;
 import com.ruoyi.device.mqtt.handler.decoder.json.IJsonCmdUpHandler;
 import com.ruoyi.device.mqtt.vo.CommonHeader;

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/OpwPassthroughDataUpService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.device.mqtt.annotation.JsonCmdUpHandler;
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
-import com.ruoyi.device.mqtt.domain.decoder.OpwPassthroughDataUp;
+import com.ruoyi.device.mqtt.domain.decoder.opw.OpwPassthroughDataUp;
 import com.ruoyi.device.mqtt.enums.CmdTypeEnum;
 import com.ruoyi.device.mqtt.handler.decoder.json.IJsonCmdUpHandler;
 import com.ruoyi.device.mqtt.vo.CommonHeader;

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/OpwQueryDataUpService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.device.mqtt.annotation.JsonCmdUpHandler;
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
-import com.ruoyi.device.mqtt.domain.decoder.OpwQueryDataUp;
+import com.ruoyi.device.mqtt.domain.decoder.opw.OpwQueryDataUp;
 import com.ruoyi.device.mqtt.enums.CmdTypeEnum;
 import com.ruoyi.device.mqtt.handler.decoder.json.IJsonCmdUpHandler;
 import com.ruoyi.device.mqtt.vo.CommonHeader;

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/encoder/json/service/OpwMainDataDownService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.device.domain.model.TsbUserDeviceBind;
 import com.ruoyi.device.mqtt.annotation.JsonCmdDownHandler;
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
-import com.ruoyi.device.mqtt.domain.encoder.OpwMainDataDown;
+import com.ruoyi.device.mqtt.domain.encoder.opw.OpwMainDataDown;
 import com.ruoyi.device.mqtt.enums.CmdTypeEnum;
 import com.ruoyi.device.mqtt.handler.encoder.json.IJsonCmdDownHandler;
 import org.slf4j.Logger;

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/encoder/json/service/OpwPassthroughDataDownService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.device.domain.model.TsbUserDeviceBind;
 import com.ruoyi.device.mqtt.annotation.JsonCmdDownHandler;
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
-import com.ruoyi.device.mqtt.domain.encoder.OpwPassthroughDataDown;
+import com.ruoyi.device.mqtt.domain.encoder.opw.OpwPassthroughDataDown;
 import com.ruoyi.device.mqtt.enums.CmdTypeEnum;
 import com.ruoyi.device.mqtt.handler.encoder.json.IJsonCmdDownHandler;
 import org.slf4j.Logger;

ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/encoder/json/service/OpwQueryDataDownService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.device.domain.model.TsbUserDeviceBind;
 import com.ruoyi.device.mqtt.annotation.JsonCmdDownHandler;
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
-import com.ruoyi.device.mqtt.domain.encoder.OpwQueryDataDown;
+import com.ruoyi.device.mqtt.domain.encoder.opw.OpwQueryDataDown;
 import com.ruoyi.device.mqtt.enums.CmdTypeEnum;
 import com.ruoyi.device.mqtt.handler.encoder.json.IJsonCmdDownHandler;
 import org.slf4j.Logger;

ruoyi-ui/src/views/app-common/tax/index.vue

@@ -236,7 +236,6 @@ export default {
     this.wsTimer = setInterval(() => {
       this.wsConnected = tsbWebSocket.isConnected()
     }, 1000)
-    this.refreshPageFromStore()
   },
   activated() {
     this.refreshPageFromStore()
@@ -329,13 +328,11 @@ export default {
     },
     /** WebSocket 推送进入：用 data 初始化；手动菜单进入：恢复默认值并下发 */
     initPageData() {
-      if (this.tryApplyWsPageData(true)) {
-        return
-      }
       this.resetFormDefaults()
       if (this.canOperateDevice) {
         this.syncDefaultParamsToDevice()
       }
+      this.savePageCache()
     },
     /** 手动进入：重置为默认值并同步到设备 */
     applyManualDefaults() {

sql/tsb_3.0.sql

@@ -97,6 +97,8 @@ INSERT INTO sys_menu VALUES ('3303', '提枪信号',   '3300', '3', 'raise', 'ap
 INSERT INTO sys_menu VALUES ('3304', '编码器',     '3300', '4', 'coder', 'app-common/coder/index', '', '', 1, 0, 'C', '1', '0', 'common:coder',      'code',          'admin', sysdate(), '', NULL, '编码器 Web 镜像页');
 INSERT INTO sys_menu VALUES ('3305', '简易示波器', '3300', '5', 'oscilloscope', 'app-common/oscilloscope/index', '', '', 1, 0, 'C', '1', '0', 'common:oscilloscope', 'chart',         'admin', sysdate(), '', NULL, '简易示波器 Web 镜像页');
 INSERT INTO sys_menu VALUES ('3306', '帮助',       '3300', '6', 'help', 'app-common/help/index', '', '', 1, 0, 'C', '1', '0', 'common:help',     'question',      'admin', sysdate(), '', NULL, '帮助 Web 镜像页');
+INSERT INTO sys_menu VALUES ('3307', '液位仪查询', '3302', '1', 'query', 'app-common/opw/query', '', '', 1, 0, 'C', '1', '0', 'common:opw:query', '#', 'admin', sysdate(), '', NULL, '液位仪查询 Web 镜像页');
+INSERT INTO sys_menu VALUES ('3308', '液位仪透传', '3302', '2', 'passthrough', 'app-common/opw/passthrough', '', '', 1, 0, 'C', '1', '0', 'common:opw:passthrough', '#', 'admin', sysdate(), '', NULL, '液位仪透传 Web 镜像页');
 
 -- ---------- 目标设备监测（3401-3499 预留） ----------
 INSERT INTO sys_menu VALUES ('3401', '日志监测',       '3400', '1', 'devlog', 'app-monitor/devlog/index', '', '', 1, 0, 'C', '1', '0', 'monitor:devlog', 'log',         'admin', sysdate(), '', NULL, '日志监测 Web 镜像页');
@@ -130,6 +132,8 @@ INSERT INTO sys_role_menu VALUES ('2', '3303');
 INSERT INTO sys_role_menu VALUES ('2', '3304');
 INSERT INTO sys_role_menu VALUES ('2', '3305');
 INSERT INTO sys_role_menu VALUES ('2', '3306');
+INSERT INTO sys_role_menu VALUES ('2', '3307');
+INSERT INTO sys_role_menu VALUES ('2', '3308');
 
 INSERT INTO sys_role_menu VALUES ('2', '3400');
 INSERT INTO sys_role_menu VALUES ('2', '3401');