消息

src/main/java/com/huiju/estateagents/property/common/Constant.java

@@ -246,4 +246,281 @@ public class Constant {
     public static final String PAY_TYPE_CAR = "car";
 
 
+    /**
+     * 房产关联审核通过
+     */
+    public static final String ESTATE_RELATE_VERIFY_PASSED = "estate_relate_verify_passed";
+
+    /**
+     * 家/租/户 审核房产推物业
+     */
+    public static final String CUSTOMER_SUBMIT_PROP_VERIFY = "customer_submit_prop_verify";
+
+    /**
+     * 活动报名成功
+     */
+    public static final String ESTATE_SERVICE_ACTIVITY_SIGN_SUCCESS ="estate_service_activity_sign_success";
+
+    /**
+     * 房产关联审核不通过
+     */
+    public static final String ESTATE_RELATE_VERIFY_REJECTED = "estate_relate_verify_rejected";
+
+    /**
+     * 物业发布公告成功
+     */
+    public static final String ESTATE_SERVICE_ANNOUNCEMENT_SUCCESS = "estate_service_announcement_success";
+
+    /**
+     * 物业发布活动成功
+     */
+    public static final String ESTATE_SERVICE_ACTIVITY_SUCCESS = "estate_service_activity_success";
+
+    /**
+     *15条消息
+     */
+    public static final String SYSTEM_MESSAGE ="system_message";
+
+    /**
+     * 消息message_type为9表示不可点击
+     */
+    public static final String SYSTEM_MESSAGE_TYPE ="9";
+    /**
+     * 话题被回复
+     */
+    public static final String THREAD_REPLY = "thread_reply";
+
+    /**
+     * 话题被举报
+     */
+    public static final String THREAD_REPORT = "thread_report";
+
+    /**
+     * 活动报名后被物业后台删除
+     */
+    public static final String ACTIVITY_JOINED_DELETE_BY_ESTATE_SERVICE = "activity_joined_delete_by_estate_service";
+
+    /**
+     * 活动被作废
+     */
+    public static final String ACTIVITY_CANCELLED = "activity_cancelled";
+
+    /**
+     * 话题被作废
+     */
+    public static final String THREAD_CANCELLED = "thread_cancelled";
+
+    /**
+     * 收费组被发布
+     */
+    public static final String PUBLISH_BILL = "publish_bill";
+
+    /**
+     * 月租车缴费推送消息
+     */
+    public static final String PAY_MONTH_Bill_SUCCEED = "pay_month_bill_succeed";
+
+    /**
+     * 工单被拒绝受理
+     */
+    public static final String TICKET_REJECTED = "ticket_rejected";
+
+    /**
+     * 添加工单
+     */
+    public static final String TICKET_ADD = "ticket_add";
+
+    /**
+     * 工单修改
+     */
+    public static final String TICKET_UPDATE = "ticket_update";
+
+    /**
+     * 工单被分配
+     */
+    public static final String TICKET_DISTRIBUTED = "ticket_distributed";
+
+    /**
+     * 工单终止
+     */
+    public static final String TICKET_TERMINATION = "ticket_termination";
+    /**
+     * 工单被提交处理结果
+     */
+    public static final String TICKET_SUBMIT_RESULT = "ticket_submit_result";
+
+    /**
+     * 工单被回复
+     */
+    public static final String TICKET_REPLY = "ticket_reply";
+
+    /**
+     * 商铺评价被回复
+     */
+    public static final String SHOP_REVIEW_REPLY = "shop_review_reply";
+
+    /**
+     * 商铺评价时推送消息
+     */
+    public static final String SHOP_REVIEW_PROP_REPLY ="shop_review_prop_reply";
+
+    /**
+     * 家属或租客提交审核信息
+     */
+    public static final String CUSTOMER_SUBMIT_VERIFY = "customer_submit_verify";
+
+    /**
+     * 添加帖子时推送物业端消息
+     */
+    public static final String THREAD_ADD_TRANSACTION ="thread_add_transaction";
+
+    /**
+     * 话题举报时推送物业端
+     */
+    public static final String THREAD_REPORT_RROP = "thread_report_prop";
+
+    /**
+     * 话题修改时推送消息
+     */
+    public static final String THREAD_UPDATE_TRANSACTION = "thread_update_transaction";
+
+    /**
+     * 缴费成功时推送消息
+     */
+    public static final String PAY_TYPE_SUCCEED = "pay_type_succeed";
+
+    /**
+     * 短信通知
+     */
+    public static final String SMS_NOTIFICATION = "1";
+
+    /**
+     * 论坛消息
+     */
+    public static final String FORUM_NEWS = "2";
+
+    /**
+     * 物业消息
+     */
+    public static final String PROPERTY_NEWS = "3";
+
+    /**
+     * 工单消息
+     */
+    public static final String TICKET_NEWS = "4";
+
+    /**
+     * 其他消息
+     */
+    public static final String OTHER_NEWS = "5";
+
+    /**
+     * 系统消息
+     */
+    public static final String SYS_NEWS = "6";
+
+    /**
+     * 费用消息
+     */
+    public static final String BILL_NEWS = "7";
+
+    /**
+     * 审核消息
+     */
+    public static final String AUDIT_NEWS = "8";
+
+    /**
+     * app端
+     */
+    public static final String UUID_TYPE_APP = "app";
+
+    /**
+     * 物业端
+     */
+    public static final String UUID_TYPE_PROP = "prop";
+
+    /**
+     * app端
+     */
+    public static final String SOURCE_APP = "app";
+
+    /**
+     * 物业端
+     */
+    public static final String SOURCE_PROP = "prop";
+
+    /**
+     * 有效
+     */
+    public static final String STATUS_EFFECTIVE = "1";
+
+    /**
+     * 无效
+     */
+    public static final String STATUS_INVALID = "0";
+
+    /**
+     * 已读
+     */
+    public static final String READ_STATUS_READ = "1";
+
+    /**
+     * 未读
+     */
+    public static final String READ_STATUS_UNREAD = "0";
+
+    /**
+     * 审核未通过短信通知
+     */
+    public static final String ESTATE_RELATE_VERIFY_REJECTED_SMS = "0401";
+
+    /**
+     * 审核通过短信通知
+     */
+    public static final String ESTATE_RELATE_VERIFY_PASSED_SMS = "0402";
+
+    /**
+     * 公告类型
+     */
+    public static final String MESSAGE_UUID_TYPE_ANNOUNCEMENT = "announcement";
+
+    /**
+     * 活动类型
+     */
+    public static final String MESSAGE_UUID_TYPE_ACTIVITY = "activity";
+
+    /**
+     * 话题类型
+     */
+    public static final String MESSAGE_UUID_TYPE_TRANSACTION = "transaction";
+
+    /**
+     * 工单类型
+     */
+    public static final String MESSAGE_UUID_TYPE_TICKET = "ticket";
+
+    /**
+     * 商铺类型
+     */
+    public static final String MESSAGE_UUID_TYPE_SHOP = "shop";
+
+    /**
+     * 收费类型
+     */
+    public static final String MESSAGE_UUID_TYPE_BILL= "bill";
+
+    /**
+     * 资料审核类型
+     */
+    public static final String MESSAGE_UUID_TYPE_AUDIT= "audit";
+
+    /**
+     * app回复物业
+     */
+    public static final String TICKET_REPLY_PROP = "ticketReplyProp";
+
+    /**
+     * app评价物业
+     */
+    public static final String TICKET_EVALUATE_PROP = "ticketEvaluateProp";
 }

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -168,7 +168,6 @@ public class BillController extends BaseController {
     @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "payType", value = "0是未缴费1是已缴费"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/wx/bills/current_user/{payType}",method = RequestMethod.GET)
     public ResponseBean getBillInvoice(@PathVariable Integer payType,
@@ -196,7 +195,7 @@ public class BillController extends BaseController {
 
     @ApiOperation(value = "获取历史缴费", notes = "获取历史缴费")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+
     })
     @RequestMapping(value = "/wx/bill/pay/history", method = RequestMethod.GET)
     public ResponseBean payHistory(HttpServletRequest request) {

src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java

@@ -358,7 +358,7 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNoId", value = "户号"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+
     })
     public ResponseBean hasBuilding(@RequestParam(value = "orgId", required = false) Integer orgId,
                                     @RequestParam(value = "phaseId", required = false) Integer phaseId,

src/main/java/com/huiju/estateagents/property/controller/MessageController.java

@@ -4,6 +4,7 @@ package com.huiju.estateagents.property.controller;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.service.IMessageService;
 import io.swagger.annotations.Api;
@@ -11,13 +12,11 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,8 +27,8 @@ import javax.servlet.http.HttpSession;
  * @since 2019-03-05
  */
 @RestController
-@RequestMapping("/")
-@Api(value = "消息通知API", description = "消息通知API")
+@RequestMapping("/api")
+@Api(value = "消息通知API", tags = "消息通知API")
 public class MessageController extends BaseController {
 
     @Autowired
@@ -69,6 +68,87 @@ public class MessageController extends BaseController {
         ResponseBean  responseBean = messageService.delectRead(parameter,userElement.getUserId());
         return responseBean;
     }
+
+
+    @ApiOperation(value = "按小区获取消息总数", notes = "按小区获取个人消息总数")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "orgId", value = "小区Id")})
+    @RequestMapping(value = "/wx/message/{orgId}/total",method = RequestMethod.GET)
+    public ResponseBean getMessageTotal(@PathVariable Integer orgId, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean responseBean = new ResponseBean();
+        Map<String,Object> totalMap = messageService.getMessageTotal(orgId, userElement.getUserId());
+        responseBean.addSuccess(totalMap);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "按小区获取分页消息", notes = "按小区获取分页消息")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/wx/message/{orgId}/news",method = RequestMethod.GET)
+    public ResponseBean getNews(@PathVariable Integer orgId,
+                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean responseBean = new ResponseBean();
+
+        Map<String,Object> map = messageService.getMessages(orgId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userElement.getUserId());
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "按小区获取分页待办", notes = "按小区获取分页待办")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/wx/message/{orgId}/upcoming",method = RequestMethod.GET)
+    public ResponseBean getUpcoming(@PathVariable Integer orgId,
+                                    @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        Integer userId = userElement.getUserId();
+        ResponseBean responseBean = new ResponseBean();
+
+        Map<String,Object> map = messageService.getMessages(orgId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING, userId);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "消息已读接口", notes = "消息已读接口")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            })
+    @RequestMapping(value = "/wx/readStatus/{orgId}",method = RequestMethod.POST)
+    public ResponseBean allMessageRead(@PathVariable("orgId") Integer orgId, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        Integer userId = userElement.getUserId();
+        ResponseBean responseBean = new ResponseBean();
+
+        messageService.updateMessageReadStatus(orgId, userId);
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "根据消息id进行已读", notes = "根据消息id进行已读")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "messageId", value = "消息id"),
+            })
+    @RequestMapping(value = "/wx/messageIdreadStatus/{messageId}",method = RequestMethod.PUT)
+    public ResponseBean updateMessageByIdReadStatus(HttpServletRequest request, @PathVariable("messageId") Integer messageId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser userElement = getTaUser(request);
+        responseBean = messageService.updateMessageByIdReadStatus(userElement, messageId);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "根据消息id获取详细数据", notes = "根据消息id获取详细数据")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "messageId", value = "消息id"),
+            })
+    @RequestMapping(value = "/wx/message/get/{messageId}",method = RequestMethod.GET)
+    public ResponseBean getMessageById(HttpServletRequest request, @PathVariable("messageId") Integer messageId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser userElement = getTaUser(request);
+        responseBean = messageService.getMessageById(userElement.getOrgId(), messageId);
+        return responseBean;
+    }
 }
 
 

