feat(message): message-temp

src/main/java/com/dragon/tj/portal/common/dto/testDTO.java

@@ -1,4 +0,0 @@
-package com.dragon.tj.portal.common.dto;
-
-public class testDTO {
-}

src/main/java/com/dragon/tj/portal/common/vo/TestVO.java

@@ -1,4 +0,0 @@
-package com.dragon.tj.portal.common.vo;
-
-public class TestVO {
-}

src/main/java/com/dragon/tj/portal/common/vo/message/MessagePageParam.java

@@ -0,0 +1,44 @@
+package com.dragon.tj.portal.common.vo.message;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author huey China.
+ * @Description : vo
+ * @Date Created in 2023/6/28 15:19
+ */
+@ToString
+@Getter
+@Setter
+public class MessagePageParam {
+
+    /**
+     * 信息类型 1 通知公告 2信息交流 3 标准规范
+     */
+    private Integer messageType;
+
+
+    /**
+     * 信息标题
+     */
+    private String title;
+
+    /**
+     * 信息内容
+     */
+    private String content;
+
+    /**
+     * 部门名称
+     */
+    private String deptCode;
+
+    /**
+     * 发布时间
+     */
+    private String publishTime;
+
+
+}

src/main/java/com/dragon/tj/portal/controller/MessageInfoController.java

@@ -1,9 +1,12 @@
 package com.dragon.tj.portal.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dragon.tj.portal.common.base.R;
 import com.dragon.tj.portal.common.vo.message.MessageInfoParam;
 import com.dragon.tj.portal.common.vo.message.MessageInfoVO;
+import com.dragon.tj.portal.common.vo.message.MessagePageParam;
 import com.dragon.tj.portal.component.log.annotation.SysLog;
 import com.dragon.tj.portal.service.MessageInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,19 @@ public class MessageInfoController {
     @Autowired
     private MessageInfoService messageInfoService;
 
+    /**
+     * 分页查询
+     *
+     * @param page TODO 分页对象
+     * @param req
+     * @return
+     */
+    @GetMapping("/page")
+    public R page(Page page, MessagePageParam req) {
+        IPage iPage = messageInfoService.queryPage(page, req);
+        return R.ok(iPage);
+    }
+
     /**
      * 详情
      */
@@ -52,6 +68,7 @@ public class MessageInfoController {
     public R read(Long id) {
         return R.ok(messageInfoService.read(id));
     }
+
     /**
      * 批阅
      */

src/main/java/com/dragon/tj/portal/controller/MsgRecordController.java

@@ -0,0 +1,21 @@
+package com.dragon.tj.portal.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 消息信息原始记录表 前端控制器
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@RestController
+@RequestMapping("/msgRecord")
+public class MsgRecordController {
+
+}
+

src/main/java/com/dragon/tj/portal/controller/NoticeInfoController.java

@@ -0,0 +1,21 @@
+package com.dragon.tj.portal.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 消息表 前端控制器
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@RestController
+@RequestMapping("/noticeInfo")
+public class NoticeInfoController {
+
+}
+

src/main/java/com/dragon/tj/portal/controller/NoticeInfoScopeController.java

@@ -0,0 +1,21 @@
+package com.dragon.tj.portal.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 消息通知范围表 前端控制器
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@RestController
+@RequestMapping("/noticeInfoScope")
+public class NoticeInfoScopeController {
+
+}
+

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

@@ -3,11 +3,12 @@ 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 java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 信息范围表
@@ -30,13 +31,18 @@ public class MessageInfoScope implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 人员id
+     */
+    private String memberId;
+
     /**
      * 范围类型 1部门 2 人员
      */
     private Integer scopeType;
 
     /**
-     * 范围id 
+     * 部门id
      */
     private String scopeId;
 

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

@@ -0,0 +1,65 @@
+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 java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 消息信息原始记录表
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("msg_record")
+public class MsgRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 1 信息 2 消息通知
+     */
+    private Integer type;
+
+    /**
+     * 信息内容
+     */
+    private String reqContent;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建人姓名
+     */
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 删除状态 默认0 有效 1无效
+     */
+    private Integer delFlag;
+
+
+}

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

@@ -0,0 +1,100 @@
+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 java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 消息表
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("notice_info")
+public class NoticeInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 信息类型 1 通知公告 2信息交流 3 标准规范 
+     */
+    private Integer messageType;
+
+    /**
+     * 阅读状态 默认0未读 1已读
+     */
+    private Integer readStatus;
+
+    /**
+     * 信息标题
+     */
+    private String title;
+
+    /**
+     * 信息内容
+     */
+    private String content;
+
+    /**
+     * 附件地址
+     */
+    private String attachmentPath;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建人姓名
+     */
+    private String createUser;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 修改人姓名
+     */
+    private String updateUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除状态 默认0 有效 1无效
+     */
+    private Integer delFlag;
+
+    /**
+     * 版本号
+     */
+    private Integer version;
+
+
+}

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

