Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/asking/JnbAskTypeController.java

@@ -97,4 +97,18 @@ public class JnbAskTypeController extends BaseController {
     public R remove(@PathVariable String[] ids) {
         return R.ok(jnbQuestionTypeService.deleteJnbQuestionTypeByIds(ids));
     }
+
+    /*
+    * 小程序-查询类型列表
+    *
+    * @author 韩福成
+    * @date 2024/3/4 10:31
+    */
+    @GetMapping("/typeList")
+    public TableDataInfo typeList(JnbQuestionType jnbQuestionType) {
+        startPage();
+        jnbQuestionType.setWhetherShow("Y");
+        List<JnbQuestionType> list = jnbQuestionTypeService.selectJnbQuestionTypeList(jnbQuestionType);
+        return getDataTable(list);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/highServer/JnbHighServerController.java

@@ -90,4 +90,40 @@ public class JnbHighServerController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids,@PathVariable("type") Integer type) {
         return toAjax(jnbHighServerService.deleteJnbHighServerByIds(ids,type));
     }
+
+    /**
+     * 小程序获取直播带货列表
+     */
+    @GetMapping("/liveBroadcastList")
+    public TableDataInfo getLiveBroadcast(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getLiveBroadcast(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取直播带货详情
+     */
+    @GetMapping("/liveBroadcastDetails/{id}")
+    public AjaxResult liveBroadcastDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.liveBroadcastDetails(id));
+    }
+
+    /**
+     * 小程序获取生活服务列表
+     */
+    @GetMapping("/lifeServicesList")
+    public TableDataInfo getLifeServices(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getLifeServices(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取生活服务详情
+     */
+    @GetMapping("/lifeServicesDetails/{id}")
+    public AjaxResult lifeServicesDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.lifeServicesDetails(id));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/information/InformationController.java

@@ -3,7 +3,9 @@ package com.ruoyi.web.controller.information;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.github.pagehelper.Page;
 import com.sooka.jnb.information.domain.Information;
+import com.sooka.jnb.information.domain.InformationUni;
 import com.sooka.jnb.information.service.InformationService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,24 @@ public class InformationController extends BaseController
     private InformationService informationService;
 
     /**
+     * 点赞
+     */
+    @PostMapping("/like")
+    public AjaxResult like(Information information){
+        return toAjax(informationService.likeById(information));
+    }
+
+
+    /**
+     * 浏览
+     */
+    @PostMapping("/watch")
+    public AjaxResult watchById(Information information){
+        return toAjax(informationService.watchById(information));
+    }
+
+
+    /**
      * 查询资讯列表
      */
 //    @PreAuthorize("@ss.hasPermi('jnb:information:list')")
@@ -64,11 +84,9 @@ public class InformationController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
     @GetMapping("/listWxs")
-    public TableDataInfo listWxs(Information information)
+    public TableDataInfo listWxs(Information information, Integer pageNum,Integer pageSize)
     {
-        startPage();
-        List<Information> list = informationService.selectInformationListWxs(information);
-        return getDataTable(list);
+        return informationService.selectInformationListWxs(information,pageNum,pageSize);
     }
 
 
@@ -94,7 +112,15 @@ public class InformationController extends BaseController
     {
         return success(informationService.selectInformationById(id,type));
     }
-
+    /**
+     * 获取资讯详细信息-小程序
+     */
+//    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
+    @GetMapping(value = "/uniApp/{id}/{type}")
+    public AjaxResult getInfoUniApp(@PathVariable("id") Long id,@PathVariable("type") Integer type)
+    {
+        return success(informationService.selectInformationByIdgetInfoUniApp(id,type));
+    }
     /**
      * 新增资讯
      */
@@ -105,7 +131,12 @@ public class InformationController extends BaseController
     {
         return toAjax(informationService.insertInformationServer(information));
     }
-
+    @Log(title = "新增资讯-小程序", businessType = BusinessType.INSERT)
+    @PostMapping("/uniApp")
+    public AjaxResult adduniApp(@RequestBody InformationUni information)
+    {
+        return toAjax(informationService.insertInformationServerUni(information));
+    }
     /**
      * 修改资讯
      */
@@ -116,7 +147,12 @@ public class InformationController extends BaseController
     {
         return toAjax(informationService.updateInformation(information));
     }
-
+    @Log(title = "修改资讯", businessType = BusinessType.UPDATE)
+    @PutMapping("/uniApp")
+    public AjaxResult editUniApp(@RequestBody InformationUni information)
+    {
+        return toAjax(informationService.updateInformationUni(information));
+    }
     /**
      * 删除资讯
      */

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));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/my/JnbNameAuthenticationController.java

