添加消息

message/src/main/java/com/zcxk/controller/MessageController.java

@@ -75,6 +75,13 @@ public class MessageController {
 
        return new AjaxMessage<>(ResultStatus.OK,messageService.queryLastMessage(num,type));
     }
+
+    @RequestMapping(value = "queryLastMessageBySceneType", method = RequestMethod.POST)
+    @ApiOperation(value = "查询最新消息")
+    public AjaxMessage<List<Message>> queryLastMessageBySceneType(int num,Integer type, int sceneType) {
+
+        return new AjaxMessage<>(ResultStatus.OK,messageService.queryLastMessage(num,type, sceneType));
+    }
     /**
      * 分页查询
      *

message/src/main/java/com/zcxk/dao/MessageMapper.java

@@ -85,6 +85,8 @@ public interface MessageMapper {
 
     List<Message> queryLastMessage(@Param("num") int num, @Param("id") Integer id, Integer type);
 
+    List<Message> queryLastMessageBySceneType(@Param("num") int num, @Param("id") Integer id, Integer type, @Param("sceneType")Integer sceneType);
+
     List<MessageStatic> queryUnreadMessageStatic(Integer id);
 
     int updateMultiple(RequsetMessageQuery requsetMessageQuery);

message/src/main/java/com/zcxk/service/MessageService.java

@@ -87,5 +87,7 @@ public interface MessageService {
 
     List<Message> queryLastMessage(int num, Integer type);
 
+    List<Message> queryLastMessage(int num, Integer type, Integer sceneType);
+
     int judgingTheMessageJumpPermission(String url, String appId);
 }

message/src/main/java/com/zcxk/service/impl/MessageServiceImpl.java

@@ -9,6 +9,7 @@ import com.zcxk.entity.Message;
 import com.zcxk.model.LoginUser;
 import com.zcxk.service.MessageService;
 import com.zcxk.util.UserUtil;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -177,11 +178,15 @@ public class MessageServiceImpl implements MessageService {
 
     @Override
     public List<Message> queryLastMessage(int num, Integer type) {
-       ;
 
         return messageMapper.queryLastMessage(num, UserUtil.getCurrentUser().getId(),type);
     }
 
+    @Override
+    public List<Message> queryLastMessage(int num, Integer type, Integer sceneType) {
+        return messageMapper.queryLastMessageBySceneType(num, UserUtil.getCurrentUser().getId(),type, sceneType);
+    }
+
     @Override
     public int judgingTheMessageJumpPermission(String url, String appId) {
         int result=-1;

message/src/main/resources/mapper/MessageMapper.xml

@@ -105,22 +105,22 @@
 
     <!-- 新增所有列 -->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into uims_message(id, message_id, message_type, message_content, message_template_id, url, message_status, user_id, channel, title, tenant_id, status, date_create, create_by, update_by, unique_flag, date_update)
-        values ( #{id}, #{messageId}, #{messageType}, #{messageContent}, #{messageTemplateId}, #{url}, #{messageStatus}, #{userId}, #{channel}, #{title}, #{tenantId}, #{status}, #{dateCreate}, #{createBy}, #{updateBy}, #{uniqueFlag}, #{dateUpdate})
+        insert into uims_message(id, message_id, message_type, message_content, message_template_id, url, message_status, user_id, channel, title, tenant_id, status, date_create, create_by, update_by, unique_flag, date_update, scene_type)
+        values ( #{id}, #{messageId}, #{messageType}, #{messageContent}, #{messageTemplateId}, #{url}, #{messageStatus}, #{userId}, #{channel}, #{title}, #{tenantId}, #{status}, #{dateCreate}, #{createBy}, #{updateBy}, #{uniqueFlag}, #{dateUpdate}, #{sceneType})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="batchInsert">
         insert into uims_message(id, message_id, message_type, message_content, message_template_id, url,
         message_status, user_id, channel, title, tenant_id, status, date_create, create_by, update_by, unique_flag,
-        date_update)
+        date_update,scene_type)
         values
         <foreach collection="messages" item="item" index="index" separator=",">
             (
             #{item.id}, #{item.messageId}, #{item.messageType}, #{item.messageContent}, #{item.messageTemplateId},
             #{item.url}, #{item.messageStatus}, #{item.userId}, #{item.channel}, #{item.title}, #{item.tenantId},
             #{item.status}, #{item.dateCreate}, #{item.createBy}, #{item.updateBy}, #{item.uniqueFlag},
-            #{item.dateUpdate} )
+            #{item.dateUpdate},#{item.sceneType})
         </foreach>
     </insert>
 
@@ -260,6 +260,22 @@
         </if>
         order by date_create desc limit #{num}
     </select>
+
+    <select id="queryLastMessageBySceneType" resultType="com.zcxk.entity.Message">
+        select a.date_create,a.message_content,b.short_name,b.path,b.id typeId,a.url,
+        b.type typeName,b.app_id
+        from uims_message a
+        join uims_message_type b
+        on a.message_type=b.id
+        where user_id=#{id} and a.status=1
+        <if test="type!= null">
+            and message_status =0
+        </if>
+        <if test="sceneType!= null">
+            and scene_type = #{sceneType}
+        </if>
+        order by date_create desc limit #{num}
+    </select>
     <select id="queryUnreadMessageStatic" resultType="com.zcxk.Dto.MessageStatic">
          select a.typeId,b.type,a.cn from (select message_type typeId ,
          count(*)cn  from