Merge branch 'zyj-1002032' into 'master'

好友列表内部接口

See merge request rays/pcloud-book!284

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

@@ -71,8 +71,4 @@ public interface BookGroupClassifyService {
     @PostMapping("getGroupClassifyCount")
     ResponseEntity<ResponseDto<Map<Long, BookClassifyDTO>>> getGroupClassifyCount(@RequestBody List<Long> bookIds);
 
-    @ApiOperation("根据微信群标识获取相关id--生产环境旧数据处理")
-    @PostMapping("mapGroupQrcodeBaseInfo4ProEnv")
-    ResponseEntity<ResponseDto<Map<Long, GroupQrcodeBaseDTO>>> mapGroupQrcodeBaseInfo4ProEnv(@RequestBody List<Long> groupQrcodeIds);
-
 }

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

@@ -170,4 +170,12 @@ public interface BookGroupService {
     @ApiOperation("根据类型获取社群书id集合")
     @GetMapping("getBookGroupIdsByJoinGroupType")
     ResponseEntity<ResponseDto<List<Long>>> getBookGroupIdsByJoinGroupType(@RequestParam("joinGroupType") Integer joinGroupType);
+
+    @ApiOperation("查小号的好友id列表")
+    @PostMapping("getFriendIdListByBookAndRobot")
+    ResponseEntity<ResponseDto<List<String>>> getFriendIdListByBookAndRobot(@RequestParam("altId") String altId, @RequestBody @ApiParam List<Long> bookIds);
+
+    @ApiOperation("用户扫码书刊名称")
+    @PostMapping("mapUserScanBook")
+    ResponseEntity<ResponseDto<Map<String, List<String>>>> mapUserScanBook(@RequestParam("altId") String altId, @RequestBody @ApiParam List<String> wxUserIdList);
 }

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

 package com.pcloud.book.group.service;
 
-import com.pcloud.book.group.dto.*;
+import com.pcloud.book.group.dto.BookWxQrcodeDTO;
+import com.pcloud.book.group.dto.GroupQrcodeInfo4Advertising;
+import com.pcloud.book.group.dto.SearchDto;
+import com.pcloud.book.group.dto.SyncWeixinGroupIdDTO;
+import com.pcloud.book.group.dto.UpdateQrDTO;
+import com.pcloud.book.group.dto.WeixinQrcodeCountDTO;
+import com.pcloud.book.group.dto.WeixinQrcodeDTO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 
@@ -99,7 +105,11 @@ public interface WeixinQrcodeService {
     @RequestMapping(value = "listUpdateQrByGeneration", method = RequestMethod.POST)
     ResponseEntity<ResponseDto<List<UpdateQrDTO>>> listUpdateQrByGeneration(@RequestBody SearchDto searchDto);
 
-    @ApiOperation("根据版本号获取机器人ip")
+    @ApiOperation("根据版本号列表获取机器人ip")
     @PostMapping("getRobotWxGroupIpByGeneration")
     ResponseEntity<ResponseDto<Map<Integer, String>>> getRobotWxGroupIpByGeneration(@RequestBody List<Integer> generations);
+
+    @ApiOperation("根据版本号获取机器人ip")
+    @GetMapping("getRobotIpByGeneration")
+    ResponseEntity<ResponseDto<String>> getRobotIpByGeneration(@RequestParam("generation") Integer generation);
 }

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

@@ -643,4 +643,19 @@ public interface BookGroupBiz {
      * 获取随机码
      */
     String getRandomCode(Long wechatUserId);
+    /**
+     * 查小号的好友id
+     * @param altId
+     * @param bookIds
+     * @return
+     */
+    public List<String> getFriendIdListByBookAndRobot(String altId, List<Long> bookIds);
+
+    /**
+     * 用户扫码书刊名称
+     * @param altId
+     * @param wxUserIdList
+     * @return
+     */
+    Map<String,List<String>> mapUserScanBook(String altId, List<String> wxUserIdList);
 }

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