@@ -88,4 +88,16 @@ public class JnbNameAuthenticationController extends BaseController {
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(jnbNameAuthenticationService.deleteJnbNameAuthenticationByIds(ids));
     }
+
+    /*
+    * 小程序-提交实名认证
+    *
+    * @author 韩福成
+    * @date 2024/3/4 14:21
+    */
+    @Log(title = "实名认证", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/appletAdd")
+    public AjaxResult appletAdd(@RequestBody JnbNameAuthentication jnbNameAuthentication) {
+        return toAjax(jnbNameAuthenticationService.insertJnbNameAuthentication(jnbNameAuthentication));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/my/JnbOfficialAuthenticationController.java

@@ -95,4 +95,16 @@ public class JnbOfficialAuthenticationController extends BaseController {
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(jnbOfficialAuthenticationService.deleteJnbOfficialAuthenticationByIds(ids));
     }
+
+    /*
+    * 小程序-官方认证提交
+    *
+    * @author 韩福成
+    * @date 2024/3/4 16:24
+    */
+    @Log(title = "官方认证", businessType = BusinessType.INSERT)
+    @PostMapping("/appletAdd")
+    public AjaxResult appletAdd(@RequestBody JnbOfficialAuthentication jnbOfficialAuthentication) {
+        return toAjax(jnbOfficialAuthenticationService.insertJnbOfficialAuthentication(jnbOfficialAuthentication));
+    }
 }

sooka-jnb/src/main/java/com/sooka/jnb/handleAffairs/domain/TopicType.java

@@ -7,6 +7,8 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * 主题类型配置对象 jnb_topic_type
@@ -33,7 +35,9 @@ public class TopicType extends BaseEntity
 
     /** 办理对象（字典值：个人or法人） */
     @Excel(name = "办理对象", readConverterExp = "字=典值：个人or法人",dictType = "object_application")
-    @NotBlank(message = "办理对象不能为空")
     private String objectOfHandling;
 
+    @NotEmpty(message = "办理对象不能为空")
+    private List<String> objectOfHandlingArray;
+
 }

sooka-jnb/src/main/java/com/sooka/jnb/handleAffairs/service/impl/TopicTypeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.jnb.handleAffairs.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -29,8 +30,9 @@ public class TopicTypeServiceImpl implements ITopicTypeService
      */
     @Override
     public TopicType selectTopicTypeById(Long id)
