(incubator-streampark) branch dev updated: [ISSUE-3393][Fix]fix mybatis-plus enum annotation (#3395)

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev by this push:
     new eceae64ad [ISSUE-3393][Fix]fix mybatis-plus enum annotation (#3395)
eceae64ad is described below

commit eceae64adba5aaa3826e82bbd337fc3169ad8e19
Author: 诸葛子房 <xiaoqiu201...@163.com>
AuthorDate: Wed Dec 13 23:59:58 2023 +0800

    [ISSUE-3393][Fix]fix mybatis-plus enum annotation (#3395)
---
 .../java/org/apache/streampark/console/base/config/MybatisConfig.java | 1 +
 .../main/java/org/apache/streampark/console/core/entity/Message.java  | 4 ++--
 .../streampark/console/core/service/impl/MessageServiceImpl.java      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/MybatisConfig.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/MybatisConfig.java
index 5be603899..df9b4f3e7 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/MybatisConfig.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/MybatisConfig.java
@@ -77,6 +77,7 @@ public class MybatisConfig {
   public MybatisPlusPropertiesCustomizer mybatisPlusPropertiesCustomizer() {
     return properties -> {
       
properties.setTypeAliasesPackage("org.apache.streampark.console.*.entity");
+      properties.setTypeEnumsPackage("org.apache.streampark.console.*.enums");
       properties.setMapperLocations(new String[] {"classpath:mapper/*/*.xml"});
       MybatisConfiguration mybatisConfiguration = new MybatisConfiguration();
       mybatisConfiguration.setJdbcTypeForNull(JdbcType.NULL);
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Message.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Message.java
index 1029f0638..bc82dd929 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Message.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Message.java
@@ -40,7 +40,7 @@ public class Message {
   private String title;
 
   /** 1) build failure report 2) task monitoring exception */
-  private Integer type;
+  private NoticeTypeEnum type;
 
   private String context;
 
@@ -54,7 +54,7 @@ public class Message {
     this.appId = appId;
     this.title = title;
     this.context = context;
-    this.type = noticeTypeEnum.get();
+    this.type = noticeTypeEnum;
     this.createTime = new Date();
     this.isRead = false;
   }
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
index c7d4d1587..3fa977f44 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/MessageServiceImpl.java
@@ -53,7 +53,7 @@ public class MessageServiceImpl extends 
ServiceImpl<MessageMapper, Message>
         new LambdaQueryWrapper<Message>()
             .eq(Message::getIsRead, false)
             .orderByDesc(Message::getCreateTime)
-            .eq(Message::getType, noticeTypeEnum.get());
+            .eq(Message::getType, noticeTypeEnum);
     return this.baseMapper.selectPage(page, queryWrapper);
   }
 }