@@ -253,10 +253,4 @@ public interface BookGroupClassifyBiz {
      */
     Integer getClassifyCountByJoinGroupType(Integer joinGroupType);
 
-    /**
-     * 微信群旧数据处理
-     * @param groupQrcodeIds
-     * @return
-     */
-    Map<Long, GroupQrcodeBaseDTO> mapGroupQrcodeBaseInfo4ProEnv(List<Long> groupQrcodeIds);
 }

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

@@ -141,4 +141,11 @@ public interface WeixinQrcodeBiz {
      * 根据版本号获取机器人ip
      */
     Map<Integer, String> getRobotWxGroupIpByGeneration(List<Integer> generations);
+
+    /**
+     * 根据版本号获取机器人ip
+     * @param generation
+     * @return
+     */
+    String getRobotIpByGeneration(Integer generation);
 }

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

@@ -108,6 +108,7 @@ import com.pcloud.book.group.vo.ResourceClickVO;
 import com.pcloud.book.group.vo.ResourcesStatisticVO;
 import com.pcloud.book.group.vo.StatisticVO;
 import com.pcloud.book.group.vo.TotalRescourceDataVO;
+import com.pcloud.book.group.vo.UserBookInfoItemVO;
 import com.pcloud.book.group.vo.UserBookInfoVO;
 import com.pcloud.book.group.vo.WxGroupStatisticVO;
 import com.pcloud.book.keywords.biz.BookKeywordBiz;
@@ -3720,4 +3721,28 @@ public class BookGroupBizImpl implements BookGroupBiz {
         }
         return s;
     }
+
+    @Override
+    public List<String> getFriendIdListByBookAndRobot(String altId, List<Long> bookIds) {
+        return bookGroupCipherUserDao.getFriendIdListByBookAndRobot(altId, bookIds);
+    }
+
+    @Override
+    public Map<String, List<String>> mapUserScanBook(String altId, List<String> wxUserIdList) {
+        Map<String, List<String>> map = new HashMap<>();
+        if (ListUtils.isEmpty(wxUserIdList)) {
+            return new HashMap<>();
+        }
+        for (String wxUserId : wxUserIdList) {
+            List<UserBookInfoItemVO> bookList = bookGroupCipherUserDao.getScanBookInfoByUser(wxUserId, altId);
+            List<String> bookNameList = new ArrayList<>();
+            if (!ListUtils.isEmpty(bookList)) {
+                bookNameList = bookList.stream().filter(s -> s.getBookName() != null).map(UserBookInfoItemVO::getBookName).distinct().collect(Collectors.toList());
+            }
+            if (!ListUtils.isEmpty(bookNameList)) {
+                map.put(wxUserId, bookNameList);
+            }
+        }
+        return map;
+    }
 }

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

@@ -1212,13 +1212,4 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         return bookGroupClassifyDao.getClassifyCountByJoinGroupType(joinGroupType);
     }
 
-    @Override
-    public Map<Long, GroupQrcodeBaseDTO> mapGroupQrcodeBaseInfo4ProEnv(List<Long> groupQrcodeIds) {
-        if (ListUtils.isEmpty(groupQrcodeIds)) {
-            return null;
-        }
-        return bookGroupClassifyDao.mapGroupQrcodeBaseInfo4ProEnv(groupQrcodeIds);
-    }
-
-
 }

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

@@ -15,8 +15,8 @@ import com.pcloud.book.group.dto.UpdateQrDTO;
 import com.pcloud.book.group.dto.WeixinQrcodeCountDTO;
 import com.pcloud.book.group.dto.WeixinQrcodeDTO;
 import com.pcloud.book.group.entity.WeixinQrcode;
-import com.pcloud.book.group.enums.JoinGroupTypeEnum;
 import com.pcloud.book.group.entity.WeixinQrcodeGeneration;
