代码更新

src/main/java/com/migao/entity/po/DemandLibrary.java

@@ -30,7 +30,7 @@ public class DemandLibrary implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
-    @Column(columnDefinition = "int(11) comment '子项目id'")
+    @Column(columnDefinition = "int(11) comment '父项目id'")
     private Integer subProjectId;
 
     @Column(columnDefinition = "int(11) comment '需求编号'")

src/main/java/com/migao/entity/vo/req/MessageQueryReq.java

@@ -0,0 +1,18 @@
+package com.migao.entity.vo.req;
+
+import com.migao.config.response.BasePageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author dingsong
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class MessageQueryReq extends BasePageRequest {
+    @ApiModelProperty(value = "关键字")
+    private String key;
+}

src/main/java/com/migao/entity/vo/res/DemandAttachmentRes.java

@@ -0,0 +1,30 @@
+package com.migao.entity.vo.res;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author dingsong
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Data
+public class DemandAttachmentRes {
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @ApiModelProperty(value = "附件名称")
+    private String name;
+
+    @ApiModelProperty(value = "提交人")
+    private String submitter;
+
+    @ApiModelProperty(value = "提交时间")
+    private LocalDateTime createTime;
+}

src/main/java/com/migao/entity/vo/res/DemandLibraryQueryRes.java

@@ -0,0 +1,58 @@
+package com.migao.entity.vo.res;
+
+import com.migao.entity.po.DemandAttachment;
+import com.migao.entity.po.DemandLibrary;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author dingsong
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Data
+public class DemandLibraryQueryRes {
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @ApiModelProperty(value = "需求编号")
+    private String demandNumber;
+
+    @ApiModelProperty(value = "需求名称")
+    private String demandName;
+
+    @ApiModelProperty(value = "需求内容")
+    private String demandContent;
+
+    @ApiModelProperty(value = "需求分类")
+    private String demandClass;
+
+    @ApiModelProperty(value = "提交单位")
+    private String unitName;
+
+    @ApiModelProperty(value = "需求状态")
+    private String demandStatus;
+
+    @ApiModelProperty(value = "需求进度")
+    private BigDecimal demandSchedule;
+
+    @ApiModelProperty(value = "关联项目")
+    private String associatedProjectId;
+
+    @ApiModelProperty(value = "提交人")
+    private String submitter;
+
+    @ApiModelProperty(value = "附件")
+    private List<DemandAttachmentRes> demandA = new ArrayList<>();
+
+    @ApiModelProperty(value = "子项目")
+   private  List<DemandLibrary> demandB = new ArrayList<>();
+}

src/main/java/com/migao/entity/vo/res/MessageQueryRes.java

@@ -0,0 +1,43 @@
+package com.migao.entity.vo.res;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author dingsong
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Data
+public class MessageQueryRes {
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @ApiModelProperty(value = "消息序号")
+    private Integer messageNumber;
+
+    @ApiModelProperty(value = "标题")
+    private String name;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "发送人")
+    private String sendUser;
+
+    @ApiModelProperty(value = "接收人")
+    private String acceptUser;
+
+    @ApiModelProperty(value = "设计项目")
+    private String designProject;
+
+    @ApiModelProperty(value = "通知类型")
+    private String messageType;
+
+    @ApiModelProperty(value = "读取状态")
+    private String status;
+}

src/main/java/com/migao/service/DemandAttachmentService.java

@@ -1,10 +1,17 @@
 package com.migao.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.migao.config.response.ResponseBean;
 import com.migao.entity.po.DemandAttachment;
 
 /**
  * @author dingsong
  */
 public interface DemandAttachmentService extends IService<DemandAttachment> {
+    /**
+     * 删
+     * @param id
+     * @return
+     */
+    ResponseBean<?> deleteById(String id);
 }

src/main/java/com/migao/service/DemandLibraryService.java

@@ -9,6 +9,7 @@ import com.migao.entity.vo.req.DemandLibraryInsertReq;
 import com.migao.entity.vo.req.DemandLibraryQueryReq;
 import com.migao.entity.vo.req.DemandLibraryUpdateReq;
 import com.migao.entity.vo.res.DemandLibraryPageQueryRes;
