From 7559b94959e0d8fe0128b49f459217639bf636ee Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Thu, 29 Aug 2024 15:59:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E5=A4=84?=
 =?UTF-8?q?=E7=90=862?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java  | 2 --
 .../src/main/java/com/njcn/system/pojo/po/UserLog.java      | 2 --
 .../java/com/njcn/system/handler/MqttMessageHandler.java    | 6 +++---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java
index bbe3c855a..c45a31b57 100644
--- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java
+++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/LogInfoDTO.java
@@ -61,8 +61,6 @@ public class LogInfoDTO implements Serializable {
      */
     private Integer type;
 
-    private Integer roleType;
-
     private String serviceName;
 
     /**
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/UserLog.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/UserLog.java
index 312fc55c8..b94a641ef 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/UserLog.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/UserLog.java
@@ -84,8 +84,6 @@ public class UserLog {
     @ExcelProperty(value = "事件类型")
     private Integer type;
 
-    @ExcelProperty(value = "日志类型")
-    private Integer roleType;
 
     /**
      * 模块名
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/handler/MqttMessageHandler.java b/pqs-system/system-boot/src/main/java/com/njcn/system/handler/MqttMessageHandler.java
index b9d5a17a4..8d7b2c153 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/handler/MqttMessageHandler.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/handler/MqttMessageHandler.java
@@ -64,12 +64,12 @@ public class MqttMessageHandler {
         String loginName = logInfoDTO.getLoginName();
         if(StrUtil.isNotBlank(loginName) && jsonObject.containsKey(loginName)){
             if((Integer) jsonObject.get(loginName)==2){
-                logInfoDTO.setRoleType(0);
+                logInfoDTO.setType(0);
             }else {
-                logInfoDTO.setRoleType(1);
+                logInfoDTO.setType(1);
             };
         }else {
-            logInfoDTO.setRoleType(1);
+            logInfoDTO.setType(1);
         }
         userLogService.addUserLog(logInfoDTO);
     }