+import com.pcloud.book.group.enums.JoinGroupTypeEnum;
 import com.pcloud.book.group.enums.UpdateStatusEnum;
 import com.pcloud.book.group.tools.Kit;
 import com.pcloud.book.group.tools.QrcodeTools;
@@ -463,6 +463,17 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
         return map;
     }
 
+    @ParamLog("根据版本号获取机器人ip")
+    @Override
+    public String getRobotIpByGeneration(Integer generation) {
+        String ip = null;
+        WeixinQrcodeGeneration weixinQrcodeGeneration = weixinQrcodeGenerationDao.getByGeneration(generation);
+        if (null != weixinQrcodeGeneration) {
+            ip = weixinQrcodeGeneration.getWechatGroupIp();
+        }
+        return ip;
+    }
+
     private void updateQrUrlVIP(List<UpdateQrDTO> updateQrs) {
         if (ListUtils.isEmpty(updateQrs)) {
             return;

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupCipherUserDao.java

@@ -132,4 +132,12 @@ public interface BookGroupCipherUserDao extends BaseDao<BookGroupCipherUser> {
      * @return
      */
     public List<UserBookInfoVO> listUser4SelfPush(Map<String,Object> map);
+
+    /**
+     * 查小号的好友id
+     * @param altId
+     * @param bookIds
+     * @return
+     */
+    public List<String> getFriendIdListByBookAndRobot(String altId, List<Long> bookIds);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupClassifyDao.java

@@ -282,13 +282,6 @@ public interface BookGroupClassifyDao extends BaseDao<BookGroupClassify> {
     List<SelfBookGroupStDTO> listClassifyCountInfo(List<Long> bookGroupIds);
 
     /**
-     * 微信群旧数据处理
-     * @param groupQrcodeIds
-     * @return
-     */
-    Map<Long, GroupQrcodeBaseDTO> mapGroupQrcodeBaseInfo4ProEnv(List<Long> groupQrcodeIds);
-
-    /**
      * 获取群分类数量等信息
      */
     Map<Long,BookGroupStatisticDTO> getClassifyCountAbout(List<Long> bookGroupIds);

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

@@ -150,4 +150,12 @@ public class BookGroupCipherUserDaoImpl extends BaseDaoImpl<BookGroupCipherUser>
     public List<UserBookInfoVO> listUser4SelfPush(Map<String, Object> map) {
         return getSessionTemplate().selectList(getStatement("listUser4SelfPush"), map);
     }
+
+    @Override
+    public List<String> getFriendIdListByBookAndRobot(String altId, List<Long> bookIds) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("bookIds", bookIds);
+        map.put("altId", altId);
+        return getSessionTemplate().selectList(getStatement("getFriendIdListByBookAndRobot"), map);
+    }
 }

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

@@ -278,11 +278,6 @@ public class BookGroupClassifyDaoImpl extends BaseDaoImpl<BookGroupClassify> imp
     }
 
     @Override
-    public Map<Long, GroupQrcodeBaseDTO> mapGroupQrcodeBaseInfo4ProEnv(List<Long> groupQrcodeIds) {
-        return this.getSqlSession().selectMap(this.getStatement("mapGroupQrcodeBaseInfo4ProEnv"), groupQrcodeIds, "groupQrcodeId");
-    }
-
-    @Override
     public Map<Long, BookGroupStatisticDTO> getClassifyCountAbout(List<Long> bookGroupIds) {
         return this.getSqlSession().selectMap(this.getStatement("getClassifyCountAbout"), bookGroupIds, "bookGroupId");
     }

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

@@ -115,10 +115,4 @@ public class BookGroupClassifyServiceImpl implements BookGroupClassifyService {
         return ResponseHandleUtil.toResponse(groupClassifyCount);
     }
 
-    @Override
-    @PostMapping("mapGroupQrcodeBaseInfo4ProEnv")
-    public ResponseEntity<ResponseDto<Map<Long, GroupQrcodeBaseDTO>>> mapGroupQrcodeBaseInfo4ProEnv(@RequestBody List<Long> groupQrcodeIds) {
-        Map<Long, GroupQrcodeBaseDTO> groupQrcodeMap = bookGroupClassifyBiz.mapGroupQrcodeBaseInfo4ProEnv(groupQrcodeIds);
-        return ResponseHandleUtil.toResponse(groupQrcodeMap);
-    }
 }

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