src/main/java/com/huiju/estateagents/property/dao/MessageMapper.java

@@ -9,6 +9,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -61,4 +63,10 @@ public interface MessageMapper extends BaseMapper<Message> {
      * @param ticketId
      */
     void updateTickMessageStatus(@Param("ticketId") Integer ticketId);
+
+    Map<String, Object> getMessageTotal(@Param(value = "userId") Integer userId, @Param(value = "orgId") Integer orgId);
+
+    IPage<Message> getMessages(IPage<Message> page,@Param(value = "userId") Integer userId, @Param(value = "orgId") Integer orgId, @Param(value = "modelType") Integer modelType);
+
+    void updateReadStatus(@Param(value = "orgId")Integer orgId, @Param(value = "userId")Integer userId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpTransactionMapper.java

@@ -3,9 +3,7 @@ package com.huiju.estateagents.property.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.property.model.TpTransaction;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -30,4 +28,6 @@ public interface TpTransactionMapper extends BaseMapper<TpTransaction> {
      */
     @Update("update tp_transaction set status = 0 where uuid = #{uuid} and uuid_type = #{uuidType}")
     void invalidByUuidAndUuidType(@Param("uuid") Integer uuid, @Param("uuidType") String uuidType);
+
+    TpTransaction selectByPrimaryKey(@Param("id") Integer id,@Param("orgId")  Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/model/Message.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.property.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -130,4 +131,40 @@ public class Message implements Serializable {
      */
     private Integer transactionId;
 
+
+    /**
+     * 跳转的消息详情id
+     */
+    @TableField(exist = false)
+    private Integer messageUuid;
+
+    @TableField(exist = false)
+    private String readMessageIcon;
+
+    @TableField(exist = false)
+    private String unreadMessageIcon;
+
+    @TableField(exist = false)
+    private String messageDetailUrl;
+
+    @TableField(exist = false)
+    private String messageIconTitle;
+
+    @TableField(exist = false)
+    private String ticketStatus;
+
+    @TableField(exist = false)
+    private String content;
+    /**
+     * 需要跳转的消息的类型
+     */
+    @TableField(exist = false)
+    private String messageUuidType;
+
+    /**
+     * 工单类型
+     * @return
+     */
+    @TableField(exist = false)
+    private String ticketType;
 }

src/main/java/com/huiju/estateagents/property/service/IMessageService.java

@@ -2,8 +2,12 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.Message;
 
+import java.util.Map;
+
 /**
  * <p>
  * 物业端消息表 服务类
@@ -37,4 +41,42 @@ public interface IMessageService extends IService<Message> {
      * @return
      */
     ResponseBean delectRead(String parameter, Integer id);
+
+    /**
+     * 获取消息数量
+     * @param orgId
+     * @return
+     */
+    Map<String, Object> getMessageTotal(Integer orgId, Integer verifyId);
+
+    /**
+     * 分页获取消息或待办
+     * @param orgId
+     * @param pageNum
+     * @param pageSize
+     * @param modelType
+     * @return
+     */
+    Map<String,Object> getMessages(Integer orgId, Integer pageNum, Integer pageSize,Integer modelType, Integer verifyId);
+
+    /**
+     * 全部已读
+     */
+    void updateMessageReadStatus(Integer orgId, Integer userId);
+
+    /**
+     * 根据消息的id, 进行已读操作
+     * @param userElement
+     * @param messageId
+     * @return
+     */
+    ResponseBean updateMessageByIdReadStatus(TaUser userElement, Integer messageId);
+
+    /**
+     * 根据消息ID 查询详情数据
+     * @param orgId
+     * @param messageId
+     * @return
+     */
+    ResponseBean getMessageById(Integer orgId, Integer messageId);
 }

src/main/java/com/huiju/estateagents/property/service/impl/MessageServiceImpl.java

@@ -7,16 +7,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.property.dao.MessageMapper;
-import com.huiju.estateagents.property.model.Message;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.property.common.Constant;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.dao.*;
+import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.IMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import springfox.documentation.swagger2.mappers.ModelMapper;
 
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -30,6 +36,28 @@ import java.util.List;
 public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
     @Autowired
     private MessageMapper messageMapper;
+
+    @Autowired
+    private BillMapper tpBillMapper;
+
+    @Autowired
+    private TpTicketMapper tpTicketMapper;
+
+    @Autowired
+    private TpTransactionMapper tpTransactionMapper;
+
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
+    @Autowired
+    private TpAnnouncementMapper tpAnnouncementMapper;
+
+    @Autowired
+    private  TpActivityMapper tpActivityMapper;
+
+    @Autowired
+    private  TpShopMapper tpShopMapper;
+
     @Override
     public ResponseBean messageLiset(String parameter, Integer orgId,Integer user) {
         ResponseBean response= new  ResponseBean();
@@ -104,4 +132,151 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
                 response.addSuccess("成功");
                 return response;
     }
+
+
+
+    /**
+     * 获取消息数量
+     * @param orgId
+     * @return
+     */
+    @Override
+    public Map<String, Object> getMessageTotal(Integer orgId, Integer verifyId) {
+        return messageMapper.getMessageTotal(verifyId,orgId);
+    }
+
+    /**
+     * 分页获取消息或待办
+     * @param orgId
+     * @param pageNum
+     * @param pageSize
+     * @param modelType
+     * @return
+     */
+    @Override
+    public Map<String,Object> getMessages(Integer orgId, Integer pageNum, Integer pageSize,Integer modelType, Integer verifyId) {
+        //使用分页插件
+        Page<Message> page = new Page(pageNum, pageSize);
+        // 获取数据
+        IPage<Message> messagePage = messageMapper.getMessages(page,verifyId,orgId, modelType);
+        List<Message> messageList = messagePage.getRecords();
+        // 查找标题
+        for (Message tpMessage:messageList){
+            // 工单
+            if (Constant.MESSAGE_UUID_TYPE_TICKET.equals(tpMessage.getMessageUuidType())) {
+                TpTicket tpTicket = tpTicketMapper.selectById(tpMessage.getMessageUuid());
+                tpMessage.setContent(tpTicket.getTicketTitle());
+            }
+            // 话题
+            if (Constant.MESSAGE_UUID_TYPE_TRANSACTION.equals(tpMessage.getMessageUuidType())){
+                TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(tpMessage.getMessageUuid(),tpMessage.getOrgId());
+                tpMessage.setContent(tpTransaction.getTransactionTitle());
+            }
+            // 公告
+            if (Constant.MESSAGE_UUID_TYPE_ANNOUNCEMENT.equals(tpMessage.getMessageUuidType())){
+                TpAnnouncement tpAnnouncement = tpAnnouncementMapper.selectByPrimaryKey(tpMessage.getMessageUuid(),tpMessage.getOrgId());
+                tpMessage.setContent(tpAnnouncement.getAnnouncementTitle());
+            }
+            // 活动
+            if (Constant.MESSAGE_UUID_TYPE_ACTIVITY.equals(tpMessage.getMessageUuidType())){
+                TpActivity tpActivity = tpActivityMapper.selectById(tpMessage.getMessageUuid());
+                tpMessage.setContent(tpActivity.getActivityTitle());
+            }
+            // 收费组名称
+            if (Constant.MESSAGE_UUID_TYPE_BILL.equals(tpMessage.getMessageUuidType())){
+                Bill tpBill = tpBillMapper.selectById(tpMessage.getMessageUuid());
+                tpMessage.setContent(tpBill.getBillName());
+            }
+            // 商铺
+            if (Constant.MESSAGE_UUID_TYPE_SHOP.equals(tpMessage.getMessageUuidType())){
+                TpShop tpShop = tpShopMapper.selectById(tpMessage.getMessageUuid());
+                tpMessage.setContent(tpShop.getShopName());
+            }
+
+            //活动被作废
+            if (Constant.MESSAGE_UUID_TYPE_ACTIVITY.equals(tpMessage.getMessageUuidType())){
+                Message message = messageMapper.selectById(tpMessage.getId());
+                if(Constant.ACTIVITY_CANCELLED.equals(message.getMessageType())) {
+                    tpMessage.setMessageDetailUrl(null);
+                    tpMessage.setContent(null);
+                }
+            }
+            //话题被作废
+            if(Constant.MESSAGE_UUID_TYPE_TRANSACTION.equals(tpMessage.getMessageUuidType())){
+                Message message = messageMapper.selectById(tpMessage.getId());
+                if(Constant.THREAD_CANCELLED.equals(message.getMessageType())){
+                    tpMessage.setMessageDetailUrl(null);
+                    tpMessage.setContent(null);
+                }
+            }
+        }
+        Map<String,Object> map = new HashMap<>();
+        map.put("list",messageList);
+        map.put("total",page.getTotal());
+        return map;
+    }
+
+    /**
+     * 消息全部已读
+     */
+    @Override
+    public void updateMessageReadStatus(Integer orgId, Integer userId) {
+        messageMapper.updateReadStatus(orgId, userId);
+    }
+
+    @Override
+    public ResponseBean updateMessageByIdReadStatus(TaUser userElement, Integer messageId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Message tpMessage = messageMapper.selectById(messageId);
+        if (null == tpMessage) {
+            responseBean.addError("消息不存在!");
+            return responseBean;
+        }
+        tpMessage.setReadStatus("1");
+        tpMessage.setUpdateDate(LocalDateTime.now());
+        tpMessage.setUpdateUser(userElement.getUserId());
+        int row = messageMapper.updateById(tpMessage);
+        if (row > 0) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
+    /**
+     * 根据消息ID 查询详情数据
+     *
+     * @param orgId
+     * @param messageId
+     * @return
+     */
+    @Override
+    public ResponseBean getMessageById(Integer orgId, Integer messageId) {
+        ResponseBean responseBean = new ResponseBean();
+        Message tpMessage = messageMapper.selectById(messageId);
+        if (null != tpMessage){
+            // 设置当前工单类型
+            if (Constant.MESSAGE_UUID_TYPE_TICKET.equals(tpMessage.getMessageUuidType())){
+                TpTicket tpTicket= tpTicketMapper.selectById(tpMessage.getMessageUuid());
+                tpMessage.setTicketType(tpTicket.getType());
+            }
+            // 当前发帖人是否存在(app发帖)
+            if (Constant.MESSAGE_UUID_TYPE_TRANSACTION.equals(tpMessage.getMessageUuidType())){
+                TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(tpMessage.getMessageUuid(),tpMessage.getOrgId());
+                if ("app".equals(tpTransaction.getUuidType())){
+                    TaUserVerify taUserVerify = taUserVerifyMapper.selectById(tpTransaction.getUuid());
+                    if (null == taUserVerify){
+                        responseBean.addError("此贴已丢失，无法查看");
+                        return  responseBean;
+                    }
+                }
+            }
+            responseBean.addSuccess(tpMessage);
+            return responseBean;
+        }
+        responseBean.addError("不存在的ID");
+        return responseBean;
+    }
 }

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

@@ -149,4 +149,70 @@
         order by create_date ASC
         LIMIT 1
     </update>
+
+    <select id="getMessageTotal" resultType="map">
+    SELECT
+        count( CASE WHEN model_type = 1 AND read_status = 0 THEN 1 ELSE NULL END ) AS messageTotal,
+        count( CASE WHEN model_type = 2 AND status = 1 THEN 1 ELSE NULL END ) AS toDoTotal
+    FROM
+        tp_message
+    WHERE
+        uuid_type = "app"
+        AND org_id = #{orgId,jdbcType=INTEGER}
+        AND uuid = #{userId,jdbcType=INTEGER}
+        AND STATUS = 1
+        AND advice_type != 1
+  </select>
+
+    <select id="getMessages" resultType="com.huiju.estateagents.property.model.Message">
+    SELECT
+        t.id,
+        t.community_id,
+        t.message_type AS new_message_type,
+        CASE
+          WHEN t.message_type = 9 THEN
+              9
+        ELSE
+            2
+        END message_type,
+        t.advice_type,
+        t.model_type,
+        t.uuid,
+        t.uuid_type,
+        t.source,
+        t.message_content,
+        t.result,
+        t.meaasge_type_id,
+        t.read_status,
+        t.create_user,
+        t.create_date,
+        t.update_user,
+        t.update_date,
+        t.message_uuid,
+        t.message_uuid_type,
+        i.read_message_icon,
+        i.unread_message_icon,
+        CONCAT( i.message_detail_url, t.id ) AS message_detail_url,
+        i.message_icon_title
+    FROM
+        tp_message t
+        LEFT JOIN tp_message_icon i ON t.message_type = i.message_type
+    WHERE
+        t.uuid_type = "app"
+        AND t.community_id = #{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{userId,jdbcType=INTEGER}
+        AND t.STATUS = 1
+        AND t.advice_type != 1
+        AND t.model_type = #{modelType,jdbcType=INTEGER}
+    ORDER BY
+    t.create_date DESC , t.id
+  </select>
+
+    <update id="updateReadStatus" parameterType="java.lang.Integer" >
+    update tp_message
+    set
+      read_status = 1
+    where org_id = #{orgId}
+    and uuid = #{userId}
+  </update>
 </mapper>

src/main/resources/mapper/property/TpTransactionMapper.xml

@@ -37,4 +37,12 @@
         t.id
         ORDER BY t.create_date desc
     </select>
+
+
+    <select id="selectByPrimaryKey" resultType="com.huiju.estateagents.property.model.TpTransaction" parameterType="com.huiju.estateagents.property.model.TpTransaction">
+        select
+         *
+        from tp_transaction ttr
+        where ttr.id = #{id,jdbcType=INTEGER} and ttr.community_id=#{communityId,jdbcType=INTEGER}
+    </select>
 </mapper>