Merge branch 'feature/1003855' into 'master'

feat: [1003855] 首页画像

See merge request rays/pcloud-book!1131

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletAppOrProductDTO.java → pcloud-facade-book/src/main/java/com/pcloud/book/applet/dto/AppletAppOrProductDTO.java

@@ -22,4 +22,6 @@ public class AppletAppOrProductDTO {
     private String serveType;
     @ApiModelProperty("商品应用id")
     private Long serveId;
+    @ApiModelProperty("浏览次数")
+    private Integer browseCount;
 }

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletNewsDTO.java → pcloud-facade-book/src/main/java/com/pcloud/book/applet/dto/AppletNewsDTO.java

 package com.pcloud.book.applet.dto;
 
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pcloud.book.applet.entity.AppletThirdResources;
-import com.pcloud.book.applet.entity.AppletThirdResourcesRelation;
 import com.pcloud.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel("小程序资讯")

pcloud-service-book/src/main/java/com/pcloud/book/skill/dto/GroupActivity4AppletDTO.java → pcloud-facade-book/src/main/java/com/pcloud/book/applet/dto/GroupActivity4AppletDTO.java

-package com.pcloud.book.skill.dto;
+package com.pcloud.book.applet.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

pcloud-facade-book/src/main/java/com/pcloud/book/applet/enums/AppletRecordTypeEnum.java