@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 
 /**
  * Description 社群书内部接口实现类
@@ -112,14 +113,6 @@ public class BookGroupServiceImpl implements BookGroupService {
         return ResponseHandleUtil.toResponse(bookGroupBiz.getBaseInfoBySceneId(sceneId));
     }
 
-
-
-    @Override
-    @RequestMapping(value = "updatePersonQrcode",method = RequestMethod.POST)
-    public void updatePersonQrcode(@RequestBody PersonalQrcodeDTO personalQrcodeDTO) throws BizException {
-        bookGroupBiz.updatePersonQrcode(personalQrcodeDTO);
-    }
-
     /**
      * 获取暗号状态
      */
@@ -150,11 +143,10 @@ public class BookGroupServiceImpl implements BookGroupService {
         return ResponseHandleUtil.toResponse(bookGroupBiz.getGroupUse(altIds));
     }
 
-    @ApiOperation("获取暗号基本信息")
-    @GetMapping("/getJoinGroupCipher")
     @Override
-    public ResponseEntity<ResponseDto<GroupCipherDTO>> getJoinGroupCipher(@RequestParam("cipher")String cipher) throws BizException {
-        return ResponseHandleUtil.toResponse(bookGroupBiz.getJoinGroupCipher(cipher));
+    @RequestMapping(value = "updatePersonQrcode",method = RequestMethod.POST)
+    public void updatePersonQrcode(@RequestBody PersonalQrcodeDTO personalQrcodeDTO) throws BizException {
+        bookGroupBiz.updatePersonQrcode(personalQrcodeDTO);
     }
 
     /**
@@ -168,6 +160,14 @@ public class BookGroupServiceImpl implements BookGroupService {
         return ResponseHandleUtil.toResponse(bookGroupBiz.getResourcesBrowseCount(resourceBrowseParamDto));
     }
 
+    @ApiOperation("获取暗号基本信息")
+    @GetMapping("/getJoinGroupCipher")
+    @Override
+    public ResponseEntity<ResponseDto<GroupCipherDTO>> getJoinGroupCipher(@RequestParam("cipher")String cipher) throws BizException {
+        return ResponseHandleUtil.toResponse(bookGroupBiz.getJoinGroupCipher(cipher));
+    }
+
+
     @GetMapping("getBookGroupFriendsCountByDay")
     public ResponseEntity<ResponseDto<Map<String, Integer>>> getBookGroupFriendsCountByDay(
             @RequestParam("bookGroupId") Long bookGroupId, @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate) {
@@ -212,12 +212,6 @@ public class BookGroupServiceImpl implements BookGroupService {
         return ResponseHandleUtil.toResponse(qrcodeIds);
     }
 
-    @ApiOperation("上架所有的个人号配置资源")
-    @GetMapping("dealBookGroupServeOldOnShelves")
-    public void dealBookGroupServeOldOnShelves(){
-        bookGroupBiz.dealBookGroupServeOldOnShelves();
-    }
-
     @Override
     @GetMapping("getFriendIdsByBookGroupId")
     public ResponseEntity<ResponseDto<List<String>>> getFriendIdsByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId) {
@@ -278,10 +272,16 @@ public class BookGroupServiceImpl implements BookGroupService {
     @GetMapping("getAltAndCountDTOListByAgentId")
     @Override
     public ResponseEntity<ResponseDto<List<AltAndCountDTO>>> getAltAndCountDTOListByAgentId(@RequestParam("agentId") Long agentId) {
-        List<AltAndCountDTO> list=bookGroupBiz.getAltAndCountDTOListByAgentId(agentId);
+        List<AltAndCountDTO> list = bookGroupBiz.getAltAndCountDTOListByAgentId(agentId);
         return ResponseHandleUtil.toResponse(list);
     }
 
+    @ApiOperation("上架所有的个人号配置资源")
+    @GetMapping("dealBookGroupServeOldOnShelves")
+    public void dealBookGroupServeOldOnShelves() {
+        bookGroupBiz.dealBookGroupServeOldOnShelves();
+    }
+
     @ApiOperation("补充社群书旧的作品应用到新的表")
     @GetMapping("addOldBookGroupAppToNew")
     @Override
@@ -296,4 +296,20 @@ public class BookGroupServiceImpl implements BookGroupService {
         List<Long> bookGroupIds = bookGroupBiz.getBookGroupIdsByJoinGroupType(joinGroupType);
         return ResponseHandleUtil.toResponse(bookGroupIds);
     }
+
+    @ApiOperation("查小号的好友id列表")
+    @PostMapping("getFriendIdListByBookAndRobot")
+    @Override
+    public ResponseEntity<ResponseDto<List<String>>> getFriendIdListByBookAndRobot(@RequestParam("altId") String altId, @RequestBody @ApiParam List<Long> bookIds) {
+        List<String> idList = bookGroupBiz.getFriendIdListByBookAndRobot(altId, bookIds);
+        return ResponseHandleUtil.toResponse(idList);
+    }
+
+    @ApiOperation("1v1用户扫码书刊名称")
+    @PostMapping("mapUserScanBook")
+    @Override
+    public ResponseEntity<ResponseDto<Map<String, List<String>>>> mapUserScanBook(@RequestParam("altId") String altId, @RequestBody @ApiParam List<String> wxUserIdList) {
+        Map<String, List<String>> map = bookGroupBiz.mapUserScanBook(altId, wxUserIdList);
+        return ResponseHandleUtil.toResponse(map);
+    }
 }

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

@@ -17,7 +17,6 @@ import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +30,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.ApiOperation;
+
 /**
  * @author lily
  * @date 2019/4/19 16:01
@@ -171,4 +172,10 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
         return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getRobotWxGroupIpByGeneration(generations));
     }
 
+    @ApiOperation("根据版本号获取机器人ip")
+    @GetMapping("getRobotIpByGeneration")
+    @Override
+    public ResponseEntity<ResponseDto<String>> getRobotIpByGeneration(@RequestParam("generation") Integer generation) {
+        return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getRobotIpByGeneration(generation));
+    }
 }

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

@@ -438,4 +438,20 @@
         g.id DESC
     </select>
 
+    <select id="getFriendIdListByBookAndRobot" parameterType="map" resultType="string">
+        SELECT DISTINCT
+        u.wx_user_id
+        FROM
+        book_group_cipher_user u
+        LEFT JOIN book_group g ON u.book_group_id = g.id
+        WHERE
+        u.alt_id = #{altId}
+        <if test="bookIds != null and bookIds.size>0">
+            AND g.book_id IN
+            <foreach collection="bookIds" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -1026,24 +1026,6 @@
         t.book_group_id
     </select>
 
-    <!--生产环境旧数据处理-->
-    <select id="mapGroupQrcodeBaseInfo4ProEnv" resultType="com.pcloud.book.group.dto.GroupQrcodeBaseDTO" parameterType="list">
-        SELECT
-        q.id groupQrcodeId,
-        q.group_name groupName,
-        b.book_name bookName,
-        c.classify classify
-        FROM
-        00_book_group_qrcode_191205 q
-        JOIN book_group_classify c ON q.classify_id = c.id
-        LEFT JOIN book b ON c.book_id = b.book_id
-        WHERE
-        q.id in
-        <foreach collection = "list" index="index" item = "item" open = "("  separator= "," close = ")">
-            #{item}
-        </foreach>
-    </select>
-
     <!--查询群分类数量等信息-->
     <select id="getClassifyCountAbout" resultMap="BookGroupStatisticMap" parameterType="list">
         SELECT