Wang-Xiao-Ran 1 год назад
Родитель
Сommit
3fa51ee6b9

+ 96 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/my/AnnouncementController.java

@@ -0,0 +1,96 @@
+package com.ruoyi.web.controller.my;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sooka.jnb.my.domain.Announcement;
+import com.sooka.jnb.my.domain.AnnouncementRead;
+import com.sooka.jnb.my.service.IAnnouncementService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 公告Controller
+ *
+ * @author LG
+ * @date 2024-03-02
+ */
+@RestController
+@RequestMapping("/my/announcement")
+public class AnnouncementController extends BaseController {
+    @Autowired
+    private IAnnouncementService announcementService;
+
+    /**
+     * 查询公告列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(Announcement announcement) {
+        startPage();
+        List<Announcement> list = announcementService.selectAnnouncementList(announcement);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取公告详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return success(announcementService.selectAnnouncementById(id));
+    }
+
+    /**
+     * 新增公告
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody Announcement announcement) {
+        return toAjax(announcementService.insertAnnouncement(announcement));
+    }
+
+    /**
+     * 修改公告
+     */
+    @PutMapping
+    public AjaxResult edit(@RequestBody Announcement announcement) {
+        return toAjax(announcementService.updateAnnouncement(announcement));
+    }
+
+    /**
+     * 删除公告
+     */
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(announcementService.deleteAnnouncementByIds(ids));
+    }
+
+    /**
+     * 已读消息
+     */
+    @PostMapping("/readAnnouncement")
+    public AjaxResult readAnnouncement(@RequestBody AnnouncementRead announcement) {
+        return toAjax(announcementService.readAnnouncement(announcement));
+    }
+
+    /**
+     * 查询最新消息(滚动)
+     */
+    @GetMapping("/getNewAnnouncement")
+    public AjaxResult getNewAnnouncement(Announcement announcement) {
+        return AjaxResult.success(announcementService.getNewAnnouncement(announcement));
+    }
+}

+ 77 - 0
sooka-jnb/src/main/java/com/sooka/jnb/my/domain/Announcement.java