-    {
-        return topicTypeMapper.selectTopicTypeById(id);
+    {   TopicType topicType = topicTypeMapper.selectTopicTypeById(id);
+        topicType.setObjectOfHandlingArray(Arrays.asList(topicType.getObjectOfHandling().split(",")));
+        return topicType;
     }
 
     /**
@@ -41,8 +43,11 @@ public class TopicTypeServiceImpl implements ITopicTypeService
      */
     @Override
     public List<TopicType> selectTopicTypeList(TopicType topicType)
-    {
-        return topicTypeMapper.selectTopicTypeList(topicType);
+    {   List<TopicType> list = topicTypeMapper.selectTopicTypeList(topicType);
+        list.forEach(e->{
+            e.setObjectOfHandlingArray(Arrays.asList(e.getObjectOfHandling().split(",")));
+        });
+        return list;
     }
 
     /**
@@ -57,6 +62,7 @@ public class TopicTypeServiceImpl implements ITopicTypeService
         topicType.setCreateTime(DateUtils.getNowDate());
         topicType.setCreateBy(SecurityUtils.getUserId().toString());
         topicType.setDelFlag("0");
+        topicType.setObjectOfHandling(String.join(",",topicType.getObjectOfHandlingArray()));
         return topicTypeMapper.insertTopicType(topicType);
     }
 
@@ -71,6 +77,7 @@ public class TopicTypeServiceImpl implements ITopicTypeService
     {
         topicType.setUpdateTime(DateUtils.getNowDate());
         topicType.setUpdateBy(SecurityUtils.getUserId().toString());
+        topicType.setObjectOfHandling(String.join(",",topicType.getObjectOfHandlingArray()));
         return topicTypeMapper.updateTopicType(topicType);
     }
 

sooka-jnb/src/main/java/com/sooka/jnb/highServer/mapper/JnbHighServerImgMapper.java

@@ -15,4 +15,6 @@ public interface JnbHighServerImgMapper {
     int saveJnbHighServerImg(List<JnbHighServerImg> saveList);
 
     String selectAll(@Param("serverId") Long serverId, @Param("type")  Integer type);
+
+    List<String> selectAllList(@Param("serverId") Long serverId, @Param("type")  Integer type);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/mapper/JnbHighServerMapper.java

@@ -60,4 +60,12 @@ public interface JnbHighServerMapper {
      * @return 结果
      */
     public int deleteJnbHighServerByIds(@Param("ids") Long[] ids, @Param("type")  Integer type);
+
+    List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO liveBroadcastDetails(Long id);
+
+    List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO lifeServicesDetails(Long id);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/service/IJnbHighServerService.java

@@ -59,4 +59,12 @@ public interface IJnbHighServerService {
      * @return 结果
      */
     public int deleteJnbHighServerById(Long id,Integer type);
+
+    List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO liveBroadcastDetails(Long id);
+
+    List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO lifeServicesDetails(Long id);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/service/impl/JnbHighServerServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.sooka.jnb.highServer.domain.JnbHighServer;
 import com.sooka.jnb.highServer.domain.JnbHighServerImg;
@@ -38,8 +39,8 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      * @return 高频服务
      */
     @Override
-    public JnbHighServerVO selectJnbHighServerById(Long id,Integer type) {
-        return jnbHighServerMapper.selectJnbHighServerById(id,type);
+    public JnbHighServerVO selectJnbHighServerById(Long id, Integer type) {
+        return jnbHighServerMapper.selectJnbHighServerById(id, type);
     }
 
     /**
@@ -62,6 +63,7 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertJnbHighServer(JnbHighServerVO jnbHighServerVO) {
+        jnbHighServerVO.setCreateBy(SecurityUtils.getUsername());
         jnbHighServerVO.setCreateTime(DateUtils.getNowDate());
         jnbHighServerMapper.insertJnbHighServer(jnbHighServerVO);
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
@@ -88,10 +90,11 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateJnbHighServer(JnbHighServerVO jnbHighServerVO) {
+        jnbHighServerVO.setUpdateBy(SecurityUtils.getUsername());
         jnbHighServerVO.setUpdateTime(DateUtils.getNowDate());
         jnbHighServerMapper.updateJnbHighServer(jnbHighServerVO);
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
-            jnbHighServerImgMapper.deleteJnbHighServerByServerId(jnbHighServerVO.getId(),jnbHighServerVO.getType());
+            jnbHighServerImgMapper.deleteJnbHighServerByServerId(jnbHighServerVO.getId(), jnbHighServerVO.getType());
             List<String> imgUrlArray = Arrays.asList(jnbHighServerVO.getImgUrlList().split(","));
             List<JnbHighServerImg> saveList = new ArrayList<>();
             for (int i = 0; i < imgUrlArray.size(); i++) {
@@ -114,9 +117,9 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteJnbHighServerByIds(Long[] ids,Integer type) {
-        jnbHighServerImgMapper.deleteJnbHighServerByServerIds(ids,type);
-        return jnbHighServerMapper.deleteJnbHighServerByIds(ids,type);
+    public int deleteJnbHighServerByIds(Long[] ids, Integer type) {
+        jnbHighServerImgMapper.deleteJnbHighServerByServerIds(ids, type);
+        return jnbHighServerMapper.deleteJnbHighServerByIds(ids, type);
     }
 
     /**
@@ -126,7 +129,47 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      * @return 结果
      */
     @Override
-    public int deleteJnbHighServerById(Long id,Integer type) {
-        return jnbHighServerMapper.deleteJnbHighServerById(id,type);
+    public int deleteJnbHighServerById(Long id, Integer type) {
+        return jnbHighServerMapper.deleteJnbHighServerById(id, type);
+    }
+
+    @Override
+    public List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getLiveBroadcast(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public JnbHighServerVO liveBroadcastDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.liveBroadcastDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        return jnbHighServerVO;
+    }
+
+    @Override
+    public List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getLifeServices(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public JnbHighServerVO lifeServicesDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.lifeServicesDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        return jnbHighServerVO;
     }
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/vo/JnbHighServerVO.java

@@ -91,4 +91,9 @@ public class JnbHighServerVO {
      */
      private String imgUrlList;
 
+     /**
+     * 高频服务图片路径集合
+     */
+     private List<String> pictureList;
+
 }

sooka-jnb/src/main/java/com/sooka/jnb/information/domain/Information.java

@@ -60,4 +60,7 @@ public class Information extends BaseEntity
 
     @TableField(exist = false)
     private String imgUrlList;
+
+    @TableField(exist = false)
+    private String nickName;
 }

sooka-jnb/src/main/java/com/sooka/jnb/information/domain/InformationUni.java

@@ -0,0 +1,56 @@
+package com.sooka.jnb.information.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 资讯
+ * 
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+@Data
+public class InformationUni extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    @NotBlank(message = "标题不能为空")
+    private String titleName;
+
+    /** 正文 */
+    @Excel(name = "正文",width = 100)
+    @NotBlank(message = "正文不能为空")
+    private String textDetails;
+
+    /** 是否政策推荐 */
+    @Excel(name = "是否政策推荐", readConverterExp = "1=是,0=否")
+    private Integer isGovernment;
+
+    /** 是否置顶 */
+    @Excel(name = "是否置顶", readConverterExp = "1=是,0=否")
+    private Integer isTop;
+
+    /** 点赞数 */
+    @Excel(name = "点赞数")
+    private Long likeNum;
+
+    /** 浏览数 */
+    @Excel(name = "浏览数")
+    private Long watchNum;
+
+    private Integer type;
+
+    @TableField(exist = false)
+    private List<String> urls;
+
+}

sooka-jnb/src/main/java/com/sooka/jnb/information/mapper/InformationMapper.java

@@ -1,5 +1,6 @@
 package com.sooka.jnb.information.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sooka.jnb.information.domain.Information;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,7 +67,7 @@ public interface InformationMapper
      * @param information 按照时间，点赞，浏览 排序
      * @return 结果
      */
-    List<Information> selectInformationListWxs(Information information);
+    List<Information> selectInformationListWxs(@Param("obj") Information information, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
      * 置顶，政策推荐 3个
@@ -74,4 +75,7 @@ public interface InformationMapper
      * @return 结果
      */
     List<Information> selectInformationListWx(Information information);
+
+    int updateInformationLike(Information information);
+    int updateInformationWatch(Information information);
 }

sooka-jnb/src/main/java/com/sooka/jnb/information/service/InformationService.java

@@ -1,6 +1,9 @@
 package com.sooka.jnb.information.service;
 
+import com.github.pagehelper.Page;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.sooka.jnb.information.domain.Information;
+import com.sooka.jnb.information.domain.InformationUni;
 
 import java.util.List;
 
@@ -20,6 +23,7 @@ public interface InformationService
      * @return 资讯
      */
     public Information selectInformationById(Long id,Integer type);
+    public Information selectInformationByIdgetInfoUniApp(Long id,Integer type);
 
     /**
      * 查询资讯服务列表
@@ -39,6 +43,13 @@ public interface InformationService
      * @return 结果
      */
     public int insertInformationServer(Information information);
+    /**
+     * 新增资讯-小程序
+     *
+     * @param information 资讯
+     * @return 结果
+     */
+    public int insertInformationServerUni(InformationUni information);
 
     /**
      * 修改资讯
@@ -47,6 +58,13 @@ public interface InformationService
      * @return 结果
      */
     public int updateInformation(Information information);
+    /**
+     * 修改资讯-小程序
+     *
+     * @param information 资讯
+     * @return 结果
+     */
+    public int updateInformationUni(InformationUni information);
 
     /**
      * 批量删除资讯
@@ -56,5 +74,8 @@ public interface InformationService
      */
     public int deleteInformationByIds(Long[] ids,Integer type);
 
-    List<Information> selectInformationListWxs(Information information);
+    TableDataInfo selectInformationListWxs(Information information, Integer pageNum, Integer pageSize);
+
+    int likeById(Information information);
+    int watchById(Information information);
 }

sooka-jnb/src/main/java/com/sooka/jnb/information/service/impl/InformationServiceImpl.java

@@ -3,12 +3,16 @@ package com.sooka.jnb.information.service.impl;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.github.pagehelper.Page;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.sooka.jnb.highServer.domain.JnbHighServerImg;
 import com.sooka.jnb.highServer.mapper.JnbHighServerImgMapper;
 import com.sooka.jnb.information.domain.Information;
+import com.sooka.jnb.information.domain.InformationUni;
 import com.sooka.jnb.information.mapper.InformationMapper;
 import com.sooka.jnb.information.service.InformationService;
 import org.springframework.beans.BeanUtils;
@@ -38,7 +42,15 @@ public class InformationServiceImpl implements InformationService
         information.setImgUrlList(jnbHighServerImgMapper.selectAll(id,information.getType()));
         return information;
     }
-
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Information selectInformationByIdgetInfoUniApp(Long id,Integer type)
+    {
+        Information information = informationMapper.selectInformationById(id,type);
+        information.setUrls(jnbHighServerImgMapper.selectAllList(id,information.getType()));
+        informationMapper.updateInformationWatch(information);
+        return information;
+    }
 
     @Override
     public List<Information> selectInformationList(Information information)
@@ -52,9 +64,28 @@ public class InformationServiceImpl implements InformationService
         return informationMapper.selectInformationListWx(information);
     }
     @Override
