Merge remote-tracking branch 'origin/master'

src/main/java/com/dragon/tj/portal/auth/service/TokenService.java

@@ -62,7 +62,8 @@ public class TokenService {
                 if (StringUtils.isNotBlank(user)) {
                     return JSONUtil.toBean(user, LoginUser.class);
                 }
-            } catch (Exception ignore) {
+            } catch (Exception e) {
+                LOGGER.error("Get token info error", e);
             }
         }
         return null;

src/main/java/com/dragon/tj/portal/entity/AppInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -79,6 +80,7 @@ public class AppInfo implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     private String createUser;
@@ -86,6 +88,7 @@ public class AppInfo implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     /**

src/main/java/com/dragon/tj/portal/entity/BusinessInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -67,6 +68,7 @@ public class BusinessInfo {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     private String createUser;
@@ -74,6 +76,7 @@ public class BusinessInfo {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     /**

src/main/java/com/dragon/tj/portal/entity/FileInfo.java

@@ -3,6 +3,7 @@ package com.dragon.tj.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -28,7 +29,9 @@ public class FileInfo {
     private String extension;//拓展名
     private Long size;//文件大小
     private Long downloads;//下载量
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;//上传时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;//更新时间
     private String delFlag;//删除
     private String createUser;//上传人

src/main/java/com/dragon/tj/portal/entity/InstallInfo.java

@@ -3,6 +3,7 @@ package com.dragon.tj.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -49,11 +50,13 @@ public class InstallInfo {
     /**
      * 安装时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     /**

src/main/java/com/dragon/tj/portal/entity/IssueInfo.java

@@ -3,6 +3,7 @@ package com.dragon.tj.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -44,6 +45,7 @@ public class IssueInfo {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /*
@@ -55,6 +57,7 @@ public class IssueInfo {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     /**

src/main/java/com/dragon/tj/portal/entity/MessageInfo.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -73,11 +75,13 @@ public class MessageInfo implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     /**

src/main/java/com/dragon/tj/portal/entity/MessageInfoHistory.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -59,6 +61,7 @@ public class MessageInfoHistory implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
 

src/main/java/com/dragon/tj/portal/entity/MsgRecord.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -54,6 +56,7 @@ public class MsgRecord implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**

src/main/java/com/dragon/tj/portal/entity/NoticeInfo.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -82,11 +84,13 @@ public class NoticeInfo implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     /**
@@ -102,5 +106,8 @@ public class NoticeInfo implements Serializable {
     @TableField(exist = false)
     private Long targetId;
 
+    @TableField(exist = false)
+    private Integer readStatus;
+
 
 }

src/main/java/com/dragon/tj/portal/entity/SysDict.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -38,11 +40,13 @@ public class SysDict implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     private String remarks;

src/main/java/com/dragon/tj/portal/entity/SysDictItem.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -49,11 +51,13 @@ public class SysDictItem implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     private String remarks;

src/main/java/com/dragon/tj/portal/entity/SysLog.java

@@ -3,6 +3,7 @@ package com.dragon.tj.portal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -43,11 +44,13 @@ public class SysLog implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     private String remoteAddr;

src/main/java/com/dragon/tj/portal/service/impl/MessageInfoServiceImpl.java

@@ -144,7 +144,7 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
         msgCountVO.setNoticeNCount(noticeN);
         msgCountVO.setNoticeYCount(noticeY);
         msgCountVO.setMessageYCount(msgY);
-        msgCountVO.setNoticeNCount(msgN);
+        msgCountVO.setMessageNCount(msgN);
         return msgCountVO;
     }
 

src/main/resources/mapper/NoticeInfoMapper.xml

@@ -4,19 +4,20 @@
 
 
     <select id="queryPage" resultType="com.dragon.tj.portal.entity.NoticeInfo">
-        SELECT b.id,member_id,scope_type,scope_id,message_type,read_status,title,content,attachment_path,a.id as target_id from notice_info_scope a
+        SELECT b.id,member_id,scope_type,scope_id,message_type,read_status,title,content,attachment_path,a.id as target_id,b.message_level, b.create_user, b.create_time,a.read_status
+        from notice_info_scope a
         LEFT JOIN notice_info b on a.notice_info_id = b.id
         where b.del_flag = 0
         <if test="req.messageType != null">
             and b.message_type = #{req.messageType}
         </if>
-        <if test="req.title != null">
+        <if test="req.title != null and req.title != ''">
             and b.title = #{req.title}
         </if>
-        <if test="req.content != null">
+        <if test="req.content != null and req.content != ''">
             and b.content = #{req.content}
         </if>
-        <if test="req.deptCode != null">
+        <if test="req.deptCode != null and req.deptCode != ''">
             and a.scope_id = #{req.deptCode}
         </if>
         <if test="req.readStatus != null">