+import com.migao.entity.vo.res.DemandLibraryQueryRes;
 
 /**
  * @author dingsong
@@ -26,7 +27,7 @@ public interface DemandLibraryService extends IService<DemandLibrary> {
      * @param id
      * @return
      */
-    ResponseBean<?> deleteById(Integer id);
+    ResponseBean<?> deleteById(String id);
 
     /**
      * 改
@@ -54,5 +55,21 @@ public interface DemandLibraryService extends IService<DemandLibrary> {
      * @param demandLibraryQuery
      * @return
      */
-    ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQuery(DemandLibraryQueryReq demandLibraryQuery);
+    ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQueryOne(DemandLibraryQueryReq demandLibraryQuery);
+
+    /**
+     * 分页模糊查询当前用户需求数据
+     * @param demandLibraryQuery
+     * @return
+     */
+    ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQueryOneById(DemandLibraryQueryReq demandLibraryQuery);
+
+    /**
+     * 通过id查询单条数据
+     * @param id
+     * @return
+     */
+    ResponseBean<DemandLibraryQueryRes> findById(String id);
+
+
 }

src/main/java/com/migao/service/MessageService.java

@@ -1,10 +1,57 @@
 package com.migao.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.migao.config.response.BasePageRequest;
+import com.migao.config.response.PageBeanOne;
+import com.migao.config.response.ResponseBean;
 import com.migao.entity.po.Message;
+import com.migao.entity.vo.req.MessageQueryReq;
+import com.migao.entity.vo.res.MessageQueryRes;
 
 /**
  * @author dingsong
  */
 public interface MessageService extends IService<Message> {
+
+    /**
+     * 分页查询所有消息
+     * @param basePageRequest 页数
+     * @return
+     */
+    ResponseBean<PageBeanOne<MessageQueryRes>> pageQuery(BasePageRequest basePageRequest);
+
+    /**
+     * 分页查询当前用户消息
+     * @param basePageRequest 页数
+     * @return
+     */
+    ResponseBean<PageBeanOne<MessageQueryRes>> pageQueryById(BasePageRequest basePageRequest);
+
+    /**
+     * 通过id查询单个消息
+     * @param id 消息id
+     * @return
+     */
+    ResponseBean<MessageQueryRes> pageQueryOne(String id);
+
+    /**
+     * 通过id更新读取状态
+     * @param id 消息id
+     * @return
+     */
+    ResponseBean<?> updateById(String id);
+
+    /**
+     * 分页模糊查询所有数据
+     * @param messageQueryReq 关键字
+     * @return
+     */
+    ResponseBean<PageBeanOne<MessageQueryRes>> pageQueryTwo(MessageQueryReq messageQueryReq);
+
+    /**
+     * 分页模糊查询当前用户数据
+     * @param messageQueryReq 关键字
+     * @return
+     */
+    ResponseBean<PageBeanOne<MessageQueryRes>> pageQueryTwoById(MessageQueryReq messageQueryReq);
 }

src/main/java/com/migao/service/impl/DemandAttachmentServiceImpl.java

@@ -1,13 +1,18 @@
 package com.migao.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.migao.config.response.ResponseBean;
+import com.migao.config.response.ResponseBuilder;
 import com.migao.entity.po.DemandAttachment;
 import com.migao.mapper.DemandAttachmentMapper;
 import com.migao.service.DemandAttachmentService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+
 /**
  * @author dingsong
  */
@@ -15,4 +20,17 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(rollbackFor = {Exception.class})
 public class DemandAttachmentServiceImpl extends ServiceImpl<DemandAttachmentMapper, DemandAttachment> implements DemandAttachmentService {
+    @Resource
+    DemandAttachmentMapper demandA;
+
+    @Override
+    public ResponseBean<?> deleteById(String id) {
+        if(id!=null){
+            Integer idInt = Integer.parseInt(id);
+            DemandAttachment demandAttachment = demandA.selectById(idInt);
+            demandAttachment.setDeleted(1);
+            demandA.updateById(demandAttachment);
+        }
+        return ResponseBuilder.ok();
+    }
 }