@@ -0,0 +1,77 @@
+package com.sooka.jnb.my.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.ibatis.type.Alias;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Alias("announcement")
+public class Announcement extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 数据id */
+    private String id;
+
+    /** 公告标题 */
+    private String announcementTitle;
+
+    /** 公告内容 */
+    private String announcementBody;
+
+    /** 公告有效期开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date validityStartTime;
+
+    /** 公告有效期结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date validityEndTime;
+
+    /** 公告图片 */
+    private String announcementImg;
+
+    /** 所属人员id(系统公告此项为null) */
+    private String userId;
+
+    /** 消息状态(1:已读;0:未读) */
+    private String readType;
+
+    public Announcement() {
+    }
+
+    public Announcement(String announcementTitle, String announcementBody, Date validityStartTime, Date validatyEndTime) {
+        this.announcementTitle = announcementTitle;
+        this.announcementBody = announcementBody;
+        this.validityStartTime = validityStartTime;
+        this.validityEndTime = validatyEndTime;
+    }
+
+    public Announcement(String announcementTitle, String announcementBody, String userId) {
+        this.announcementTitle = announcementTitle;
+        this.announcementBody = announcementBody;
+        this.userId = userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("announcementTitle", getAnnouncementTitle())
+                .append("announcementBody", getAnnouncementBody())
+                .append("validityStartTime", getValidityStartTime())
+                .append("validityEndTime", getValidityEndTime())
+                .append("announcementImg", getAnnouncementImg())
+                .append("userId", getUserId())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

+ 17 - 0
sooka-jnb/src/main/java/com/sooka/jnb/my/domain/AnnouncementRead.java

@@ -0,0 +1,17 @@
+package com.sooka.jnb.my.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
+
+import java.util.Date;
+
+@Data
+@Alias("announcementRead")
+public class AnnouncementRead {
+    private String id;
+    private String userId;
+    private String annoId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

+ 66 - 0
sooka-jnb/src/main/java/com/sooka/jnb/my/mapper/AnnouncementMapper.java

@@ -0,0 +1,66 @@
+package com.sooka.jnb.my.mapper;
+
+import com.sooka.jnb.my.domain.Announcement;
+import com.sooka.jnb.my.domain.AnnouncementRead;
+
+import java.util.List;
+
+/**
+ * 公告Mapper接口
+ *
+ * @author LG
+ * @date 2024-03-02
+ */
+public interface AnnouncementMapper {
+    /**
+     * 查询公告
+     *
+     * @param id 公告主键
+     * @return 公告
+     */
+    public Announcement selectAnnouncementById(String id);
+
+    /**
+     * 查询公告列表
+     *
+     * @param announcement 公告
+     * @return 公告集合
+     */
+    public List<Announcement> selectAnnouncementList(Announcement announcement);
+
+    /**
+     * 新增公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    public int insertAnnouncement(Announcement announcement);
+
+    /**
+     * 修改公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    public int updateAnnouncement(Announcement announcement);
+
+    /**
+     * 删除公告
+     *
+     * @param id 公告主键
+     * @return 结果
+     */
+    public int deleteAnnouncementById(String id);
+
+    /**
+     * 批量删除公告
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAnnouncementByIds(String[] ids);
+
+    int readAnnouncement(AnnouncementRead announcement);
+
+    List<Announcement> getNewAnnouncement(Announcement announcement);
+}

+ 72 - 0
sooka-jnb/src/main/java/com/sooka/jnb/my/service/IAnnouncementService.java

@@ -0,0 +1,72 @@
+package com.sooka.jnb.my.service;
+
+import com.sooka.jnb.my.domain.Announcement;
+import com.sooka.jnb.my.domain.AnnouncementRead;
+
+import java.util.List;
+
+/**
+ * 公告Service接口
+ *
+ * @author LG
+ * @date 2024-03-02
+ */
+public interface IAnnouncementService {
+    /**
+     * 查询公告
+     *
+     * @param id 公告主键
+     * @return 公告
+     */
+    Announcement selectAnnouncementById(String id);
+
+    /**
+     * 查询公告列表
+     *
+     * @param announcement 公告
+     * @return 公告集合
+     */
+    List<Announcement> selectAnnouncementList(Announcement announcement);
+
+    /**
+     * 新增公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    int insertAnnouncement(Announcement announcement);
+
+    /**
+     * 修改公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    int updateAnnouncement(Announcement announcement);
+
+    /**
+     * 批量删除公告
+     *
+     * @param ids 需要删除的公告主键集合
+     * @return 结果
+     */
+    int deleteAnnouncementByIds(String[] ids);
+
+    /**
+     * 删除公告信息
+     *
+     * @param id 公告主键
+     * @return 结果
+     */
+    int deleteAnnouncementById(String id);
+
+    /**
+     * 记录已读消息
+     * @param announcement
+     * @return
+     */
+    int readAnnouncement(AnnouncementRead announcement);
+
+
+    List<Announcement> getNewAnnouncement(Announcement announcement);
+}

+ 129 - 0
sooka-jnb/src/main/java/com/sooka/jnb/my/service/impl/AnnouncementServiceImpl.java

@@ -0,0 +1,129 @@
+package com.sooka.jnb.my.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.sooka.jnb.my.domain.Announcement;
+import com.sooka.jnb.my.domain.AnnouncementRead;
+import com.sooka.jnb.my.mapper.AnnouncementMapper;
+import com.sooka.jnb.my.service.IAnnouncementService;
+import com.sooka.jnb.utils.UUID;
+import org.springframework.stereotype.Service;
+
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 公告Service业务层处理
+ *
+ * @author LG
+ * @date 2024-03-02
+ */
+@Service
+public class AnnouncementServiceImpl implements IAnnouncementService {
+    @Resource
+    private AnnouncementMapper announcementMapper;
+
+    /**
+     * 查询公告
+     *
+     * @param id 公告主键
+     * @return 公告
+     */
+    @Override
+    public Announcement selectAnnouncementById(String id) {
+        return announcementMapper.selectAnnouncementById(id);
+    }
+
+    /**
+     * 查询公告列表
+     *
+     * @param announcement 公告
+     * @return 公告
+     */
+    @Override
+    public List<Announcement> selectAnnouncementList(Announcement announcement) {
+        return announcementMapper.selectAnnouncementList(announcement);
+    }
+
+    /**
+     * 新增公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    @Override
+    public int insertAnnouncement(Announcement announcement) {
+        announcement.setId(UUID.getUUID());
+        //如果请求参数中没有用户id, 则从缓存中获取.
+        if (announcement.getCreateBy() == null || "".equals(announcement.getCreateBy())) {
+            announcement.setCreateBy(SecurityUtils.getUserId().toString());
+        }
+        if(announcement.getValidityStartTime()== null || "".equals(announcement.getValidityStartTime())){
+            announcement.setValidityStartTime(DateUtils.getNowDate());
+        }
+        announcement.setCreateTime(DateUtils.getNowDate());
+        return announcementMapper.insertAnnouncement(announcement);
+    }
+
+    /**
+     * 修改公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    @Override
+    public int updateAnnouncement(Announcement announcement) {
+        announcement.setUpdateBy(SecurityUtils.getUserId().toString());
+        announcement.setUpdateTime(DateUtils.getNowDate());
+        return announcementMapper.updateAnnouncement(announcement);
+    }
+
+    /**
+     * 批量删除公告
+     *
+     * @param ids 需要删除的公告主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAnnouncementByIds(String[] ids) {
+        return announcementMapper.deleteAnnouncementByIds(ids);
+    }
+
+    /**
+     * 删除公告信息
+     *
+     * @param id 公告主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAnnouncementById(String id) {
+        return announcementMapper.deleteAnnouncementById(id);
+    }
+
+    /**
+     * 新增已读消息记录
+     *
+     * @param announcement
+     * @return
+     */
+
+    @Override
+    public int readAnnouncement(AnnouncementRead announcement) {
+        announcement.setId(UUID.getUUID());
+        announcement.setCreateTime(DateUtils.getNowDate());
+        return announcementMapper.readAnnouncement(announcement);
+    }
+
+    @Override
+    public List<Announcement> getNewAnnouncement(Announcement announcement) {
+        announcement.setReadType("0");
+        List<Announcement> dataList = announcementMapper.getNewAnnouncement(announcement);
+        if(StringUtils.isEmpty(dataList)){
+            announcement.setReadType("1");
+            return announcementMapper.getNewAnnouncement(announcement);
+        }
+        return dataList;
+    }
+}

+ 495 - 0
sooka-jnb/src/main/java/com/sooka/jnb/utils/UUID.java

@@ -0,0 +1,495 @@
+package com.sooka.jnb.utils;
+
+
+import com.ruoyi.common.exception.UtilException;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * 提供通用唯一识别码(universally unique identifier)(UUID)实现
+ *
+ * @author ruoyi
+ */
+public final class UUID implements java.io.Serializable, Comparable<UUID>
+{
+    private static final long serialVersionUID = -1185015143654744140L;
+
+    /**
+     * SecureRandom 的单例
+     *
+     */
+    private static class Holder
+    {
+        static final SecureRandom numberGenerator = getSecureRandom();
+    }
+
+    /** 此UUID的最高64有效位 */
+    private final long mostSigBits;
+
+    /** 此UUID的最低64有效位 */
+    private final long leastSigBits;
+
+    /**
+     * 私有构造
+     *
+     * @param data 数据
+     */
+    private UUID(byte[] data)
+    {
+        long msb = 0;
+        long lsb = 0;
+        assert data.length == 16 : "data must be 16 bytes in length";
+        for (int i = 0; i < 8; i++)
+        {
+            msb = (msb << 8) | (data[i] & 0xff);
+        }
+        for (int i = 8; i < 16; i++)
+        {
+            lsb = (lsb << 8) | (data[i] & 0xff);
+        }
+        this.mostSigBits = msb;
+        this.leastSigBits = lsb;
+    }
+
+    /**
+     * 使用指定的数据构造新的 UUID。
+     *
+     * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位
+     * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
+     */
+    public UUID(long mostSigBits, long leastSigBits)
+    {
+        this.mostSigBits = mostSigBits;
+        this.leastSigBits = leastSigBits;
+    }
+
+    /**
+     * 获取类型 4(伪随机生成的)UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。
+     *
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID fastUUID()
+    {
+        return randomUUID(false);
+    }
+
+    /**
+     * 获取类型 4(伪随机生成的)UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+     *
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID randomUUID()
+    {
+        return randomUUID(true);
+    }
+
+    /**
+     * 获取类型 4(伪随机生成的)UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+     *
+     * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码,否则可以得到更好的性能
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID randomUUID(boolean isSecure)
+    {
+        final Random ng = isSecure ? Holder.numberGenerator : getRandom();
+
+        byte[] randomBytes = new byte[16];
+        ng.nextBytes(randomBytes);
+        randomBytes[6] &= 0x0f; /* clear version */
+        randomBytes[6] |= 0x40; /* set to version 4 */
+        randomBytes[8] &= 0x3f; /* clear variant */
+        randomBytes[8] |= 0x80; /* set to IETF variant */
+        return new UUID(randomBytes);
+    }
+
+    /**
+     * 根据指定的字节数组获取类型 3(基于名称的)UUID 的静态工厂。
+     *
+     * @param name 用于构造 UUID 的字节数组。
+     *
+     * @return 根据指定数组生成的 {@code UUID}
+     */
+    public static UUID nameUUIDFromBytes(byte[] name)
+    {
+        MessageDigest md;
+        try
+        {
+            md = MessageDigest.getInstance("MD5");
+        }
+        catch (NoSuchAlgorithmException nsae)
+        {
+            throw new InternalError("MD5 not supported");
+        }
+        byte[] md5Bytes = md.digest(name);
+        md5Bytes[6] &= 0x0f; /* clear version */
+        md5Bytes[6] |= 0x30; /* set to version 3 */
+        md5Bytes[8] &= 0x3f; /* clear variant */
+        md5Bytes[8] |= 0x80; /* set to IETF variant */
+        return new UUID(md5Bytes);
+    }
+
+    /**
+     * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
+     *
+     * @param name 指定 {@code UUID} 字符串
+     * @return 具有指定值的 {@code UUID}
+     * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
+     *
+     */
+    public static UUID fromString(String name)
+    {
+        String[] components = name.split("-");
+        if (components.length != 5)
+        {
+            throw new IllegalArgumentException("Invalid UUID string: " + name);
+        }
+        for (int i = 0; i < 5; i++)
+        {
+            components[i] = "0x" + components[i];
+        }
+
+        long mostSigBits = Long.decode(components[0]).longValue();
+        mostSigBits <<= 16;
+        mostSigBits |= Long.decode(components[1]).longValue();
+        mostSigBits <<= 16;
+        mostSigBits |= Long.decode(components[2]).longValue();
+
+        long leastSigBits = Long.decode(components[3]).longValue();
+        leastSigBits <<= 48;
+        leastSigBits |= Long.decode(components[4]).longValue();
+
+        return new UUID(mostSigBits, leastSigBits);
+    }
+
+    /**
+     * 返回此 UUID 的 128 位值中的最低有效 64 位。
+     *
+     * @return 此 UUID 的 128 位值中的最低有效 64 位。
+     */
+    public long getLeastSignificantBits()
+    {
+        return leastSigBits;
+    }
+
+    /**
+     * 返回此 UUID 的 128 位值中的最高有效 64 位。
+     *
+     * @return 此 UUID 的 128 位值中最高有效 64 位。
+     */
+    public long getMostSignificantBits()
+    {
+        return mostSigBits;
+    }
+
+    /**
+     * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
+     * <p>
+     * 版本号具有以下含意:
+     * <ul>
+     * <li>1 基于时间的 UUID
+     * <li>2 DCE 安全 UUID
+     * <li>3 基于名称的 UUID
+     * <li>4 随机生成的 UUID
+     * </ul>
+     *
+     * @return 此 {@code UUID} 的版本号
+     */
+    public int version()
+    {
+        // Version is bits masked by 0x000000000000F000 in MS long
+        return (int) ((mostSigBits >> 12) & 0x0f);
+    }
+
+    /**
+     * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
+     * <p>
+     * 变体号具有以下含意:
+     * <ul>
+     * <li>0 为 NCS 向后兼容保留
+     * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>(Leach-Salz), 用于此类
+     * <li>6 保留,微软向后兼容
+     * <li>7 保留供以后定义使用
+     * </ul>
+     *
+     * @return 此 {@code UUID} 相关联的变体号
+     */
+    public int variant()
+    {
+        // This field is composed of a varying number of bits.
+        // 0 - - Reserved for NCS backward compatibility
+        // 1 0 - The IETF aka Leach-Salz variant (used by this class)
+        // 1 1 0 Reserved, Microsoft backward compatibility
+        // 1 1 1 Reserved for future definition.
+        return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
+    }
+
+    /**
+     * 与此 UUID 相关联的时间戳值。
+     *
+     * <p>
+     * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。<br>
+     * 所得到的时间戳以 100 毫微秒为单位,从 UTC(通用协调时间) 1582 年 10 月 15 日零时开始。
+     *
+     * <p>
+     * 时间戳值仅在在基于时间的 UUID(其 version 类型为 1)中才有意义。<br>
+     * 如果此 {@code UUID} 不是基于时间的 UUID,则此方法抛出 UnsupportedOperationException。
+     *
+     * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
+     */
+    public long timestamp() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return (mostSigBits & 0x0FFFL) << 48//
+                | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
+                | mostSigBits >>> 32;
+    }
+
+    /**
+     * 与此 UUID 相关联的时钟序列值。
+     *
+     * <p>
+     * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
+     * <p>
+     * {@code clockSequence} 值仅在基于时间的 UUID(其 version 类型为 1)中才有意义。 如果此 UUID 不是基于时间的 UUID,则此方法抛出
+     * UnsupportedOperationException。
+     *
+     * @return 此 {@code UUID} 的时钟序列
+     *
+     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+     */
+    public int clockSequence() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
+    }
+
+    /**
+     * 与此 UUID 相关的节点值。
+     *
+     * <p>
+     * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址,该地址用于生成此 UUID 以保证空间唯一性。
+     * <p>
+     * 节点值仅在基于时间的 UUID(其 version 类型为 1)中才有意义。<br>
+     * 如果此 UUID 不是基于时间的 UUID,则此方法抛出 UnsupportedOperationException。
+     *
+     * @return 此 {@code UUID} 的节点值
+     *
+     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+     */
+    public long node() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return leastSigBits & 0x0000FFFFFFFFFFFFL;
+    }
+
+    /**
+     * 返回此{@code UUID} 的字符串表现形式。
+     *
+     * <p>
+     * UUID 的字符串表示形式由此 BNF 描述:
+     *
+     * <pre>
+     * {@code
+     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+     * time_low               = 4*<hexOctet>
+     * time_mid               = 2*<hexOctet>
+     * time_high_and_version  = 2*<hexOctet>
+     * variant_and_sequence   = 2*<hexOctet>
+     * node                   = 6*<hexOctet>
+     * hexOctet               = <hexDigit><hexDigit>
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * </pre>
+     *
+     * </blockquote>
+     *
+     * @return 此{@code UUID} 的字符串表现形式
+     * @see #toString(boolean)
+     */
+    @Override
+    public String toString()
+    {
+        return toString(false);
+    }
+
+    /**
+     * 返回此{@code UUID} 的字符串表现形式。
+     *
+     * <p>
+     * UUID 的字符串表示形式由此 BNF 描述:
+     *
+     * <pre>
+     * {@code
+     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+     * time_low               = 4*<hexOctet>
+     * time_mid               = 2*<hexOctet>
+     * time_high_and_version  = 2*<hexOctet>
+     * variant_and_sequence   = 2*<hexOctet>
+     * node                   = 6*<hexOctet>
+     * hexOctet               = <hexDigit><hexDigit>
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * </pre>
+     *
+     * </blockquote>
+     *
+     * @param isSimple 是否简单模式,简单模式为不带'-'的UUID字符串
+     * @return 此{@code UUID} 的字符串表现形式
+     */
+    public String toString(boolean isSimple)
+    {
+        final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
+        // time_low
+        builder.append(digits(mostSigBits >> 32, 8));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // time_mid
+        builder.append(digits(mostSigBits >> 16, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // time_high_and_version
+        builder.append(digits(mostSigBits, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // variant_and_sequence
+        builder.append(digits(leastSigBits >> 48, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // node
+        builder.append(digits(leastSigBits, 12));
+
+        return builder.toString();
+    }
+
+    /**
+     * 返回此 UUID 的哈希码。
+     *
+     * @return UUID 的哈希码值。
+     */
+    @Override
+    public int hashCode()
+    {
+        long hilo = mostSigBits ^ leastSigBits;
+        return ((int) (hilo >> 32)) ^ (int) hilo;
+    }
+
+    /**
+     * 将此对象与指定对象比较。
+     * <p>
+     * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值(每一位均相同)时,结果才为 {@code true}。
+     *
+     * @param obj 要与之比较的对象
+     *
+     * @return 如果对象相同,则返回 {@code true};否则返回 {@code false}
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if ((null == obj) || (obj.getClass() != UUID.class))
+        {
+            return false;
+        }
+        UUID id = (UUID) obj;
+        return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
+    }
+
+    // Comparison Operations
+
+    /**
+     * 将此 UUID 与指定的 UUID 比较。
+     *
+     * <p>
+     * 如果两个 UUID 不同,且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段,则第一个 UUID 大于第二个 UUID。
+     *
+     * @param val 与此 UUID 比较的 UUID
+     *
+     * @return 在此 UUID 小于、等于或大于 val 时,分别返回 -1、0 或 1。
+     *
+     */
+    @Override
+    public int compareTo(UUID val)
+    {
+        // The ordering is intentionally set up so that the UUIDs
+        // can simply be numerically compared as two numbers
+        return (this.mostSigBits < val.mostSigBits ? -1 : //
+                (this.mostSigBits > val.mostSigBits ? 1 : //
+                        (this.leastSigBits < val.leastSigBits ? -1 : //
+                                (this.leastSigBits > val.leastSigBits ? 1 : //
+                                        0))));
+    }
+
+    // -------------------------------------------------------------------------------------------------------------------
+    // Private method start
+    /**
+     * 返回指定数字对应的hex值
+     *
+     * @param val 值
+     * @param digits 位
+     * @return 值
+     */
+    private static String digits(long val, int digits)
+    {
+        long hi = 1L << (digits * 4);
+        return Long.toHexString(hi | (val & (hi - 1))).substring(1);
+    }
+
+    /**
+     * 检查是否为time-based版本UUID
+     */
+    private void checkTimeBase()
+    {
+        if (version() != 1)
+        {
+            throw new UnsupportedOperationException("Not a time-based UUID");
+        }
+    }
+
+    /**
+     * 获取{@link SecureRandom},类提供加密的强随机数生成器 (RNG)
+     *
+     * @return {@link SecureRandom}
+     */
+    public static SecureRandom getSecureRandom()
+    {
+        try
+        {
+            return SecureRandom.getInstance("SHA1PRNG");
+        }
+        catch (NoSuchAlgorithmException e)
+        {
+            throw new UtilException(e);
+        }
+    }
+
+    /**
+     * 获取随机数生成器对象<br>
+     * ThreadLocalRandom是JDK 7之后提供并发产生随机数,能够解决多个线程发生的竞争争夺。
+     *
+     * @return {@link ThreadLocalRandom}
+     */
+    public static ThreadLocalRandom getRandom()
+    {
+        return ThreadLocalRandom.current();
+    }
+
+    /**
+     * 获取32位UUID
+     * @return 值
+     */
+    public static String getUUID() {
+        String uuid = java.util.UUID.randomUUID().toString();
+        return uuid.substring(0, 8) + uuid.substring(9, 13) + uuid.substring(14, 18) + uuid.substring(19, 23) + uuid.substring(24);
+    }
+}

+ 141 - 0
sooka-jnb/src/main/resources/mapper/my/AnnouncementMapper.xml

@@ -0,0 +1,141 @@
+<?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.sooka.jnb.my.mapper.AnnouncementMapper">
+    
+    <resultMap type="Announcement" id="AnnouncementResult">
+        <result property="id"    column="id"    />
+        <result property="announcementTitle"    column="announcement_title"    />
+        <result property="announcementBody"    column="announcement_body"    />
+        <result property="validityStartTime"    column="validity_start_time"    />
+        <result property="validityEndTime"    column="validity_end_time"    />
+        <result property="announcementImg"    column="announcement_img"    />
+        <result property="userId"    column="user_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="readType" column="read_type"/>
+    </resultMap>
+
+    <sql id="selectAnnouncementVo">
+        select id, announcement_title, announcement_body, validity_start_time, validity_end_time, announcement_img, user_id, create_by, create_time, update_by, update_time from jnb_announcement
+    </sql>
+
+    <sql id="selectList">
+        select
+        a.*,
+        CASE WHEN ar.id IS NULL THEN 0 ELSE 1 END AS read_type
+        FROM jnb_announcement a
+        LEFT JOIN jnb_announcement_read ar ON a.id = ar.anno_id
+        <where>
+            and del_flag = 1
+            <if test="announcementTitle != null  and announcementTitle != ''">
+                and announcement_title like concat('%', #{announcementTitle}, '%')
+            </if>
+            <if test="validityStartTime != null">
+                and validity_start_time &gt;= #{validityStartTime}
+            </if>
+            <if test="validityEndTime != null ">
+                and (validity_end_time &lt;= #{validityEndTime} or validity_end_time is null)
+            </if>
+            <if test="userId != null  and userId != ''">
+                and (a.user_id = #{userId} or a.user_id is null)
+                and validity_end_time &gt;= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
+            </if>
+        </where>
+        order by validity_start_time desc
+    </sql>
+
+    <select id="selectAnnouncementList" parameterType="Announcement" resultMap="AnnouncementResult">
+        <include refid="selectList"/>
+    </select>
+    
+    <select id="selectAnnouncementById" parameterType="string" resultMap="AnnouncementResult">
+        select a.id,
+               a.announcement_title,
+               a.announcement_body,
+               a.validity_start_time,
+               a.validity_end_time,
+               a.announcement_img,
+               a.user_id,
+               uc.nick_name as create_by,
+               a.create_time,
+               uu.nick_name as update_by,
+               a.update_time
+        from jnb_announcement a
+        left join sys_user uc on a.create_by = uc.user_id
+        left join sys_user uu on a.update_by = uu.user_id
+        where id = #{id}
+    </select>
+        
+    <insert id="insertAnnouncement" parameterType="Announcement" useGeneratedKeys="true" keyProperty="id">
+        insert into jnb_announcement
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">id,</if>
+            <if test="announcementTitle != null and announcementTitle != ''">announcement_title,</if>
+            <if test="announcementBody != null and announcementBody != ''">announcement_body,</if>
+            <if test="validityStartTime != null">validity_start_time,</if>
+            <if test="validityEndTime != null">validity_end_time,</if>
+            <if test="announcementImg != null">announcement_img,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            del_flag,
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id},</if>
+            <if test="announcementTitle != null and announcementTitle != ''">#{announcementTitle},</if>
+            <if test="announcementBody != null and announcementBody != ''">#{announcementBody},</if>
+            <if test="validityStartTime != null">#{validityStartTime},</if>
+            <if test="validityEndTime != null">#{validityEndTime},</if>
+            <if test="announcementImg != null">#{announcementImg},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            1,
+         </trim>
+    </insert>
+
+    <update id="updateAnnouncement" parameterType="Announcement">
+        update jnb_announcement
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="announcementTitle != null and announcementTitle != ''">announcement_title = #{announcementTitle},</if>
+            <if test="announcementBody != null and announcementBody != ''">announcement_body = #{announcementBody},</if>
+            <if test="validityStartTime != null">validity_start_time = #{validityStartTime},</if>
+            <if test="validityEndTime != null">validity_end_time = #{validityEndTime},</if>
+            <if test="announcementImg != null">announcement_img = #{announcementImg},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteAnnouncementById" parameterType="string">
+        update jnb_announcement set del_flag = 0 where id = #{id}
+    </update>
+
+    <update id="deleteAnnouncementByIds" parameterType="string">
+        update jnb_announcement set del_flag = 0 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <insert id="readAnnouncement" parameterType="announcementRead">
+        insert into jnb_announcement_read(id, user_id, anno_id, create_time)
+        values(#{id}, #{userId}, #{annoId}, #{createTime})
+    </insert>
+
+    <select id="getNewAnnouncement" parameterType="announcement" resultMap="AnnouncementResult">
+        select * from
+        (<include refid="selectList"/> ) anno_table
+        where read_type = #{readType} limit 3
+    </select>
+</mapper>