findyguo
2021-03-04 9e48c21f06244b35a77e75b0e5531ad6dd71f814
留言做完
4个文件已修改
1个文件已添加
272 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageBackDAO.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMessageService.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1218,7 +1218,7 @@
     * 我发的留言
     * @return 结果集合
     */
    @GetMapping("pagemymessage")
    @PostMapping("pagemymessage")
    public R pageMyMessage (@RequestBody ComActMessageVO comActMessageVO){
        return comActMessageService.pageMyMessageApplets(comActMessageVO);
    }
@@ -1226,17 +1226,43 @@
     * 发给我的留言
     * @return 结果集合
     */
    @GetMapping("pagesendtomemessage")
    @PostMapping("pagesendtomemessage")
    public R pageSendToMessage (@RequestBody ComActMessageVO comActMessageVO){
        return comActMessageService.pageSendToMessageApplets(comActMessageVO);
    }
    /**
     * 社区留言
     * @return 发布结果
     * 根据id查询留言集合
     * @return 结果集合
     */
    @GetMapping("pagemycommunitymessage")
    @PostMapping("pagemessagebyuser")
    public R pageMessageByUser (@RequestBody ComActMessageVO comActMessageVO){
        return comActMessageService.pageMessageByUserApplets(comActMessageVO);
    }
    /**
     * 社区留言
     * @return 结果集合
     */
    @PostMapping("pagemycommunitymessage")
    public R pageMyCommunityMessage (@RequestBody ComActMessageVO comActMessageVO){
        return comActMessageService.pageMyCommunityMessageApplets(comActMessageVO);
    }
    /**
     * 新增留言回复
     * @param comActMessageVO 新增留言回复信息
     * @return 发布结果
     */
    @PostMapping("addmessageback")
    public R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO){
        //        微信内容审核
        return comActMessageService.addMessageBack(comActMessageBackVO);
    }
    @PostMapping("deletemessage")
    public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) {
        return comActMessageService.deleteMessage(comActMessageVO);
    }
    
    @PostMapping("resetmessagepublic")
    public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) {
        return comActMessageService.resetMessagePublic(resetComActMessageVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageBackDAO.java
New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActMessageBackDO;
@Mapper
public interface ComActMessageBackDAO extends BaseMapper<ComActMessageBackDO> {
    @Update("delete from com_act_message_back u where u.msg_id=#{msgId}")
    void deleteMsgBackByMsgId(@Param("msgId")Long msgId);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
@@ -1,10 +1,19 @@
package com.panzhihua.service_community.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.PageComActMessageVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO;
import com.panzhihua.service_community.model.dos.ComActMessageDO;
@@ -16,4 +25,29 @@
    PartyCommitteeVO selectPartyCommitteeById(@Param("id")Long id);
    @Select("select * from com_pb_service_team where id=#{id}")
    ComPbServiceTeamVO selectComPbServiceTeamById(@Param("id")Long id);
    @Select("select * from com_act_message_back where msg_id=#{id} order by create_at desc")
    List<ComActMessageBackVO> selectMsgBackList(@Param("id")Long id);
    @Select("select * from com_act_message where (sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone}))  order by create_at desc")
    IPage<PageComActMessageVO> pageSendMeMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
    @Select("select * from com_act_message where user_id=#{comActMessageVO.userId}  order by create_at desc")
    IPage<PageComActMessageVO> pageMyMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
    @Select("select * from com_act_message where sendto_user_id=#{comActMessageVO.sendtoUserId} and ispublic=1")
    IPage<PageComActMessageVO> pageMessageByUserApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
    @Update("update com_act_message set ispublic=#{ispublic} where id=#{id}")
    void updatePublic(@Param("ispublic") Integer ispublic,@Param("id") Long id);
    @Select("<script> " +
            "SELECT * \n" +
            "FROM\n" +
            "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" +
            "<if test='comActMessageVO.userPhone != null and comActMessageVO.userPhone.trim() != &quot;&quot;'>" +
            " and t.user_phone=#{comActMessageVO.userPhone} \n" +
            " </if> " +
            " order by create_at desc"+
            "</script>")
    IPage<PageComActMessageVO> pageMyCommunityMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMessageService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.service_community.model.dos.ComActMessageDO;
public interface ComActMessageService extends IService<ComActMessageDO> {
@@ -30,5 +32,29 @@
 * @return
 */
    R pageMyCommunityMessageApplets(ComActMessageVO comActMessageVO);
    /**
     * 保存留言回复
     * @param comActMessageBackVO
     * @return
     */
    R addMessageBack(ComActMessageBackVO comActMessageBackVO);
    /**
     * 根据用户id查询留言
     * @param id
     * @return
     */
    R pageMessageByUserApplets(ComActMessageVO comActMessageVO);
    /**
     * 根据id删除留言,同时要删除回复
     * @param id
     * @return
     */
    R deleteMessage(ComActMessageVO comActMessageVO);
    /**
     * 根据id集合批量设置是否公开
     * @param ids id集合
     * @return 删除结果
     */
    R resetMessagePublic(ResetComActMessageVO resetComActMessageVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java
@@ -1,24 +1,40 @@
package com.panzhihua.service_community.service.impl;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.PageComActMessageVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO;
import com.panzhihua.service_community.dao.ComActMessageBackDAO;
import com.panzhihua.service_community.dao.ComActMessageDAO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoUserDO;
import com.panzhihua.service_community.model.dos.ComActMessageBackDO;
import com.panzhihua.service_community.model.dos.ComActMessageDO;
import com.panzhihua.service_community.service.ComActMessageService;
@Service
public class ComActMessageServiceImpl  extends ServiceImpl<ComActMessageDAO, ComActMessageDO> implements ComActMessageService {
public class ComActMessageServiceImpl extends ServiceImpl<ComActMessageDAO, ComActMessageDO>
        implements ComActMessageService {
    @Resource
    private ComActMessageDAO comActMessageDAO;
    private ComActMessageDAO comActMessageDAO;
    @Resource
    private ComActMessageBackDAO comActMessageBackDAO;
    @Override
    public R addMessage(ComActMessageVO comActMessageVO) {
@@ -52,19 +68,156 @@
        return R.fail();
    }
    /**
     * 我发的留言
     */
    @Override
    public R pageMyMessageApplets(ComActMessageVO comActMessageVO) {
        return null;
        Page page = new Page<>();
        Long pageNum = comActMessageVO.getPageNum();
        Long pageSize = comActMessageVO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PageComActMessageVO> iPage = comActMessageDAO.pageMyMessageApplets(page, comActMessageVO);
        List<PageComActMessageVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActMessageVO1 -> {
                Long id = comActMessageVO1.getId();
                List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
                comActMessageVO1.setBackList(list);
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }
    /**
     * 发给我的留言
     */
    @Override
    public R pageSendToMessageApplets(ComActMessageVO comActMessageVO) {
        return null;
        Page page = new Page<>();
        Long pageNum = comActMessageVO.getPageNum();
        Long pageSize = comActMessageVO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PageComActMessageVO> iPage = comActMessageDAO.pageSendMeMessageApplets(page, comActMessageVO);
        List<PageComActMessageVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActMessageVO1 -> {
                Long id = comActMessageVO1.getId();
                List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
                comActMessageVO1.setBackList(list);
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }
    /**
     * 我的社区留言
     */
    @Override
    public R pageMyCommunityMessageApplets(ComActMessageVO comActMessageVO) {
        return null;
        Page page = new Page<>();
        Long pageNum = comActMessageVO.getPageNum();
        Long pageSize = comActMessageVO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PageComActMessageVO> iPage = comActMessageDAO.pageMyCommunityMessageApplets(page, comActMessageVO);
        List<PageComActMessageVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActMessageVO1 -> {
                Long id = comActMessageVO1.getId();
                List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
                comActMessageVO1.setBackList(list);
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }
    @Override
    public R addMessageBack(ComActMessageBackVO comActMessageBackVO) {
        ComActMessageBackDO comActMessageBackDO=new ComActMessageBackDO();
        BeanUtils.copyProperties(comActMessageBackVO, comActMessageBackDO);
        int insert = comActMessageBackDAO.insert(comActMessageBackDO);
        if (insert > 0) {
            ComActMessageDO selectById = comActMessageDAO.selectById(comActMessageBackDO.getMsgId());
            selectById.setStatus(2);
            comActMessageDAO.updateById(selectById);
            return R.ok();
        }
        return R.fail();
    }
    @Override
    public R pageMessageByUserApplets(ComActMessageVO comActMessageVO) {
        Page page = new Page<>();
        Long pageNum = comActMessageVO.getPageNum();
        Long pageSize = comActMessageVO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PageComActMessageVO> iPage = comActMessageDAO.pageMessageByUserApplets(page, comActMessageVO);
        List<PageComActMessageVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActMessageVO1 -> {
                Long id = comActMessageVO1.getId();
                List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
                comActMessageVO1.setBackList(list);
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }
    @Override
    public R deleteMessage(ComActMessageVO comActMessageVO) {
        Long id = comActMessageVO.getId();
        comActMessageDAO.deleteById(id);
        comActMessageBackDAO.deleteMsgBackByMsgId(id);
//        List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
//        for (ComActMessageBackVO comActMessageBackVO : list) {
//            comActMessageBackDAO.deleteById(comActMessageBackVO.getId());
//        }
        return R.ok();
    }
    @Override
    public R resetMessagePublic(ResetComActMessageVO resetComActMessageVO) {
        if(ObjectUtils.isEmpty(resetComActMessageVO)) return R.fail();
        Integer ispublic = resetComActMessageVO.getIspublic();
        if(ispublic==null||(ispublic!=1&&ispublic!=2)) return R.fail("状态错误");
        List<Long> list = resetComActMessageVO.getIds();
        for (Long id : list) {
            comActMessageDAO.updatePublic(ispublic, id);
        }
        return R.ok();
    }
}