src/main/java/com/migao/service/impl/DemandLibraryServiceImpl.java

@@ -12,11 +12,10 @@ import com.migao.entity.po.User;
 import com.migao.entity.vo.req.DemandLibraryInsertReq;
 import com.migao.entity.vo.req.DemandLibraryQueryReq;
 import com.migao.entity.vo.req.DemandLibraryUpdateReq;
+import com.migao.entity.vo.res.DemandAttachmentRes;
 import com.migao.entity.vo.res.DemandLibraryPageQueryRes;
-import com.migao.mapper.DemandAttachmentMapper;
-import com.migao.mapper.DemandLibraryMapper;
-import com.migao.mapper.DictionaryMapper;
-import com.migao.mapper.ProjectMapper;
+import com.migao.entity.vo.res.DemandLibraryQueryRes;
+import com.migao.mapper.*;
 import com.migao.service.DemandLibraryService;
 import com.migao.util.EntityUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +25,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author dingsong
@@ -42,6 +43,8 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
     DictionaryMapper dictionaryMapper;
     @Resource
     ProjectMapper projectMapper;
+    @Resource
+    FileInfoMapper fileInfoMapper;
 
     @Override
     public ResponseBean<?> insert(DemandLibraryInsertReq demandLibrary) {
@@ -71,8 +74,9 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
     }
 
     @Override
-    public ResponseBean<?> deleteById(Integer id) {
-        DemandLibrary dic = demandLibraryMap.selectById(id);
+    public ResponseBean<?> deleteById(String id) {
+        Integer idInt = Integer.parseInt(id);
+        DemandLibrary dic = demandLibraryMap.selectById(idInt);
         dic.setDeleted(1);
         demandLibraryMap.updateById(dic);
         return ResponseBuilder.ok();
@@ -109,6 +113,7 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         size = size == null ? 10 : size <= 0 ? 10 : size;
 
         LambdaQueryWrapper<DemandLibrary> dynamicQuery = Wrappers.<DemandLibrary>lambdaQuery();
+        dynamicQuery.isNull(DemandLibrary::getSubProjectId);
         dynamicQuery.orderByDesc(DemandLibrary::getSubmitTime);
 
         Page<DemandLibrary> all = demandLibraryMap.selectPage(new Page<>(page, size),dynamicQuery);
@@ -148,6 +153,7 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         size = size == null ? 10 : size <= 0 ? 10 : size;
 
         LambdaQueryWrapper<DemandLibrary> dynamicQuery = Wrappers.<DemandLibrary>lambdaQuery();
+        dynamicQuery.isNull(DemandLibrary::getSubProjectId);
         if(user.getId() != null) {
             dynamicQuery.eq(DemandLibrary::getCreateUserId, user.getId());
         }
@@ -178,15 +184,15 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         );
     }
 
-    //暂时
     @Override