@@ -19,7 +19,9 @@ public enum AppletRecordTypeEnum {
     //好书推荐
     BOOK_RECOMMEND(8),
     //精选书单
-    BOOK_LIST(9);
+    BOOK_LIST(9),
+    //企业微信客服
+    WX_WORK_TEACHER(10);
 
     public Integer value;
 

pcloud-facade-book/src/main/java/com/pcloud/book/applet/service/AppletService.java

 package com.pcloud.book.applet.service;
 
 
+import com.pcloud.book.applet.dto.AppletAppOrProductDTO;
+import com.pcloud.book.applet.dto.AppletNewsDTO;
 import com.pcloud.book.applet.dto.AppletNewsVO;
 import com.pcloud.book.applet.dto.AppletOuterBookDTO;
+import com.pcloud.book.applet.dto.AppletOuterBooklistDTO;
 import com.pcloud.book.applet.dto.PcloudGroupActivityDTO;
 import com.pcloud.book.applet.dto.ServeCollectDTO;
 import com.pcloud.common.dto.ResponseDto;
@@ -19,6 +22,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(value = "pcloud-service-book", qualifier = "appletServiceCloud", path = "book/v1.0/appletService")
 @Api(description = "小程序内部接口")
@@ -75,4 +79,24 @@ public interface AppletService {
     @ApiOperation("统计指定周的数据")
     @GetMapping("addWeekAppletRecordStatis")
     void addWeekAppletRecordStatis(@RequestParam("mondayDate")String mondayDate);
+
+    @ApiOperation("获取资讯map")
+    @PostMapping("getNewsByIds")
+    ResponseEntity<ResponseDto<Map<Long, AppletNewsDTO>>> getNewsByIds(@RequestBody List<Long> newsIds);
+
+
+    @ApiOperation("获取书单")
+    @PostMapping("getOuterBooklistByIds")
+    ResponseEntity<ResponseDto<Map<Long, AppletOuterBooklistDTO>>> getOuterBooklistByIds(@RequestBody List<Long> bookRecommendIds);
+
+    @ApiOperation("获取用户所有收藏")
+    @GetMapping("getAllCollectServe")
+    ResponseEntity<ResponseDto<List<ServeCollectDTO>>> getAllCollectServe(@RequestParam("wechatUserId") Long wechatUserId);
+
+
+    @ApiOperation("从足迹获取应用或作品浏览人数")
+    @PostMapping("getAppOrProductBrowseCount")
+    ResponseEntity<ResponseDto<Map<Long, AppletAppOrProductDTO>>> getAppOrProductBrowseCount(@RequestParam("recordType") Integer recordType,
+                                                                                             @RequestBody List<Long> serveIds);
+
 }

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/WxWorkTeacherDTO.java

+package com.pcloud.book.group.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class WxWorkTeacherDTO {
+    @ApiModelProperty("id")
+    private Long id;
+
+    /**
+     * 企业微信二维码
+     */
+    @ApiModelProperty("企业微信二维码")
+    private String qrcode;
+
+    /**
+     * 真实姓名
+     */
+    @ApiModelProperty("真实姓名")
+    private String realName;
+
+    /**
+     * 昵称
+     */
+    @ApiModelProperty("昵称")
+    private String nickname;
+
+    /**
+     * 头像地址
+     */
+    @ApiModelProperty("头像地址")
+    private String avatar;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty("描述")
+    private String desc;
+
+    /**
+     * 图文素材标题名称
+     */
+    @ApiModelProperty("图文素材标题名称")
+    private String title;
+
+    /**
+     * 客服类型：1：苏老师  2：张哥哥
+     */
+    @ApiModelProperty("客服类型：1：苏老师  2：张哥哥")
+    private Integer teacherType;
+
+    /**
+     * 开关状态
+     */
+    @ApiModelProperty("开关状态")
+    private Integer isOpen;
+
+    /**
+     * 图文素材地址
+     */
+    @ApiModelProperty("图文素材地址")
+    private String materialUrl;
+
+    /**
+     * 图文素材媒体ID
+     */
+    @ApiModelProperty("图文素材媒体ID")
+    private String mediaId;
+
+    /**
+     * 公众号ID
+     */
+    @ApiModelProperty("公众号ID")
+    private Long accountId;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+}

pcloud-facade-book/src/main/java/com/pcloud/book/group/service/WxWorkTeacherService.java

+package com.pcloud.book.group.service;
+
+import com.pcloud.book.group.dto.ReplyMsgDTO;
+import com.pcloud.book.group.dto.WxWorkTeacherDTO;
+import com.pcloud.common.dto.ResponseDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(value = "pcloud-service-book", qualifier = "wxWorkTeacherServiceCloud", path = "book/v1.0/wxWorkTeacherService")
+@Api(description = "企业微信客服")
+public interface WxWorkTeacherService {
+
+    @ApiOperation("根据teacherIds获取企业微信客服")
+    @PostMapping("/getWxWorkTeacherByIds")
+    ResponseEntity<ResponseDto<Map<Long, WxWorkTeacherDTO>>> getWxWorkTeacherByIds(@RequestBody List<Long> teacherIds);
+
+}

pcloud-facade-book/src/main/java/com/pcloud/book/skill/service/SkillService.java

 package com.pcloud.book.skill.service;
 
+import com.pcloud.book.applet.dto.AppletNewsDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
+import com.pcloud.common.dto.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description：TODO
@@ -18,4 +28,10 @@ public interface SkillService {
     @ApiOperation(value = "定时发送任务消息", httpMethod = "GET")
     @GetMapping("skillRemindMessage")
     void skillRemindMessage();
+
+
+    @ApiOperation("获取社群map")
+    @PostMapping("getGroupByIds")
+    ResponseEntity<ResponseDto<Map<Long, GroupActivity4AppletDTO>>> getGroupByIds(@RequestBody List<Long> bookGroupClassifyIds, @RequestParam("groupType") Integer groupType);
+
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/AppletBooklistBiz.java

@@ -6,6 +6,7 @@ import com.pcloud.book.applet.dto.AppletBooklistDTO;
 import com.pcloud.book.applet.dto.AppletOuterBookDTO;
 import com.pcloud.book.applet.dto.AppletOuterBooklistDTO;
 import com.pcloud.book.applet.dto.BookDTO4Booklist;
+import com.pcloud.book.applet.dto.ServeCollectDTO;
 import com.pcloud.book.applet.entity.AppletBooklist;
 import com.pcloud.book.applet.entity.AppletBooklistClassify;
 import com.pcloud.common.page.PageBeanNew;

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/AppletGroupSearchRecordBiz.java

@@ -3,7 +3,7 @@ package com.pcloud.book.applet.biz;
 import com.pcloud.book.applet.dto.AppletGroupManageDTO;
 import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
 import com.pcloud.book.applet.entity.AppletGroupSearchRecord;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.common.page.PageBeanNew;
 import java.util.List;
 

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/AppletRecordBiz.java

 package com.pcloud.book.applet.biz;
 
+import com.pcloud.book.applet.dto.AppletAppOrProductDTO;
 import com.pcloud.book.applet.dto.AppletRecordDTO;
 import com.pcloud.book.applet.entity.AppletRecord;
 import com.pcloud.common.page.PageBeanNew;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * (AppletRecord)表服务接口
@@ -64,4 +66,12 @@ public interface AppletRecordBiz {
     PageBeanNew<AppletRecordDTO> listAppletRecord(Long wechatUserId, String date, List<Integer> recordTypes, String queryName, Integer currentPage, Integer numPerPage);
 
     List<String> listUnreachableDate(Long wechatUserId);
+
+    /**
+     * 从足迹获取应用或作品浏览人数
+     * @param recordType
+     * @param serveIds
+     * @return
+     */
+    Map<Long, AppletAppOrProductDTO> getAppOrProductBrowseCount(Integer recordType, List<Long> serveIds);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletBooklistBizImpl.java

@@ -15,6 +15,7 @@ import com.pcloud.book.applet.dto.AppletOuterBookDTO;
 import com.pcloud.book.applet.dto.AppletOuterBooklistDTO;
 import com.pcloud.book.applet.dto.BookDTO4Booklist;
 import com.pcloud.book.applet.dto.OuterBooklistAddDTO;
+import com.pcloud.book.applet.dto.ServeCollectDTO;
 import com.pcloud.book.applet.entity.AppletBooklist;
 import com.pcloud.book.applet.entity.AppletBooklistClassify;
 import com.pcloud.book.applet.entity.AppletBooklistClassifyUser;

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletGroupSearchRecordBizImpl.java

@@ -32,7 +32,7 @@ import com.pcloud.book.rightsSetting.dto.RightsSettingDto;
 import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
 import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.util.common.YesOrNoEnums;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.exceptions.BizException;

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletRecordBizImpl.java

@@ -32,7 +32,7 @@ import com.pcloud.book.group.enums.AppAndProductTypeEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.common.core.aspect.ParamLog;
@@ -45,6 +45,7 @@ import com.pcloud.common.utils.NumberUtil;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
 import com.pcloud.resourcecenter.product.dto.ProductDto;
+import org.apache.commons.collections.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +53,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -225,6 +225,12 @@ public class AppletRecordBizImpl implements AppletRecordBiz {
         return dateTimes.stream().filter(x -> !collect.contains(DateUtil.beginOfDay(x))).map(x -> DateUtil.format(x, DatePattern.NORM_DATE_FORMAT)).collect(Collectors.toList());
     }
 
+    @Override
+    public Map<Long, AppletAppOrProductDTO> getAppOrProductBrowseCount(Integer recordType, List<Long> serveIds) {
+        Map<Long, AppletAppOrProductDTO> appletAppOrProductDTOMap = appletRecordDao.getAppOrProductBrowseCount(recordType, serveIds);
+        return MapUtils.isEmpty(appletAppOrProductDTOMap) ? new HashMap<>() : appletAppOrProductDTOMap;
+    }
+
     private void fillAppletRecord(List<AppletRecordDTO> recordList, Integer bookType) {
         if (ListUtils.isEmpty(recordList)) {
             return;

pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/AppletRecordDao.java

 package com.pcloud.book.applet.dao;
 
+import com.pcloud.book.applet.dto.AppletAppOrProductDTO;
 import com.pcloud.book.applet.dto.AppletRecordBookDTO;
 import com.pcloud.book.applet.dto.AppletRecordDTO;
 import com.pcloud.book.applet.dto.AppletUserBookcaseDTO;
@@ -30,4 +31,6 @@ public interface AppletRecordDao extends BaseDao<AppletRecord> {
     List<AppletRecordBookDTO> getBooksByWechatUserId(Long wechatUserId);
 
     Long getStatisUserCount(Date prevMonday, Date prevSunday);
+
+    Map<Long, AppletAppOrProductDTO> getAppOrProductBrowseCount(Integer recordType, List<Long> serveIds);
 }

pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/impl/AppletRecordDaoImpl.java

@@ -2,6 +2,7 @@ package com.pcloud.book.applet.dao.impl;
 
 import cn.hutool.core.map.MapUtil;
 import com.pcloud.book.applet.dao.AppletRecordDao;
+import com.pcloud.book.applet.dto.AppletAppOrProductDTO;
 import com.pcloud.book.applet.dto.AppletRecordBookDTO;
 import com.pcloud.book.applet.dto.AppletRecordDTO;
 import com.pcloud.book.applet.dto.AppletUserBookcaseDTO;
@@ -65,4 +66,12 @@ public class AppletRecordDaoImpl extends BaseDaoImpl<AppletRecord> implements Ap
         paramMap.put("prevSunday", prevSunday);
         return this.sqlSessionTemplate.selectOne(getStatement("getStatisUserCount"), paramMap);
     }
+
+    @Override
+    public Map<Long, AppletAppOrProductDTO> getAppOrProductBrowseCount(Integer recordType, List<Long> serveIds) {
+        HashMap<String,Object> paramMap = new HashMap<>();
+        paramMap.put("recordType", recordType);
+        paramMap.put("serveIds", serveIds);
+        return this.sqlSessionTemplate.selectMap(getStatement("getAppOrProductBrowseCount"), paramMap, "serveId");
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletRecordDTO.java

 package com.pcloud.book.applet.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

pcloud-service-book/src/main/java/com/pcloud/book/applet/facade/AppletHomeFacade.java

@@ -553,7 +553,7 @@ public class AppletHomeFacade {
 
     @ApiOperation("客户端资讯列表")
     @GetMapping("listAppletNews4Wechat")
-    public ResponseDto<PageBeanNew<AppletNewsDTO>> listAppletNews4Wechat(
+    public ResponseDto<PageBeanNew<AppletNewsDTO>> DefaultValuelistAppletNews4Wechat(
             @CookieValue("userInfo") String userInfo,
             @RequestParam("currentPage") @ApiParam("当前页") Integer currentPage,
             @RequestParam("numPerPage") @ApiParam("每页数量") Integer numPerPage,

pcloud-service-book/src/main/java/com/pcloud/book/applet/service/impl/AppletServiceImpl.java

 package com.pcloud.book.applet.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.pcloud.book.applet.biz.AnswerSubscribeBiz;
 import com.pcloud.book.applet.biz.AppletBooklistBiz;
 import com.pcloud.book.applet.biz.AppletBookClassifyBiz;
 import com.pcloud.book.applet.biz.AppletNewsBiz;
+import com.pcloud.book.applet.biz.AppletRecordBiz;
 import com.pcloud.book.applet.biz.AppletRecordStatisBiz;
 import com.pcloud.book.applet.biz.AppletThirdResourcesStaticBiz;
 import com.pcloud.book.applet.biz.ServeCollectBiz;
+import com.pcloud.book.applet.dto.AppletAppOrProductDTO;
+import com.pcloud.book.applet.dto.AppletNewsDTO;
 import com.pcloud.book.applet.dto.AppletNewsVO;
 import com.pcloud.book.applet.dto.AppletOuterBookDTO;
+import com.pcloud.book.applet.dto.AppletOuterBooklistDTO;
+import com.pcloud.book.applet.dto.AppletThirdResourcesDTO;
 import com.pcloud.book.applet.dto.PcloudGroupActivityDTO;
 import com.pcloud.book.applet.dto.ServeCollectDTO;
+import com.pcloud.book.applet.entity.ServeCollect;
 import com.pcloud.book.applet.service.AppletService;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
 import com.pcloud.book.skill.entity.PcloudGroupActivity;
 import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.common.utils.BeanUtils;
+import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,7 +39,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.annotations.ApiParam;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName com.pcloud.book.applet.service.impl.AppletServiceImpl
@@ -63,6 +73,8 @@ public class AppletServiceImpl implements AppletService {
     private RightsSettingBiz rightsSettingBiz;
     @Autowired
     private AppletRecordStatisBiz appletRecordStatisBiz;
+    @Autowired
+    private AppletRecordBiz appletRecordBiz;
 
 
     @Override
@@ -137,4 +149,35 @@ public class AppletServiceImpl implements AppletService {
     public void addWeekAppletRecordStatis(@RequestParam(value = "mondayDate",required = false)String mondayDate) {
         appletRecordStatisBiz.addWeekAppletRecordStatis(mondayDate);
     }
+
+    @Override
+    @PostMapping("getNewsByIds")
+    public ResponseEntity<ResponseDto<Map<Long, AppletNewsDTO>>> getNewsByIds(@RequestBody List<Long> newsIds) {
+        return ResponseHandleUtil.toResponse(appletNewsBiz.getByIds(newsIds));
+    }
+
+    @Override
+    @PostMapping("getOuterBooklistByIds")
+    public ResponseEntity<ResponseDto<Map<Long, AppletOuterBooklistDTO>>> getOuterBooklistByIds(@RequestBody List<Long> bookRecommendIds) {
+        return ResponseHandleUtil.toResponse(appletBooklistBiz.getByIds(bookRecommendIds));
+    }
+
+    @Override
+    @GetMapping("getAllCollectServe")
+    public ResponseEntity<ResponseDto<List<ServeCollectDTO>>> getAllCollectServe(@RequestParam("wechatUserId") Long wechatUserId) {
+        List<ServeCollect> list4RightsSettingByWechatUserId = serveCollectBiz.getList4RightsSettingByWechatUserId(wechatUserId);
+        List<ServeCollectDTO> serveCollectDTOS = new ArrayList<>();
+        if (!ListUtils.isEmpty(list4RightsSettingByWechatUserId)) {
+            com.pcloud.common.utils.BeanUtils.copyListProperties(list4RightsSettingByWechatUserId, serveCollectDTOS, ServeCollectDTO.class);
+        }
+        return ResponseHandleUtil.toResponse(serveCollectDTOS);
+    }
+
+    @Override
+    @PostMapping("getAppOrProductBrowseCount")
+    public ResponseEntity<ResponseDto<Map<Long, AppletAppOrProductDTO>>> getAppOrProductBrowseCount(@RequestParam("recordType") Integer recordType,
+                                                                                                    @RequestBody List<Long> serveIds) {
+        Map<Long, AppletAppOrProductDTO> appletAppOrProductDTOMap = appletRecordBiz.getAppOrProductBrowseCount(recordType, serveIds);
+        return ResponseHandleUtil.toResponse(appletAppOrProductDTOMap);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/es/facade/ESBookAndAdviserFacade.java

@@ -72,7 +72,7 @@ public class ESBookAndAdviserFacade {
     }
 
     @ApiOperation("停止查询ES有而BOOK表没有的书")
-    @GetMapping("getNotFoundBookId")
+    @GetMapping("stopNotFoundBookId")
     public ResponseDto<?> stopNotFoundBookId() throws BizException {
         esBookAndAdviserBiz.stopNotFoundBookId();
         return new ResponseDto<>();

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/WeworkTeacherBiz.java

 package com.pcloud.book.group.biz;
 
+import com.pcloud.book.group.dto.WxWorkTeacherDTO;
 import com.pcloud.book.group.vo.WeworkTeacherBookBindPageVO;
 import com.pcloud.book.group.vo.WeworkTeacherBookBindVO;
 import com.pcloud.book.group.vo.WeworkTeacherVO;
 import com.pcloud.common.page.PageBeanNew;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * WeworkTeacherBiz
@@ -86,4 +88,10 @@ public interface WeworkTeacherBiz {
      */
     String getOneTeacherQrcode();
 
+    /**
+     * 根据id获取企业微信客服
+     * @param teacherIds
+     * @return
+     */
+    Map<Long, WxWorkTeacherDTO> getWxWorkTeacherByIds(List<Long> teacherIds);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java

 package com.pcloud.book.group.biz.impl;
 
-import cn.hutool.core.util.RandomUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
@@ -102,12 +101,11 @@ import com.pcloud.book.record.entity.RegionMap;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
 import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.skill.enums.ActivityGroupTypeEnum;
 import com.pcloud.book.skill.enums.GroupUpdateTypeEnum;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.book.util.properties.BookProps;
-import com.pcloud.common.constant.CacheConstant;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.core.enums.NotifyOriginTypeEnum;

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/WeworkTeacherBizImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.group.biz.GroupMaterialAccountBiz;
 import com.pcloud.book.group.biz.WeworkTeacherBiz;
+import com.pcloud.book.group.dto.WxWorkTeacherDTO;
 import com.pcloud.book.group.entity.GroupMaterialAccount;
 import com.pcloud.book.group.entity.WeworkTeacher;
 import com.pcloud.book.group.entity.WeworkTeacherBookBind;
@@ -20,7 +21,6 @@ import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.utils.ParamChecker;
 import com.pcloud.common.utils.ResponseHandleUtil;
-import com.pcloud.facade.wechat.material.dto.GroupNewsMaterialAddDTO;
 import com.pcloud.facade.wechat.material.dto.NewsMaterialTemplateDto;
 import com.pcloud.facade.wechat.material.service.MaterialService;
 import lombok.extern.slf4j.Slf4j;
@@ -246,4 +246,10 @@ public class WeworkTeacherBizImpl implements WeworkTeacherBiz {
         return weworkTeacherMapper.getOneTeacherQrcode();
     }
 
+    @Override
+    @ParamLog("根据teacherIds获取企业微信客服")
+    public Map<Long, WxWorkTeacherDTO> getWxWorkTeacherByIds(List<Long> teacherIds) {
+        return weworkTeacherMapper.getWxWorkTeacherByIds(teacherIds);
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/mapper/WeworkTeacherMapper.java

 package com.pcloud.book.group.mapper;
 
+import com.pcloud.book.group.dto.WxWorkTeacherDTO;
 import com.pcloud.book.group.entity.WeworkTeacher;
 import com.pcloud.book.group.vo.WeworkTeacherVO;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 @Component
 @Mapper
@@ -36,4 +39,7 @@ public interface WeworkTeacherMapper {
     List<WeworkTeacherVO> getMaterialByIds(@Param("longs") List<Long> longs);
 
     String getOneTeacherQrcode();
+
+    @MapKey("id")
+    Map<Long, WxWorkTeacherDTO> getWxWorkTeacherByIds(@Param("ids") List<Long> teacherIds);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/service/impl/WxWorkTeacherServiceImpl.java

+package com.pcloud.book.group.service.impl;
+
+import com.pcloud.book.group.biz.WeworkTeacherBiz;
+import com.pcloud.book.group.dto.WxWorkTeacherDTO;
+import com.pcloud.book.group.service.WxWorkTeacherService;
+import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.common.utils.ResponseHandleUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/wxWorkTeacherService")
+public class WxWorkTeacherServiceImpl implements WxWorkTeacherService {
+
+    @Autowired
+    private WeworkTeacherBiz weworkTeacherBiz;
+
+    @Override
+    @PostMapping("/getWxWorkTeacherByIds")
+    public ResponseEntity<ResponseDto<Map<Long, WxWorkTeacherDTO>>> getWxWorkTeacherByIds(@RequestBody List<Long> teacherIds) {
+        return ResponseHandleUtil.toResponse(weworkTeacherBiz.getWxWorkTeacherByIds(teacherIds));
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/RightsSettingBiz.java

@@ -16,7 +16,7 @@ import com.pcloud.book.rightsSetting.entity.RightsSetting;
 import com.pcloud.book.rightsSetting.entity.RightsSettingClassify;
 import com.pcloud.book.rightsSetting.entity.RightsSettingItem;
 import com.pcloud.book.rightsSetting.vo.QrcodeMessage4WechatVO;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.common.page.PageBeanNew;
 
 import java.util.List;

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -2,7 +2,6 @@ package com.pcloud.book.rightsSetting.biz.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.math.MathUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -19,13 +18,11 @@ import com.pcloud.book.applet.dao.AppletThirdResourcesDao;
 import com.pcloud.book.applet.dao.AppletUserBookcaseDao;
 import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
 import com.pcloud.book.applet.dto.AppletNewsDTO;
-import com.pcloud.book.applet.dto.AppletNewsServeDTO;
 import com.pcloud.book.applet.dto.AppletOuterBooklistDTO;
 import com.pcloud.book.applet.entity.AppletNews;
 import com.pcloud.book.applet.entity.AppletThirdResources;
 import com.pcloud.book.applet.entity.AppletUserBookcase;
 import com.pcloud.book.applet.entity.ServeCollect;
-import com.pcloud.book.applet.enums.AppletNewsServeTypeEnum;
 import com.pcloud.book.applet.enums.AppletRecordTypeEnum;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.book.biz.BookAdviserBiz;
@@ -60,7 +57,6 @@ import com.pcloud.book.group.enums.QrcodeJumpType;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.group.vo.ClassifyQrcodeVO;
 import com.pcloud.book.push.dao.PersonalAppletsDao;
-import com.pcloud.book.push.entity.PersonalApplets;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.rightsSetting.check.RightsSettingCheck;
 import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
@@ -106,11 +102,10 @@ import com.pcloud.book.rightsSetting.vo.QrcodeMessage4WechatVO;
 import com.pcloud.book.rightsSetting.vo.WechatMessageVO;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
 import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.util.common.YesOrNoEnums;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
-import com.pcloud.comment.base.enums.SysCodeEnum;
 import com.pcloud.common.constant.CacheConstant;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.ProductTypeConstant;
@@ -132,14 +127,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.ArrayUtils;
-import org.elasticsearch.common.math.MathUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsNowItem.java

 package com.pcloud.book.rightsSetting.entity;
 
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsSettingItem.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pcloud.book.applet.dto.AppletNewsDTO;
 import com.pcloud.book.applet.dto.AppletOuterBooklistDTO;
 import com.pcloud.book.custom.entity.CustomPlan;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.common.entity.BaseEntity;
 
 import java.util.Date;

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/PcloudGroupActivityBiz.java

@@ -2,7 +2,7 @@ package com.pcloud.book.skill.biz;
 
 import com.pcloud.book.applet.dto.AppletGroupManageDTO;
 import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.skill.dto.UpdateActivityShowStateDTO;
 import com.pcloud.book.skill.facade.request.GroupActivityClassifyVO;
 import com.pcloud.book.skill.facade.request.GroupActivityShowStateVO;

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java

@@ -41,7 +41,7 @@ import com.pcloud.book.rightsSetting.mapper.RightsSettingTitleMapper;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
 import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
 import com.pcloud.book.skill.dao.PcloudSkillDao;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.skill.dto.UpdateActivityShowStateDTO;
 import com.pcloud.book.skill.entity.PcloudGroupActivity;
 import com.pcloud.book.skill.entity.PcloudSkill;

pcloud-service-book/src/main/java/com/pcloud/book/skill/dao/PcloudGroupActivityDao.java

 package com.pcloud.book.skill.dao;
 
 import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.skill.entity.PcloudGroupActivity;
 import com.pcloud.book.skill.facade.request.GroupActivityClassifyVO;
 import com.pcloud.book.skill.facade.request.GroupActivityShowStateVO;

pcloud-service-book/src/main/java/com/pcloud/book/skill/dao/impl/PcloudGroupActivityDaoImpl.java

@@ -2,7 +2,7 @@ package com.pcloud.book.skill.dao.impl;
 
 import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
 import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.skill.entity.PcloudGroupActivity;
 import com.pcloud.book.skill.facade.request.GroupActivityClassifyVO;
 import com.pcloud.book.skill.facade.request.GroupActivityShowStateVO;

pcloud-service-book/src/main/java/com/pcloud/book/skill/service/impl/SkillServiceImpl.java

 package com.pcloud.book.skill.service.impl;
 
+import com.pcloud.book.applet.dto.AppletNewsDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
 import com.pcloud.book.skill.biz.PcloudSubRemindBiz;
 import com.pcloud.book.skill.service.SkillService;
+import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.common.utils.ResponseHandleUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 
 @RestController("skillService")
 @RequestMapping("skillService")
@@ -14,6 +26,8 @@ public class SkillServiceImpl implements SkillService {
 
     @Autowired
     private PcloudSubRemindBiz pcloudSubRemindBiz;
+    @Autowired
+    private PcloudGroupActivityBiz pcloudGroupActivityBiz;
 
     @Override
     @GetMapping("skillRemindMessage")
@@ -22,4 +36,10 @@ public class SkillServiceImpl implements SkillService {
             pcloudSubRemindBiz.sendTimeTaskMessage();
         }).start();*/
     }
+
+    @Override
+    @PostMapping("getGroupByIds")
+    public ResponseEntity<ResponseDto<Map<Long, GroupActivity4AppletDTO>>> getGroupByIds(@RequestBody List<Long> bookGroupClassifyIds, @RequestParam("groupType") Integer groupType) {
+        return ResponseHandleUtil.toResponse(pcloudGroupActivityBiz.getByIds4NowRecord(bookGroupClassifyIds, groupType));
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskBizImpl.java

@@ -17,7 +17,7 @@ import com.pcloud.book.group.tools.SendWeixinRequestTools;
 import com.pcloud.book.keywords.enums.ReplyTypeEnum;
 import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
 import com.pcloud.book.skill.dao.PcloudSkillDao;
-import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.skill.entity.PcloudSkill;
 import com.pcloud.book.skill.enums.SkillTypeEnum;
 import com.pcloud.book.timecontrol.biz.TaskBiz;

pcloud-service-book/src/main/resources/mapper/applet/AppletRecord.Mapper.xml

@@ -317,4 +317,22 @@
             create_date BETWEEN #{prevMonday, jdbcType=DATE} AND #{prevSunday, jdbcType=DATE}
     </select>
 
+    <select id="getAppOrProductBrowseCount" parameterType="map" resultType="com.pcloud.book.applet.dto.AppletAppOrProductDTO">
+        SELECT
+	from_id serveId,
+	count(1) browseCount
+    FROM
+	`applet_record`
+    WHERE
+	record_type = #{recordType}
+    and
+    from_id in
+    <foreach collection="serveIds" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+    </foreach>
+    GROUP BY
+	record_type,
+	from_id
+    </select>
+
 </mapper>

pcloud-service-book/src/main/resources/mapper/group/WeworkTeacherMapper.xml

@@ -17,6 +17,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
+  
+  
+  <resultMap id="BaseResultMap4DTO" type="com.pcloud.book.group.dto.WxWorkTeacherDTO" extends="BaseResultMap">
+
+  </resultMap>
   <sql id="Base_Column_List">
     id, qrcode, real_name, nickname, avatar, `desc`, title, teacher_type, is_open, material_url, media_id, account_id, create_time,
     update_time
@@ -281,4 +286,13 @@
     LIMIT 1
   </select>
 
+    <select id="getWxWorkTeacherByIds" parameterType="long" resultMap="BaseResultMap4DTO">
+      select <include refid="Base_Column_List"/>
+      from wework_teacher
+      where id in
+      <foreach collection="ids" item="item" close=")" open="(" separator=",">
+        #{item}
+      </foreach>
+    </select>
+
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/skill/PcloudGroupActivityDao.xml

@@ -241,7 +241,7 @@
         ORDER BY a.create_time DESC
     </select>
 
-    <select id="getTishBookSchoolList" resultType="com.pcloud.book.skill.dto.GroupActivity4AppletDTO" parameterType="map" >
+    <select id="getTishBookSchoolList" resultType="com.pcloud.book.applet.dto.GroupActivity4AppletDTO" parameterType="map" >
         SELECT
         a.id,
         a.id groupActivityId,
@@ -326,7 +326,7 @@
   </select>
 
     <!-- 立享权益加入 编辑端群 add by pansy  2020/7/2 -->
-    <select id="getGroupClassifyByIds" resultType="com.pcloud.book.skill.dto.GroupActivity4AppletDTO">
+    <select id="getGroupClassifyByIds" resultType="com.pcloud.book.applet.dto.GroupActivity4AppletDTO">
         SELECT
         c.id,
         c.classify as `name`,
@@ -359,7 +359,7 @@
         ORDER BY c.id DESC
     </select>
 
-    <select id="getByIds" resultType="com.pcloud.book.skill.dto.GroupActivity4AppletDTO">
+    <select id="getByIds" resultType="com.pcloud.book.applet.dto.GroupActivity4AppletDTO">
         SELECT
         a.id,
         a.id groupActivityId,
@@ -400,7 +400,7 @@
     </select>
 
     <!--根据id获取第三方群信息 -->
-    <select id="getThridPartByIds" resultType="com.pcloud.book.skill.dto.GroupActivity4AppletDTO">
+    <select id="getThridPartByIds" resultType="com.pcloud.book.applet.dto.GroupActivity4AppletDTO">
         SELECT
         a.id,
         a.id groupActivityId,
@@ -432,7 +432,7 @@
         ORDER BY a.id DESC
     </select>
 
-    <select id="getGroupActivity4Applet" resultType="com.pcloud.book.skill.dto.GroupActivity4AppletDTO" parameterType="map">
+    <select id="getGroupActivity4Applet" resultType="com.pcloud.book.applet.dto.GroupActivity4AppletDTO" parameterType="map">
         SELECT
         a.id,
         a.id groupActivityId,
@@ -704,7 +704,7 @@
     a.id = #{id}
     </select>
 
-    <select id="getGroupClassifyByIds4Record" resultType="com.pcloud.book.skill.dto.GroupActivity4AppletDTO">
+    <select id="getGroupClassifyByIds4Record" resultType="com.pcloud.book.applet.dto.GroupActivity4AppletDTO">
     SELECT
     c.id,
     c.classify as `name`,