-    public List<Information> selectInformationListWxs(Information information)
+    public TableDataInfo selectInformationListWxs(Information information, Integer pageNum, Integer pageSize)
     {
-        return informationMapper.selectInformationListWxs(information);
+//        List<Information> result = informationMapper.selectInformationListWxs(information,pageNum, pageSize);
+        List<Information> toolForAbsenteeism = informationMapper.selectInformationListWxs(information,pageNum, pageSize);
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setRows(toolForAbsenteeism.stream() .skip((long) (pageNum - 1) * pageSize)
+                .limit(pageSize)
+                .collect(Collectors.toList()));
+        tableDataInfo.setTotal(toolForAbsenteeism.size());
+        tableDataInfo.setCode(200);
+        tableDataInfo.setMsg("查询成功");
+        return tableDataInfo;
+    }
+
+    @Override
+    public int likeById(Information information) {
+       return informationMapper.updateInformationLike(information);
+    }
+
+    @Override
+    public int watchById(Information information) {
+       return informationMapper.updateInformationWatch(information);
     }
 
 
@@ -66,8 +97,8 @@ public class InformationServiceImpl implements InformationService
         entity.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         int i = informationMapper.insertInformation(entity);
         if (i>0){
-            List<String> imgUrlList = Arrays.asList(entity.getImgUrlList().split(","));
-            if (!ObjectUtils.isEmpty(imgUrlList)){
+            if (!ObjectUtils.isEmpty(entity.getImgUrlList())){
+                List<String> imgUrlList = Arrays.asList(entity.getImgUrlList().split(","));
                 List<JnbHighServerImg> imgList = new ArrayList<>();
                 imgUrlList.forEach(a->{
                     JnbHighServerImg serverImg = new JnbHighServerImg();
@@ -87,13 +118,41 @@ public class InformationServiceImpl implements InformationService
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public int insertInformationServerUni(InformationUni entity)
+    {
+        entity.setCreateTime(DateUtils.getNowDate());
+        entity.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
+        Information obj = new Information();
+        BeanUtils.copyProperties(entity,obj);
+        int i = informationMapper.insertInformation(obj);
+        if (i>0){
+            if (!ObjectUtils.isEmpty(entity.getUrls())){
+                List<JnbHighServerImg> imgList = new ArrayList<>();
+                entity.getUrls().forEach(a->{
+                    JnbHighServerImg serverImg = new JnbHighServerImg();
+                    serverImg.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
+                    serverImg.setCreateTime(DateUtils.getNowDate());
+                    serverImg.setServerId(entity.getId());
+                    serverImg.setImgUrl(a);
+                    serverImg.setType(entity.getType());
+                    imgList.add(serverImg);
+                });
+                jnbHighServerImgMapper.saveJnbHighServerImg(imgList);
+            }
+        }
+        return i;
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public int updateInformation(Information entity)
     {
         entity.setUpdateTime(DateUtils.getNowDate());
         entity.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         int i = informationMapper.updateInformation(entity);
-        List<String> imgUrlList = Arrays.asList(entity.getImgUrlList().split(","));
-            if (!ObjectUtils.isEmpty(imgUrlList)){
+        if (!ObjectUtils.isEmpty(entity.getImgUrlList())){
+            List<String> imgUrlList = Arrays.asList(entity.getImgUrlList().split(","));
                 List<JnbHighServerImg> imgList = new ArrayList<>();
                 jnbHighServerImgMapper.deleteJnbHighServerByServerId(entity.getId(),entity.getType());
                 imgUrlList.forEach(a->{
@@ -110,6 +169,31 @@ public class InformationServiceImpl implements InformationService
         return i;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateInformationUni(InformationUni entity)
+    {
+        entity.setUpdateTime(DateUtils.getNowDate());
+        entity.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
+        Information obj = new Information();
+        BeanUtils.copyProperties(entity,obj);
+        int i = informationMapper.updateInformation(obj);
+        if (!ObjectUtils.isEmpty(entity.getUrls())){
+            List<JnbHighServerImg> imgList = new ArrayList<>();
+            jnbHighServerImgMapper.deleteJnbHighServerByServerId(entity.getId(),entity.getType());
+            entity.getUrls().forEach(a->{
+                JnbHighServerImg serverImg = new JnbHighServerImg();
+                serverImg.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
+                serverImg.setCreateTime(DateUtils.getNowDate());
+                serverImg.setServerId(entity.getId());
+                serverImg.setImgUrl(a);
+                serverImg.setType(entity.getType());
+                imgList.add(serverImg);
+            });
+            jnbHighServerImgMapper.saveJnbHighServerImg(imgList);
+        }
+        return i;
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)

sooka-jnb/src/main/java/com/sooka/jnb/matter/domin/Matter.java

@@ -24,6 +24,8 @@ public class Matter extends BaseEntity {
         private  String  picture;
          //审核状态
         private  String examine;
+        //内容
+        private  String content;
     }
 
 

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();
+    }
+}

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;
+}

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);
+}

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);
+}

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;
+    }
+}

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);
+    }
+}