-    public ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQuery(DemandLibraryQueryReq demandLibraryQuery) {
+    public ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQueryOne(DemandLibraryQueryReq demandLibraryQuery) {
         Integer page = demandLibraryQuery.getPage();
         page = page == null ? 1 : page <= 0 ? 1 : page;
         Integer size = demandLibraryQuery.getSize();
         size = size == null ? 10 : size <= 0 ? 10 : size;
 
         LambdaQueryWrapper<DemandLibrary> dynamicQuery = Wrappers.<DemandLibrary>lambdaQuery();
+        dynamicQuery.isNull(DemandLibrary::getSubProjectId);
         if(StringUtils.isNotBlank(demandLibraryQuery.getKey())){
             //需求编号
             dynamicQuery.like(DemandLibrary::getDemandNumber,demandLibraryQuery.getKey());
@@ -196,12 +202,134 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
             //需求内容
             LambdaQueryWrapper<DemandLibrary> or2 = or1.or();
             or2.like(DemandLibrary::getDemandContent,demandLibraryQuery.getKey());
-            //
+            //提交单位
+            LambdaQueryWrapper<DemandLibrary> or3 = or2.or();
+            or3.like(DemandLibrary::getUnitName,demandLibraryQuery.getKey());
+            //提交人
+            LambdaQueryWrapper<DemandLibrary> or4 = or3.or();
+            or4.like(DemandLibrary::getSubmitter,demandLibraryQuery.getKey());
         }
 
-        return null;
+        dynamicQuery.orderByDesc(DemandLibrary::getSubmitTime);
+
+        Page<DemandLibrary> all = demandLibraryMap.selectPage(new Page<>(page, size),dynamicQuery);
+        return ResponseBuilderOne.ok(
+                all,
+                element -> {
+                    DemandLibraryPageQueryRes dicPageQueryRes = DemandLibraryPageQueryRes
+                            .builder()
+                            .id(element.getId())
+                            .demandNumber(element.getDemandNumber())
+                            .demandName(element.getDemandName())
+                            .demandContent(element.getDemandContent())
+                            .demandClass(dictionaryMapper.selectById(element.getDemandClassId()).getValue())
+                            .unitName(element.getUnitName())
+                            .demandStatus(element.getDemandStatus() == -1 ? "废除"
+                                    : element.getDemandStatus() == 0 ? "立项" : "认领")
+                            .demandSchedule(element.getDemandSchedule())
+                            .associatedProjectId(projectMapper.selectById(element.getAssociatedProjectId()).getName())
+                            .submitter(element.getSubmitter())
+                            .submitTime(element.getSubmitTime())
+                            .deleted(element.getDeleted())
+                            .build();
+                    return dicPageQueryRes;
+                }
+        );
     }
 
+    @Override
+    public ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQueryOneById(DemandLibraryQueryReq demandLibraryQuery) {
+        //获取当前登录用户的信息
+        User user = LoginUtils.getUser();
+
+        Integer page = demandLibraryQuery.getPage();
+        page = page == null ? 1 : page <= 0 ? 1 : page;
+        Integer size = demandLibraryQuery.getSize();
+        size = size == null ? 10 : size <= 0 ? 10 : size;
+
+        LambdaQueryWrapper<DemandLibrary> dynamicQuery = Wrappers.<DemandLibrary>lambdaQuery();
+        dynamicQuery.eq(DemandLibrary::getCreateUserId,user.getId());
+        dynamicQuery.isNull(DemandLibrary::getSubProjectId);
+        if(StringUtils.isNotBlank(demandLibraryQuery.getKey())){
+            //需求编号
+            dynamicQuery.like(DemandLibrary::getDemandNumber,demandLibraryQuery.getKey());
+            //需求名称
+            LambdaQueryWrapper<DemandLibrary> or1 = dynamicQuery.or();
+            or1.like(DemandLibrary::getDemandName,demandLibraryQuery.getKey());
+            //需求内容
+            LambdaQueryWrapper<DemandLibrary> or2 = or1.or();
+            or2.like(DemandLibrary::getDemandContent,demandLibraryQuery.getKey());
+            //提交单位
+            LambdaQueryWrapper<DemandLibrary> or3 = or2.or();
+            or3.like(DemandLibrary::getUnitName,demandLibraryQuery.getKey());
+            //提交人
+            LambdaQueryWrapper<DemandLibrary> or4 = or3.or();
+            or4.like(DemandLibrary::getSubmitter,demandLibraryQuery.getKey());
+        }
+
+        dynamicQuery.orderByDesc(DemandLibrary::getSubmitTime);
+
+        Page<DemandLibrary> all = demandLibraryMap.selectPage(new Page<>(page, size),dynamicQuery);
+        return ResponseBuilderOne.ok(
+                all,
+                element -> {
+                    DemandLibraryPageQueryRes dicPageQueryRes = DemandLibraryPageQueryRes
+                            .builder()
+                            .id(element.getId())
+                            .demandNumber(element.getDemandNumber())
+                            .demandName(element.getDemandName())
+                            .demandContent(element.getDemandContent())
+                            .demandClass(dictionaryMapper.selectById(element.getDemandClassId()).getValue())
+                            .unitName(element.getUnitName())
+                            .demandStatus(element.getDemandStatus() == -1 ? "废除"
+                                    : element.getDemandStatus() == 0 ? "立项" : "认领")
+                            .demandSchedule(element.getDemandSchedule())
+                            .associatedProjectId(projectMapper.selectById(element.getAssociatedProjectId()).getName())
+                            .submitter(element.getSubmitter())
+                            .submitTime(element.getSubmitTime())
+                            .deleted(element.getDeleted())
+                            .build();
+                    return dicPageQueryRes;
+                }
+        );
+    }
+
+    @Override
+    public ResponseBean<DemandLibraryQueryRes> findById(String id) {
+        Integer idInt = Integer.parseInt(id);
+        DemandLibrary demandLibrary = demandLibraryMap.selectById(idInt);
+
+        DemandLibraryQueryRes demandLibraryQueryRes = EntityUtils.copyProperties(demandLibrary,DemandLibraryQueryRes.class);
+        demandLibraryQueryRes.setDemandClass(dictionaryMapper.selectById(demandLibrary.getDemandClassId()).getValue());
+        demandLibraryQueryRes.setDemandStatus(demandLibrary.getDemandStatus() == -1 ? "废除"
+                : demandLibrary.getDemandStatus() == 0 ? "立项" : "认领");
+        demandLibraryQueryRes.setAssociatedProjectId(projectMapper.selectById(demandLibrary.getAssociatedProjectId()).getName());
+
+        //附件
+        LambdaQueryWrapper<DemandAttachment> demands = new LambdaQueryWrapper<> ();
+        demands.eq(DemandAttachment::getDemandId,idInt);
+        List<DemandAttachment> demandAttachmentList = demandAttachmentMapper.selectList(demands);
+
+
+        List<DemandAttachmentRes> dicList = new ArrayList<> ();
+        for(DemandAttachment dic:demandAttachmentList){
+            DemandAttachmentRes demandAttachmentRes = new DemandAttachmentRes();
+            demandAttachmentRes.setId(dic.getId());
+            demandAttachmentRes.setSubmitter(demandLibraryMap.selectById(dic.getDemandId()).getSubmitter());
+            demandAttachmentRes.setCreateTime(demandLibraryMap.selectById(dic.getDemandId()).getSubmitTime());
+            demandAttachmentRes.setName(fileInfoMapper.selectById(dic.getFileId()).getName());
+            dicList.add(demandAttachmentRes);
+        }
+        demandLibraryQueryRes.setDemandA(dicList);
+
+        //子项目
+        LambdaQueryWrapper<DemandLibrary> demandLibraryMap1 = new LambdaQueryWrapper<>();
+        demandLibraryMap1.eq(DemandLibrary::getSubProjectId,idInt);
+        List<DemandLibrary> demandLibraryList = demandLibraryMap.selectList(demandLibraryMap1);
+        demandLibraryQueryRes.setDemandB(demandLibraryList);
+
+        return ResponseBuilder.ok(demandLibraryQueryRes);
+    }
 
 
 }

