From b987f3d4bc9d96cfe99296fc1fc54015e3906677 Mon Sep 17 00:00:00 2001 From: 18356073052 <274131322@qq.com> Date: Thu, 7 Jan 2021 19:37:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E4=BE=A7=E8=BE=B9=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wecom/WeChatCollectionController.java | 23 ++++++++++-- .../wecom/WeChatItemController.java | 20 +++++++--- .../src/main/resources/application.yml | 2 + .../linkwechat/wecom/domain/WeChatSide.java | 2 +- .../wecom/domain/vo/WeChatSideVo.java | 37 +++++++++++++++++++ .../wecom/mapper/WeChatCollectionMapper.java | 11 ++++++ .../wecom/mapper/WeChatItemMapper.java | 9 +++++ .../wecom/mapper/WeChatSideMapper.java | 4 ++ .../service/IWeChatCollectionService.java | 11 ++++++ .../wecom/service/IWeChatItemService.java | 11 ++++++ .../impl/WeChatCollectionServiceImpl.java | 8 ++++ .../service/impl/WeChatItemServiceImpl.java | 6 +++ .../mapper/wecom/WeChatCollectionMapper.xml | 15 ++++++++ .../mapper/wecom/WeChatItemMapper.xml | 16 ++++++++ .../mapper/wecom/WeChatSideMapper.xml | 1 + 15 files changed, 166 insertions(+), 10 deletions(-) create mode 100644 linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatSideVo.java diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java index a64908a27..a7881640b 100644 --- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java +++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java @@ -3,12 +3,16 @@ package com.linkwechat.web.controller.wecom; import com.linkwechat.common.annotation.Log; import com.linkwechat.common.core.controller.BaseController; import com.linkwechat.common.core.domain.AjaxResult; +import com.linkwechat.common.core.page.TableDataInfo; import com.linkwechat.common.enums.BusinessType; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; import com.linkwechat.wecom.service.IWeChatCollectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 聊天工具 侧边栏栏 素材收藏 * @@ -28,8 +32,8 @@ public class WeChatCollectionController extends BaseController { */ @PreAuthorize("@ss.hasPermi('chat:collection:add')") @Log(title = "添加收藏", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult addCollection(@RequestParam(value = "materialId") Long materialId, @RequestParam(value = "userId") Long userId) { + @PutMapping("addCollection") + public AjaxResult addCollection(@RequestParam(value = "materialId") Long materialId,@RequestParam(value = "userId") Long userId) { return toAjax(weChatCollectionService.addCollection(materialId, userId)); } @@ -39,9 +43,20 @@ public class WeChatCollectionController extends BaseController { */ @PreAuthorize("@ss.hasPermi('chat:collection:delete')") @Log(title = "取消收藏", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult cancleCollection(@RequestParam(value = "materialId") Long materialId, @RequestParam(value = "userId") Long userId) { + @PostMapping(value = "cancleCollection") + public AjaxResult cancleCollection(@RequestParam(value = "materialId") Long materialId,@RequestParam(value = "userId") Long userId) { return toAjax(weChatCollectionService.cancleCollection(materialId, userId)); } + /** + * 收藏列表 + */ + @PreAuthorize("@ss.hasPermi('chat:collection:list')") + @GetMapping("/list") + public TableDataInfo list(@RequestParam(value = "userId") Long userId) { + startPage(); + List collections = weChatCollectionService.collections(userId); + return getDataTable(collections); + } + } diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatItemController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatItemController.java index 42e20cad0..16054e37e 100644 --- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatItemController.java +++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatItemController.java @@ -3,15 +3,16 @@ package com.linkwechat.web.controller.wecom; import com.linkwechat.common.annotation.Log; import com.linkwechat.common.core.controller.BaseController; import com.linkwechat.common.core.domain.AjaxResult; +import com.linkwechat.common.core.page.TableDataInfo; import com.linkwechat.common.enums.BusinessType; import com.linkwechat.wecom.domain.dto.WeChatItemDto; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; import com.linkwechat.wecom.service.IWeChatItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 聊天工具侧边栏 @@ -35,6 +36,15 @@ public class WeChatItemController extends BaseController { return toAjax(weChatItemService.checkItems(chatItemDto)); } - + /** + * h5素材列表 + */ + @PreAuthorize("@ss.hasPermi('chat:item:list')") + @GetMapping("/list") + public TableDataInfo list(@RequestParam(value = "sideId") Long sideId) { + startPage(); + List weChatSideVos = weChatItemService.chatItems(sideId); + return getDataTable(weChatSideVos); + } } diff --git a/linkwe-admin/src/main/resources/application.yml b/linkwe-admin/src/main/resources/application.yml index 9c842fdad..0c39c8f24 100644 --- a/linkwe-admin/src/main/resources/application.yml +++ b/linkwe-admin/src/main/resources/application.yml @@ -178,6 +178,8 @@ wecome: - /externalcontact/get_unassigned_list - /externalcontact/send_welcome_msg - /externalcontact/unionid_to_external_userid + - /externalcontact/add_msg_template + - /externalcontact/get_group_msg_result - /get_jsapi_ticket - /ticket/get fileUplodUrl: /media/upload,/media/uploadimg diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatSide.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatSide.java index 40d911729..650ffedbe 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatSide.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatSide.java @@ -18,7 +18,7 @@ public class WeChatSide extends BaseEntity { /** * 0 图片（image）、1 语音（voice）、2 视频（video），3 普通文件(file) 4 文本 5 海报 */ - private Long mediaType; + private String mediaType; /** * 聊天工具栏名称 diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatSideVo.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatSideVo.java new file mode 100644 index 000000000..db4891d52 --- /dev/null +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatSideVo.java @@ -0,0 +1,37 @@ +package com.linkwechat.wecom.domain.vo; + +import lombok.Data; + +/** + * 聊天侧边栏 + * @author kewen + */ +@Data +public class WeChatSideVo { + + /** + * 0 图片（image）、1 语音（voice）、2 视频（video），3 普通文件(file) 4 文本 5 海报 + */ + private String mediaType; + + /** + * 素材id + */ + private Long materialId; + + /** + * 本地资源文件地址 + */ + private String materialUrl; + + /** + * 文本内容、图片文案 + */ + private String content; + + /** + * 图片名称 + */ + private String materialName; + +} diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatCollectionMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatCollectionMapper.java index 9f874c969..fb4e91325 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatCollectionMapper.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatCollectionMapper.java @@ -2,8 +2,11 @@ package com.linkwechat.wecom.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.linkwechat.wecom.domain.WeChatCollection; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 聊天工具 侧边栏栏 素材收藏 * @@ -37,4 +40,12 @@ public interface WeChatCollectionMapper extends BaseMapper { */ public int countCollectionByMaterialIdAndUserId(@Param("materialId") Long materialId,@Param("userId") Long userId); + /** + * 收藏列表 + * + * @param userId 用户id + * @return {@link WeChatSideVo}s + */ + public List findCollections(Long userId); + } diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatItemMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatItemMapper.java index d49f1dc34..992b9a472 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatItemMapper.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatItemMapper.java @@ -3,6 +3,7 @@ package com.linkwechat.wecom.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.linkwechat.wecom.domain.WeChatItem; import com.linkwechat.wecom.domain.dto.WeChatItemDto; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -27,4 +28,12 @@ public interface WeChatItemMapper extends BaseMapper { */ public int dropItem(@Param("sideId") Long sideId); + + /** + * h5素材列表 + * + * @param sideId 侧边栏id + * @return + */ + public List findChatItems(@Param("sideId") Long sideId); } diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java index 73f895ee1..3439594aa 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java @@ -2,6 +2,8 @@ package com.linkwechat.wecom.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.linkwechat.wecom.domain.WeChatSide; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -27,4 +29,6 @@ public interface WeChatSideMapper extends BaseMapper { */ public int updateWeChatSideById(WeChatSide weChatSide); + + } diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java index c4add8356..2fa4c0bb6 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java @@ -2,6 +2,9 @@ package com.linkwechat.wecom.service; import com.baomidou.mybatisplus.extension.service.IService; import com.linkwechat.wecom.domain.WeChatCollection; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; + +import java.util.List; /** * 聊天工具 侧边栏栏 素材收藏 @@ -28,4 +31,12 @@ public interface IWeChatCollectionService extends IService { */ public int cancleCollection( Long materialId, Long userId); + /** + * 收藏列表 + * + * @param userId 用户id + * @return {@link WeChatSideVo}s + */ + public List collections(Long userId); + } diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatItemService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatItemService.java index a6e1521cc..38f50de5d 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatItemService.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatItemService.java @@ -3,6 +3,9 @@ package com.linkwechat.wecom.service; import com.baomidou.mybatisplus.extension.service.IService; import com.linkwechat.wecom.domain.WeChatItem; import com.linkwechat.wecom.domain.dto.WeChatItemDto; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; + +import java.util.List; /** * 聊天工具侧边栏 @@ -18,4 +21,12 @@ public interface IWeChatItemService extends IService { */ public int checkItems(WeChatItemDto chatItemDto); + /** + * h5素材列表 + * + * @param sideId 侧边栏id + * @return + */ + public List chatItems(Long sideId); + } diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java index ea80055f0..c97d3c0a7 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java @@ -3,11 +3,14 @@ package com.linkwechat.wecom.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.linkwechat.common.utils.SnowFlakeUtil; import com.linkwechat.wecom.domain.WeChatCollection; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; import com.linkwechat.wecom.mapper.WeChatCollectionMapper; import com.linkwechat.wecom.service.IWeChatCollectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 聊天工具 侧边栏栏 素材收藏 * @@ -34,4 +37,9 @@ public class WeChatCollectionServiceImpl extends ServiceImpl collections(Long userId) { + return weChatCollectionMapper.findCollections(userId); + } + } diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatItemServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatItemServiceImpl.java index 364277e3f..3540a64a6 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatItemServiceImpl.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatItemServiceImpl.java @@ -6,6 +6,7 @@ import com.linkwechat.wecom.domain.WeChatItem; import com.linkwechat.wecom.domain.WeChatSide; import com.linkwechat.wecom.domain.WeMaterial; import com.linkwechat.wecom.domain.dto.WeChatItemDto; +import com.linkwechat.wecom.domain.vo.WeChatSideVo; import com.linkwechat.wecom.mapper.WeChatItemMapper; import com.linkwechat.wecom.mapper.WeChatSideMapper; import com.linkwechat.wecom.service.IWeChatItemService; @@ -94,6 +95,11 @@ public class WeChatItemServiceImpl extends ServiceImpl chatItems(Long sideId) { + return weChatItemMapper.findChatItems(sideId); + } + /** * 更新该次选择的素材数 * diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatCollectionMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatCollectionMapper.xml index 229c29169..4f2439ce5 100644 --- a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatCollectionMapper.xml +++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatCollectionMapper.xml @@ -23,5 +23,20 @@ material_id=#{materialId} AND user_id=#{userId} + \ No newline at end of file diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatItemMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatItemMapper.xml index 2d8733381..d7376236a 100644 --- a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatItemMapper.xml +++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatItemMapper.xml @@ -20,4 +20,20 @@ side_id=#{sideId} + + \ No newline at end of file diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml index b2a1e0b0a..ce8f9e164 100644 --- a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml +++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml @@ -34,4 +34,5 @@ `using`=0 + \ No newline at end of file -- Gitee