sooka-jnb/src/main/resources/mapper/highServer/JnbHighServerImgMapper.xml

@@ -28,4 +28,13 @@
             and type = #{type}
         </if>
     </select>
+    <select id="selectAllList" resultType="java.lang.String">
+        select img_url from jnb_high_server_img where del_flag = 0
+        <if test="serverId != null and serverId !=''">
+           and server_id = #{serverId}
+        </if>
+        <if test="type != null and type !=''">
+            and type = #{type}
+        </if>
+    </select>
 </mapper>

sooka-jnb/src/main/resources/mapper/highServer/JnbHighServerMapper.xml

@@ -27,7 +27,9 @@
                jhs.update_by,
                jhs.update_time,
                GROUP_CONCAT(jhsi.id)       AS imgId,
-               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList
+               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
         FROM jnb_high_server jhs
                  left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
         where jhs.del_flag = 0 and jhs.type = #{type}
@@ -98,4 +100,78 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="getLiveBroadcast" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+        title_name,
+        text_details,
+        jhs.type as type,
+        jhs.create_by,
+        jhs.create_time,
+        jhs.update_by,
+        jhs.update_time,
+        GROUP_CONCAT(jhsi.id)       AS imgId,
+        GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+        jhs.like_num,
+        jhs.watch_num
+        FROM jnb_high_server jhs
+        left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 5
+        GROUP BY jhs.id
+    </select>
+    <select id="liveBroadcastDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+        title_name,
+        text_details,
+        jhs.type as type,
+        jhs.create_by,
+        jhs.create_time,
+        jhs.update_by,
+        jhs.update_time,
+        GROUP_CONCAT(jhsi.id) AS imgId,
+        GROUP_CONCAT(jhsi.img_url) AS imgUrlList,
+        jhs.like_num,
+        jhs.watch_num
+        FROM jnb_high_server jhs
+        left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 5 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
+
+    <select id="getLifeServices" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id)       AS imgId,
+               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 6
+        GROUP BY jhs.id
+    </select>
+    <select id="lifeServicesDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id) AS imgId,
+               GROUP_CONCAT(jhsi.img_url) AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 6 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
 </mapper>

