From 4a47e4b93f62b5e636ac0e76f3e4ee98e2b83154 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 02 八月 2024 08:32:55 +0800
Subject: [PATCH] 1、全局配置文件修改 2、工作流bpm功能修改
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
index d855638..bdde24f 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/controller/admin/ChannelModbusTagController.java
@@ -1,10 +1,10 @@
package com.iailab.module.data.channel.modbus.controller.admin;
+import cn.hutool.core.codec.Base64;
import com.iailab.module.data.common.utils.PageUtils;
import com.iailab.module.data.common.utils.R;
import com.iailab.module.data.channel.modbus.entity.ChannelModBusTagEntity;
import com.iailab.module.data.channel.modbus.service.ChannelModbusTagService;
-import com.sun.xml.internal.messaging.saaj.util.Base64;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.*;
@@ -40,7 +40,7 @@
*/
@GetMapping("/info/{id}")
public R tagInfo(@PathVariable("id") String id){
- ChannelModBusTagEntity info= channelModbusTagService.info(Base64.base64Decode(id));
+ ChannelModBusTagEntity info= channelModbusTagService.info(Base64.decodeStr(id));
return R.ok().put("data", info);
}
/**
--
Gitblit v1.9.3