消息提醒接口开发 短信表新增消息已读、未读字段

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/MsgNoticeDto.java

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+//@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MsgNoticeDto", description="消息提醒")
+public class MsgNoticeDto {
+
+    /**
+     * 消息类型
+     */
+    private String type;
+
+    /**
+     * 消息内容
+     */
+    private String content;
+
+    /**
+     * 消息创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 消息sequenceNbr
+     */
+    private Long sequenceNbr;
+
+
+
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/InstallNoticeMsg.java

@@ -52,4 +52,10 @@ public class InstallNoticeMsg extends BaseEntity {
 	@TableField("send_time")
     private Date sendTime;
 
+    /**
+     * 短信状态：已读、未读
+     */
+    @TableField("is_read")
+    private Boolean isRead;
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/RectifyMsg.java

@@ -52,4 +52,10 @@ public class RectifyMsg extends BaseEntity {
 	@TableField("send_time")
     private Date sendTime;
 
+    /**
+     * 短信状态：已读、未读
+     */
+    @TableField("is_read")
+    private Boolean isRead;
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/RectifyMsgController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.ugp.api.dto.MsgNoticeDto;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -117,4 +118,12 @@ public class RectifyMsgController extends BaseController {
 	public ResponseModel<List<RectifyMsgDto>> selectForList() {
 	    return ResponseHelper.buildResponse(rectifyMsgServiceImpl.queryForRectifyMsgList());
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "消息提醒", notes = "消息提醒")
+	@GetMapping(value = "/msgNotice")
+	public ResponseModel<List<MsgNoticeDto>> msgNotice(@RequestParam Boolean isRead) {
+		return ResponseHelper.buildResponse(rectifyMsgServiceImpl.msgNotice(isRead));
+
+	}
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/RectifyMsgServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.MsgNoticeDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNoticeMsg;
 import com.yeejoin.amos.boot.module.ugp.api.entity.RectifyMsg;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.InstallNoticeMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.InstallNoticeMsgMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.RectifyMsgMapper;
+import com.yeejoin.amos.boot.module.ugp.api.service.IInstallNoticeMsgService;
 import com.yeejoin.amos.boot.module.ugp.api.service.IRectifyMsgService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.RectifyMsgDto;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -31,8 +39,15 @@ public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,
 
     @Autowired
     RectifyMsgMapper rectifyMsgMapper;
+
+    @Autowired
+    OrgServiceImpl orgService;
+    @Autowired
+    InstallNoticeMsgMapper installNoticeMsgMapper;
+
+
     /**
-     * 分页查询
+     * 质量问题整改短信列表查询
      */
     public IPage<RectifyMsgDto> queryForRectifyMsgPage(IPage<RectifyMsgDto> page,String name,String installationUnit) {
         return rectifyMsgMapper.queryForRectifyMsgPage(page,name,installationUnit);
@@ -46,8 +61,45 @@ public class RectifyMsgServiceImpl extends BaseService<RectifyMsgDto,RectifyMsg,
     }
 
     /**
-     * 质量问题整改短信列表查询
+     * 消息提醒
      */
-    
+    @BusinessIdentify
+    public List<MsgNoticeDto> msgNotice(Boolean isRead){
+        LambdaQueryWrapper<InstallNoticeMsg> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InstallNoticeMsg::getTargetPersonId,orgService.getReginParams().getBusinessInfo().getUserSequenceNbr())
+                .eq(InstallNoticeMsg::getIsRead,isRead)
+                .orderByDesc(InstallNoticeMsg::getSendTime);
+        LambdaQueryWrapper<RectifyMsg> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(RectifyMsg::getMsgReceiver,orgService.getReginParams().getBusinessInfo().getUserSequenceNbr())
+                .eq(RectifyMsg::getIsRead,isRead)
+                .orderByDesc(RectifyMsg::getSendTime);
+        List<RectifyMsg> rectifyMsgList = rectifyMsgMapper.selectList(wrapper1);
+        List<InstallNoticeMsg> installNoticeMsgList = installNoticeMsgMapper.selectList(wrapper);
+        List<MsgNoticeDto> msgNoticeDtoList = new ArrayList<>();
+        MsgNoticeDto msgNoticeDto = new MsgNoticeDto();
+        for(InstallNoticeMsg installNoticeMsg : installNoticeMsgList){
+            String contents = installNoticeMsg.getContent();
+            if(!ValidationUtil.isEmpty(contents)){
+                String form = contents.substring(contents.indexOf('【')+1,contents.indexOf("】"));
+                String context = contents.substring(contents.indexOf("】")+1);
+                msgNoticeDto.setType(form);
+                msgNoticeDto.setContent(context);
+            }
+            msgNoticeDto.setCreateDate(installNoticeMsg.getSendTime());
+            msgNoticeDto.setSequenceNbr(installNoticeMsg.getSequenceNbr());
+            msgNoticeDtoList.add(msgNoticeDto);
+        }
+        for(RectifyMsg rectifyMsg : rectifyMsgList){
+            String contents = rectifyMsg.getContent();
+            if(!ValidationUtil.isEmpty(contents)){
+                msgNoticeDto.setType(contents.substring(contents.indexOf('【')+1,contents.indexOf("】")));
+                msgNoticeDto.setContent(contents.substring(contents.indexOf("】")+1));
+            }
+            msgNoticeDto.setCreateDate(rectifyMsg.getSendTime());
+            msgNoticeDto.setSequenceNbr(rectifyMsg.getSequenceNbr());
+            msgNoticeDtoList.add(msgNoticeDto);
+        }
+        return msgNoticeDtoList;
+    }
 
 }
\ No newline at end of file