@@ -0,0 +1,54 @@
+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 java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 消息通知范围表
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("notice_info_scope")
+public class NoticeInfoScope implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 人员id
+     */
+    private String memberId;
+
+    /**
+     * 范围类型 1部门 2 人员
+     */
+    private Integer scopeType;
+
+    /**
+     * 部门id 
+     */
+    private String scopeId;
+
+    /**
+     * 范围级别
+     */
+    private Integer scopeLevel;
+
+
+}

src/main/java/com/dragon/tj/portal/mapper/MsgRecordMapper.java

@@ -0,0 +1,18 @@
+package com.dragon.tj.portal.mapper;
+
+import com.dragon.tj.portal.entity.MsgRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 消息信息原始记录表 Mapper 接口
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Mapper
+public interface MsgRecordMapper extends BaseMapper<MsgRecord> {
+
+}

src/main/java/com/dragon/tj/portal/mapper/NoticeInfoMapper.java

@@ -0,0 +1,18 @@
+package com.dragon.tj.portal.mapper;
+
+import com.dragon.tj.portal.entity.NoticeInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 消息表 Mapper 接口
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Mapper
+public interface NoticeInfoMapper extends BaseMapper<NoticeInfo> {
+
+}

src/main/java/com/dragon/tj/portal/mapper/NoticeInfoScopeMapper.java

@@ -0,0 +1,18 @@
+package com.dragon.tj.portal.mapper;
+
+import com.dragon.tj.portal.entity.NoticeInfoScope;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 消息通知范围表 Mapper 接口
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Mapper
+public interface NoticeInfoScopeMapper extends BaseMapper<NoticeInfoScope> {
+
+}

src/main/java/com/dragon/tj/portal/service/MessageInfoService.java

@@ -1,10 +1,13 @@
 package com.dragon.tj.portal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dragon.tj.portal.auth.model.LoginUser;
 import com.dragon.tj.portal.common.base.R;
 import com.dragon.tj.portal.common.dto.message.MessageInfoReq;
 import com.dragon.tj.portal.common.vo.message.MessageInfoParam;
 import com.dragon.tj.portal.common.vo.message.MessageInfoVO;
+import com.dragon.tj.portal.common.vo.message.MessagePageParam;
 import com.dragon.tj.portal.entity.MessageInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -29,4 +32,6 @@ public interface MessageInfoService extends IService<MessageInfo> {
     boolean read(Long id);
 
     boolean reads(List<Long> ids);
+
+    IPage queryPage(Page page, MessagePageParam req);
 }

src/main/java/com/dragon/tj/portal/service/MsgRecordService.java

@@ -0,0 +1,16 @@
+package com.dragon.tj.portal.service;
+
+import com.dragon.tj.portal.entity.MsgRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 消息信息原始记录表 服务类
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+public interface MsgRecordService extends IService<MsgRecord> {
+
+}

src/main/java/com/dragon/tj/portal/service/NoticeInfoScopeService.java

@@ -0,0 +1,16 @@
+package com.dragon.tj.portal.service;
+
+import com.dragon.tj.portal.entity.NoticeInfoScope;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 消息通知范围表 服务类
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+public interface NoticeInfoScopeService extends IService<NoticeInfoScope> {
+
+}

src/main/java/com/dragon/tj/portal/service/NoticeInfoService.java

@@ -0,0 +1,16 @@
+package com.dragon.tj.portal.service;
+
+import com.dragon.tj.portal.entity.NoticeInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 消息表 服务类
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+public interface NoticeInfoService extends IService<NoticeInfo> {
+
+}

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

@@ -3,7 +3,9 @@ package com.dragon.tj.portal.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dragon.tj.portal.auth.model.LoginUser;
 import com.dragon.tj.portal.auth.web.service.SysDeptService;
@@ -18,6 +20,7 @@ import com.dragon.tj.portal.common.enums.message.ScopeEnums;
 import com.dragon.tj.portal.common.enums.message.ReadStatusEnum;
 import com.dragon.tj.portal.common.vo.message.MessageInfoParam;
 import com.dragon.tj.portal.common.vo.message.MessageInfoVO;