src/main/java/com/migao/service/impl/MessageServiceImpl.java

@@ -1,13 +1,27 @@
 package com.migao.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.migao.config.authority.LoginUtils;
+import com.migao.config.response.*;
+import com.migao.entity.po.DemandLibrary;
 import com.migao.entity.po.Message;
+import com.migao.entity.po.User;
+import com.migao.entity.vo.req.MessageQueryReq;
+import com.migao.entity.vo.res.MessageQueryRes;
+import com.migao.mapper.DictionaryMapper;
 import com.migao.mapper.MessageMapper;
+import com.migao.mapper.UserMapper;
 import com.migao.service.MessageService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+
 /**
  * @author dingsong
  */
@@ -15,4 +29,200 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(rollbackFor = {Exception.class})
 public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements MessageService {
+    @Resource
+    MessageMapper messageMapper;
+    @Resource
+    UserMapper userMapper;
+    @Resource
+    DictionaryMapper dictionaryMapper;
+
+    @Override
+    public ResponseBean<PageBeanOne<MessageQueryRes>> pageQuery(BasePageRequest basePageRequest) {
+        Integer page = basePageRequest.getPage();
+        page = page == null ? 1 : page <= 0 ? 1 : page;
+        Integer size = basePageRequest.getSize();
+        size = size == null ? 10 : size <= 0 ? 10 : size;
+
+        LambdaQueryWrapper<Message> me = Wrappers.<Message>lambdaQuery();
+        me.eq(Message::getDeleted,0);
+        me.orderByDesc(Message::getCreateTime);
+
+        Page<Message> all = messageMapper.selectPage(new Page<>(page, size),me);
+        return ResponseBuilderOne.ok(
+                all,
+                element -> {
+                    MessageQueryRes messageQueryRes = MessageQueryRes
+                            .builder()
+                            .id(element.getId())
+                            .messageNumber(element.getMessageNumber())
+                            .name(element.getName())
+                            .content(element.getContent())
+                            .sendUser(userMapper.selectById(element.getSendUserId()).getName())
+                            .acceptUser(userMapper.selectById(element.getAcceptUserId()).getName())
+                            .designProject(element.getDesignProject())
+                            .messageType(dictionaryMapper.selectById(element.getMessageTypeId()).getValue())
+                            .status(element.getStatus() == 0 ? "未读":"已读")
+                            .build();
+                       return messageQueryRes;
+                   }
+                );
+    }
+
+    @Override
+    public ResponseBean<PageBeanOne<MessageQueryRes>> pageQueryById(BasePageRequest basePageRequest) {
+        //获取当前登录用户的信息
+        User user = LoginUtils.getUser();
+
+        Integer page = basePageRequest.getPage();
+        page = page == null ? 1 : page <= 0 ? 1 : page;
+        Integer size = basePageRequest.getSize();
+        size = size == null ? 10 : size <= 0 ? 10 : size;
+
+        LambdaQueryWrapper<Message> me = Wrappers.<Message>lambdaQuery();
+        me.eq(Message::getDeleted,0);
+        me.eq(Message::getAcceptUserId,user.getId());
+        me.orderByDesc(Message::getCreateTime);
+
+        Page<Message> all = messageMapper.selectPage(new Page<>(page, size),me);
+        return ResponseBuilderOne.ok(
+                all,
+                element -> {
+                    MessageQueryRes messageQueryRes = MessageQueryRes
+                            .builder()
+                            .id(element.getId())
+                            .messageNumber(element.getMessageNumber())
+                            .name(element.getName())
+                            .content(element.getContent())
+                            .sendUser(userMapper.selectById(element.getSendUserId()).getName())
+                            .acceptUser(userMapper.selectById(element.getAcceptUserId()).getName())
+                            .designProject(element.getDesignProject())
+                            .messageType(dictionaryMapper.selectById(element.getMessageTypeId()).getValue())
+                            .status(element.getStatus() == 0 ? "未读":"已读")
+                            .build();
+                    return messageQueryRes;
+                }
+        );
+    }
+
+    @Override
+    public ResponseBean<MessageQueryRes> pageQueryOne(String id) {
+        Integer idInt = Integer.parseInt(id);
+        Message message = messageMapper.selectById(idInt);
+
+        MessageQueryRes messageQueryRes = MessageQueryRes
+                .builder()
+                .id(message.getId())
+                .messageNumber(message.getMessageNumber())
+                .name(message.getName())
+                .content(message.getContent())
+                .sendUser(userMapper.selectById(message.getSendUserId()).getName())
+                .acceptUser(userMapper.selectById(message.getAcceptUserId()).getName())
+                .designProject(message.getDesignProject())
+                .messageType(dictionaryMapper.selectById(message.getMessageTypeId()).getValue())
+                .status(message.getStatus() == 0 ? "未读":"已读")
+                .build();
+
+
+        return ResponseBuilder.ok(messageQueryRes);
+    }
+
+    @Override
+    public ResponseBean<?> updateById(String id) {
+        Integer idInt = Integer.parseInt(id);
+        Message message = messageMapper.selectById(idInt);
+        if(message.getStatus() == 0) {
+            message.setStatus(1);
+            messageMapper.updateById(message);
+            return ResponseBuilder.ok(200,"更新完毕");
+        }
+        return ResponseBuilder.ok(200,"当前消息为已读状态，无需重复操作");
+    }
+
+    @Override
+    public ResponseBean<PageBeanOne<MessageQueryRes>> pageQueryTwo(MessageQueryReq messageQueryReq) {
+        Integer page = messageQueryReq.getPage();
+        page = page == null ? 1 : page <= 0 ? 1 : page;
+        Integer size = messageQueryReq.getSize();
+        size = size == null ? 10 : size <= 0 ? 10 : size;
+
+        LambdaQueryWrapper<Message> mee = Wrappers.<Message>lambdaQuery();
+        if(StringUtils.isNotBlank(messageQueryReq.getKey())){
+            //标题
+            mee.like(Message::getName,messageQueryReq.getKey());
+            //内容
+            LambdaQueryWrapper<Message> or1 = mee.or();
+            or1.like(Message::getContent,messageQueryReq.getKey());
+            //设计项目
+            LambdaQueryWrapper<Message> or2 = or1.or();
+            or2.like(Message::getDesignProject,messageQueryReq.getKey());
+        }
+        mee.orderByDesc(Message::getCreateTime);
+        Page<Message> all = messageMapper.selectPage(new Page<>(page, size),mee);
+
+        return ResponseBuilderOne.ok(
+                all,
+                element -> {
+                    MessageQueryRes messageQueryRes = MessageQueryRes
+                            .builder()
+                            .id(element.getId())
+                            .messageNumber(element.getMessageNumber())
+                            .name(element.getName())
+                            .content(element.getContent())
+                            .sendUser(userMapper.selectById(element.getSendUserId()).getName())
+                            .acceptUser(userMapper.selectById(element.getAcceptUserId()).getName())
+                            .designProject(element.getDesignProject())
+                            .messageType(dictionaryMapper.selectById(element.getMessageTypeId()).getValue())
+                            .status(element.getStatus() == 0 ? "未读":"已读")
+                            .build();
+                    return messageQueryRes;
+                }
+        );
+    }
+
+    @Override
+    public ResponseBean<PageBeanOne<MessageQueryRes>> pageQueryTwoById(MessageQueryReq messageQueryReq) {
+        //获取当前登录用户的信息
+        User user = LoginUtils.getUser();
+
+        Integer page = messageQueryReq.getPage();
+        page = page == null ? 1 : page <= 0 ? 1 : page;
+        Integer size = messageQueryReq.getSize();
+        size = size == null ? 10 : size <= 0 ? 10 : size;
+
+        LambdaQueryWrapper<Message> mee = Wrappers.<Message>lambdaQuery();
+        mee.eq(Message::getAcceptUserId,user.getId());
+        if(StringUtils.isNotBlank(messageQueryReq.getKey())){
+            //标题
+            mee.like(Message::getName,messageQueryReq.getKey());
+            //内容
+            LambdaQueryWrapper<Message> or1 = mee.or();
+            or1.like(Message::getContent,messageQueryReq.getKey());
+            //设计项目
+            LambdaQueryWrapper<Message> or2 = or1.or();
+            or2.like(Message::getDesignProject,messageQueryReq.getKey());
+        }
+        mee.orderByDesc(Message::getCreateTime);
+        Page<Message> all = messageMapper.selectPage(new Page<>(page, size),mee);
+
+        return ResponseBuilderOne.ok(
+                all,
+                element -> {
+                    MessageQueryRes messageQueryRes = MessageQueryRes
+                            .builder()
+                            .id(element.getId())
+                            .messageNumber(element.getMessageNumber())
+                            .name(element.getName())
+                            .content(element.getContent())
+                            .sendUser(userMapper.selectById(element.getSendUserId()).getName())
+                            .acceptUser(userMapper.selectById(element.getAcceptUserId()).getName())
+                            .designProject(element.getDesignProject())
+                            .messageType(dictionaryMapper.selectById(element.getMessageTypeId()).getValue())
+                            .status(element.getStatus() == 0 ? "未读":"已读")
+                            .build();
+                    return messageQueryRes;
+                }
+        );
+    }
+
+
 }