sooka-jnb/src/main/resources/mapper/information/InformationMapper.xml

@@ -16,6 +16,7 @@
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="nickName" column="nick_name"/>
         <result property="imgUrlList" column="imgUrlList"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
@@ -84,7 +85,7 @@
         </collection>
     </resultMap>
 
-    <select id="selectInformationListWxs" parameterType="Information" resultMap="InformationResult1">
+    <select id="selectInformationListWxs"  resultMap="InformationResult1">
         SELECT
         a.id,
         a.title_name,
@@ -101,19 +102,17 @@
         a.watch_num,
         i.img_url AS url
         FROM jnb_high_server AS a
-        LEFT JOIN jnb_high_server_img AS i ON a.id = i.server_id AND i.del_flag = 0 AND i.type = #{type}
-        <where>
-            <if test="titleName != null and titleName != ''">AND a.title_name LIKE CONCAT('%', #{titleName}, '%')</if>
-            <if test="type != null and type != ''">AND a.type = #{type}</if>
-            <if test="isGovernment != null and isGovernment != ''">AND a.is_government = #{isGovernment}</if>
-            <if test="isTop != null and isTop != ''">AND a.is_top = #{isTop}</if>
-            AND a.del_flag = 0
-        </where>
+        LEFT JOIN jnb_high_server_img AS i ON a.id = i.server_id AND i.del_flag = 0 AND i.type = #{obj.type}
+        where a.del_flag = 0
+            <if test="obj.titleName != null  and obj.titleName != ''">and a.title_name like concat('%', #{obj.titleName}, '%')</if>
+            <if test="obj.type != null and obj.type != ''">and a.type = #{obj.type}</if>
+            <if test="obj.isGovernment != null and obj.isGovernment != ''">and a.is_government = #{obj.isGovernment}</if>
+            <if test="obj.isTop != null and obj.isTop != ''">and a.is_top = #{obj.isTop}</if>
         <choose>
-            <when test="flag == 'like'">
+            <when test="obj.flag == 'like'">
                 ORDER BY a.like_num DESC
             </when>
-            <when test="flag == 'watch'">
+            <when test="obj.flag == 'watch'">
                 ORDER BY a.watch_num DESC
             </when>
             <otherwise>
@@ -135,8 +134,23 @@
     </select>
 
     <select id="selectInformationById" resultMap="InformationResult">
-        <include refid="selectInformationVo"/>
-        where id = #{id} and type = #{type}
+        select a.id,
+               a.title_name,
+               a.text_details,
+               a.type,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               a.del_flag,
+               a.is_government,
+               a.is_top,
+               a.like_num,
+               a.watch_num,
+               b.nick_name
+        from jnb_high_server as a
+        left join sys_user as b on b.user_id = a.create_by
+        where a.id = #{id} and a.type = #{type}
     </select>
 
     <insert id="insertInformation" parameterType="Information" useGeneratedKeys="true" keyProperty="id">
@@ -173,6 +187,18 @@
         WHERE id = #{id} and type = #{type}
     </update>
 
+    <update id="updateInformationLike">
+        UPDATE jnb_high_server
+        SET like_num = like_num +1
+        WHERE id = #{id} and type = #{type}
+    </update>
+
+    <update id="updateInformationWatch">
+        UPDATE jnb_high_server
+        SET watch_num = watch_num+1
+        WHERE id = #{id} and type = #{type}
+    </update>
+
     <delete id="deleteInformationByIds" >
         UPDATE jnb_high_server
         SET del_flag = 2

sooka-jnb/src/main/resources/mapper/matter/matterMapper.xml

@@ -14,11 +14,12 @@
         <result property="phone"    column="phone"    />
         <result property="picture"    column="picture"    />
         <result property="examine"    column="examine"    />
+        <result property="content"    column="content"    />
     </resultMap>
 
 
     <select id="selectSysMatterVo"  resultMap="MatterResult">
-        select  id,title, type, department,operation,address,phone,picture,examine from jnb_list_of_matters
+        select  id,title, type, department,operation,address,phone,picture,examine ,content from jnb_list_of_matters
         <where>
             <if test="title != null and title !=''">
                 AND title LIKE '%' #{title} '%'
@@ -30,14 +31,14 @@
     </select>
 
     <select id="selectSysMatterById"  resultMap="MatterResult">
-       select  id ,title, type, department,operation,address,phone,picture,examine from jnb_list_of_matters
+       select  id ,title, type, department,operation,address,phone,picture,examine,content from jnb_list_of_matters
         where id = #{id}
     </select>
 
     <insert id="insertSysMatter">
        INSERT INTO
-           jnb_list_of_matters (title, type, department,operation,address,phone,picture )
-        VALUE (#{title},#{type},#{department},#{operation},#{address},#{phone},#{picture} )
+           jnb_list_of_matters (title, type, department,operation,address,phone,picture,content )
+        VALUE (#{title},#{type},#{department},#{operation},#{address},#{phone},#{picture},#{content} )
     </insert>
 
     <update id="updateSysMatter" parameterType="SysDept">
@@ -50,6 +51,7 @@
             <if test="address != null">address = #{address},</if>
             <if test="picture != null">picture = #{picture},</if>
             <if test="phone != null">phone = #{phone},</if>
+            <if test="content != null">content = #{content},</if>
         </trim>
         where id = #{id}
     </update>

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>