日志展示修改

device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java

@@ -74,7 +74,7 @@ public class MessageServiceImpl implements MessageService {
     @Override
     public void send(TopicPartitionInfo info, TbQueueMsgHeaders header, String message, TbQueueCallback callback) {
         TbQueueProducer<TbQueueMsg> producer = producerProvider.getTbCoreMsgProducer();
-        TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastUUID(), message == null ? "" : message, header);
+        TbQueueMsg queueMsg = new DefaultTbQueueMsg(IdUtil.fastSimpleUUID(), message == null ? "" : message, header);
         producer.send(info, queueMsg, callback);
 
     }

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceLogServiceImpl.java

 package com.mortals.xhx.module.device.service.impl;
+
 import cn.hutool.core.codec.Base64;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -12,20 +13,25 @@ import com.mortals.xhx.module.device.service.DeviceLogService;
 import java.util.List;
 
 /**
-* DeviceLogService
-* 设备日志 service实现
-*
-* @author zxfei
-* @date 2022-06-27
-*/
+ * DeviceLogService
+ * 设备日志 service实现
+ *
+ * @author zxfei
+ * @date 2022-06-27
+ */
 @Service("deviceLogService")
 public class DeviceLogServiceImpl extends AbstractCRUDServiceImpl<DeviceLogDao, DeviceLogEntity, Long> implements DeviceLogService {
 
 
     @Override
     protected void findAfter(DeviceLogEntity params, PageInfo pageInfo, Context context, List<DeviceLogEntity> list) throws AppException {
-        list.stream().forEach(item->{
-            item.setContent(Base64.decodeStr(item.getContent()));
+        list.stream().forEach(item -> {
+            try {
+                item.setContent(Base64.decodeStr(item.getContent()));
+            } catch (Exception e) {
+                log.error("content:" + item.getContent());
+            }
+
         });
     }
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceLogController.java

@@ -52,4 +52,10 @@ public class DeviceLogController extends BaseCRUDJsonBodyMappingController<Devic
         entity.setContent(Base64.decodeStr(entity.getContent()));
         return super.viewAfter(id, model, entity, context);
     }
+
+    public static void main(String[] args) {
+        String en="eyJ3YWl0Y291bnQiOiIzIiwiZm9yd2FpdGNvdW50IjoiMCJ9";
+
+        System.out.println(Base64.decodeStr(en));
+    }
 }
\ No newline at end of file