+import com.dragon.tj.portal.common.vo.message.MessagePageParam;
 import com.dragon.tj.portal.component.exception.message.MessageInfoException;
 import com.dragon.tj.portal.component.message.KafkaInitialConfiguration;
 import com.dragon.tj.portal.component.message.MessageProducer;
@@ -100,6 +103,11 @@ public class MessageInfoServiceImpl extends ServiceImpl<MessageInfoMapper, Messa
         return this.updateBatchById(list);
     }
 
+    @Override
+    public IPage queryPage(Page page, MessagePageParam req) {
+        return null;
+    }
+
 
     /**
      * @author huey China.

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

@@ -0,0 +1,20 @@
+package com.dragon.tj.portal.service.impl;
+
+import com.dragon.tj.portal.entity.MsgRecord;
+import com.dragon.tj.portal.mapper.MsgRecordMapper;
+import com.dragon.tj.portal.service.MsgRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 消息信息原始记录表 服务实现类
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Service
+public class MsgRecordServiceImpl extends ServiceImpl<MsgRecordMapper, MsgRecord> implements MsgRecordService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.dragon.tj.portal.service.impl;
+
+import com.dragon.tj.portal.entity.NoticeInfoScope;
+import com.dragon.tj.portal.mapper.NoticeInfoScopeMapper;
+import com.dragon.tj.portal.service.NoticeInfoScopeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 消息通知范围表 服务实现类
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Service
+public class NoticeInfoScopeServiceImpl extends ServiceImpl<NoticeInfoScopeMapper, NoticeInfoScope> implements NoticeInfoScopeService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.dragon.tj.portal.service.impl;
+
+import com.dragon.tj.portal.entity.NoticeInfo;
+import com.dragon.tj.portal.mapper.NoticeInfoMapper;
+import com.dragon.tj.portal.service.NoticeInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 消息表 服务实现类
+ * </p>
+ *
+ * @author huey
+ * @since 2023-07-11
+ */
+@Service
+public class NoticeInfoServiceImpl extends ServiceImpl<NoticeInfoMapper, NoticeInfo> implements NoticeInfoService {
+
+}

src/main/resources/mapper/MsgRecordMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dragon.tj.portal.mapper.MsgRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dragon.tj.portal.entity.MsgRecord">
+        <id column="id" property="id" />
+        <result column="type" property="type" />
+        <result column="req_content" property="reqContent" />
+        <result column="create_by" property="createBy" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="del_flag" property="delFlag" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, type, req_content, create_by, create_user, create_time, del_flag
+    </sql>
+
+</mapper>

src/main/resources/mapper/NoticeInfoMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dragon.tj.portal.mapper.NoticeInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dragon.tj.portal.entity.NoticeInfo">
+        <id column="id" property="id" />
+        <result column="message_type" property="messageType" />
+        <result column="read_status" property="readStatus" />
+        <result column="title" property="title" />
+        <result column="content" property="content" />
+        <result column="attachment_path" property="attachmentPath" />
+        <result column="create_by" property="createBy" />
+        <result column="create_user" property="createUser" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_user" property="updateUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="del_flag" property="delFlag" />
+        <result column="version" property="version" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, message_type, read_status, title, content, attachment_path, create_by, create_user, update_by, update_user, create_time, update_time, del_flag, version
+    </sql>
+
+</mapper>

src/main/resources/mapper/NoticeInfoScopeMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dragon.tj.portal.mapper.NoticeInfoScopeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dragon.tj.portal.entity.NoticeInfoScope">
+        <id column="id" property="id" />
+        <result column="member_id" property="memberId" />
+        <result column="scope_type" property="scopeType" />
+        <result column="scope_id" property="scopeId" />
+        <result column="scope_level" property="scopeLevel" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, member_id, scope_type, scope_id, scope_level
+    </sql>
+
+</mapper>

src/test/java/com/dragon/tj/portal/generate/CodeGeneration.java

@@ -85,6 +85,6 @@ public class CodeGeneration {
 
     public static void main(String[] args) {
 //        Generation("52.76.81.218:3306","portal","portal01!","portal","sys_log","sys_dict_item","sys_dict");
-//        Generation(null,null,null,"portal","message_info","message_info_history","message_info_scope");
+//        Generation(null,null,null,"portal","msg_record","notice_info","notice_info_scope");
     }
 }