From 486df4a0fdb328d7a6a35427e35b6b506f14995d Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Wed, 30 Jul 2025 11:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/schedule/plcRead/util/Tools.java   | 6 ++----
 ruoyi-ui/src/views/device/ssj/index.vue                    | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/util/Tools.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/util/Tools.java
index cf54774..605715f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/util/Tools.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/util/Tools.java
@@ -264,14 +264,12 @@ public class Tools implements Serializable {
     public static String bytetostringtool(byte[] aaa) {
         String tptm = "";
         for(int i=0;i<aaa.length;i++){
-            //System.out.println("??????:for:"+aaa[i]);
             String x = Character.toString(showChar(aaa[i]));
             char ddd=showChar(aaa[i]);
             tptm=tptm+x;
-            //System.out.println(tptm);
         }
-        if(tptm.length() == 0 || tptm.equals("")){
-            return "00000000";
+        if(tptm.isEmpty() || "\u0000\u0000\u0000\u0000\u0000\u0000\u0000".equals(tptm)){
+            return "";
         }else {
             return tptm;
         }
diff --git a/ruoyi-ui/src/views/device/ssj/index.vue b/ruoyi-ui/src/views/device/ssj/index.vue
index dcd94f4..d07bde6 100644
--- a/ruoyi-ui/src/views/device/ssj/index.vue
+++ b/ruoyi-ui/src/views/device/ssj/index.vue
@@ -82,7 +82,11 @@
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="设备编码" align="center" prop="deviceCode" />
       <el-table-column label="设备名称" align="center" prop="name" />
-      <el-table-column label="类型" align="center" prop="type" />
+      <el-table-column label="类型" align="center" prop="type" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.ssj_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
       <el-table-column label="设备IP" align="center" prop="ipAddress" />
       <el-table-column label="PLC读取地址" align="center" prop="plcDbReadAddress" />
       <el-table-column label="是否可用" align="center" prop="isActive" />
@@ -170,6 +174,7 @@ import { listSsj, getSsj, delSsj, addSsj, updateSsj } from "@/api/device/ssj"
 
 export default {
   name: "Ssj",
+  dicts: ['ssj_type'],
   data() {
     return {
       // 遮罩层