Merge branch 'fixbug/1003971' into 'master'

fixbug:[1003971]  finish fillTypeCode

See merge request rays/pcloud-book!1180

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

@@ -118,4 +118,9 @@ public interface ServeCollectBiz {
      */
     void processingData();
 
+    /**
+     * 填充收藏TypeCode和TypeName
+     */
+    void processingData2TypeCode();
+
 }
\ No newline at end of file

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

 package com.pcloud.book.applet.biz.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import com.pcloud.appcenter.app.dto.AppDto;
 import com.pcloud.appcenter.app.dto.AppTypeDto;
@@ -486,6 +487,90 @@ public class ServeCollectBizImpl implements ServeCollectBiz {
         return serveCollectDao.getDistinctTypeCode();
     }
 
+    /**
+     * 填充数据:typeCode,typeName
+     */
+    public void processingData2TypeCode(){
+        int currentPage = 0;
+        while(true){
+            PageBeanNew<ServeCollect> pageBeanNew = serveCollectDao.listPageNew(new PageParam(currentPage, 1000), null, "List2ProcessedData");
+            if (CollUtil.isEmpty(pageBeanNew.getRecordList())){
+                return;
+            }
+            fillTypeCodeAndTypeName(pageBeanNew.getRecordList());
+            currentPage++;
+            serveCollectDao.batchUpdate(pageBeanNew.getRecordList());
+        }
+    }
+
+    private void fillTypeCodeAndTypeName(List<ServeCollect> recordList){
+
+        List<Long> productsIdList = recordList.stream().filter(serveCollect -> AppletRecordTypeEnum.PRODUCT.value.equals(serveCollect.getServeType())).
+                map(serveCollect -> serveCollect.getServeId()).collect(Collectors.toList());
+        List<Long> appIdList = recordList.stream().filter(serveCollect -> AppletRecordTypeEnum.APP.value.equals(serveCollect.getServeType())).
+                map(serveCollect -> serveCollect.getServeId()).collect(Collectors.toList());
+
+        Map<Long,ProductDto> productDtoMap = new HashMap<>();
+        Future<Map<Long,ProductDto>> productDtoMapFuture = null;
+        Map<Long,AppDto> appDtoMap = new HashMap<>();
+        Future<Map<Long,AppDto>> appDtoMapFuture = null;
+
+        if (!CollUtil.isEmpty(productsIdList)){
+            productDtoMapFuture = ThreadPoolUtils.FILL_APPLET_RECORD.submit(() -> productConsr.getProBasesByIds(productsIdList));
+        }
+        if (!CollUtil.isEmpty(appIdList)){
+            appDtoMapFuture = ThreadPoolUtils.FILL_APPLET_RECORD.submit(() -> appConsr.mapByIds4AuditPass(appIdList));
+        }
+        Iterator<ServeCollect> iterator = recordList.iterator();
+        while(iterator.hasNext()){
+            ServeCollect serveCollect = iterator.next();
+            if (Objects.equals(AppletRecordTypeEnum.PRODUCT.value,serveCollect.getServeType())){
+                fillProTypeNameAndTypeCode(productDtoMap,productDtoMapFuture,serveCollect);
+            }
+            if (Objects.equals(AppletRecordTypeEnum.APP.value,serveCollect.getServeType())){
+                fillAppTypeNameAndTypeCode(appDtoMap,appDtoMapFuture,serveCollect);
+            }
+        }
+
+    }
+
+    /**
+     * 填充product收藏的TypeName与TypeCode
+     * @param productDtoMap
+     * @param productDtoMapFuture
+     * @param serveCollect
+     */
+    private void fillProTypeNameAndTypeCode(Map<Long,ProductDto> productDtoMap,Future<Map<Long,ProductDto>> productDtoMapFuture,ServeCollect serveCollect){
+        try{
+            productDtoMap =  productDtoMapFuture.get();
+        }catch (InterruptedException | ExecutionException e){
+            LOGGER.error("获取商品详情错误: {}==", e);
+        }
+        if (CollUtil.isEmpty(productDtoMap)){
+            return;
+        }
+        if ( null != productDtoMap.get(serveCollect.getServeId())){
+            serveCollect.setServeTypeCode(productDtoMap.get(serveCollect.getServeId()).getProductTypeCode());
+            serveCollect.setServeTypeName(productDtoMap.get(serveCollect.getServeId()).getProductTypeName());
+        }
+
+    }
+
+    private  void fillAppTypeNameAndTypeCode(Map<Long,AppDto> appDtoMap,Future<Map<Long,AppDto>> appDtoMapFuture,ServeCollect serveCollect){
+        try {
+            appDtoMap = appDtoMapFuture.get();
+        }catch (InterruptedException | ExecutionException e){
+            LOGGER.error("获取App详情错误：{}==",e);
+        }
+        if (CollUtil.isEmpty(appDtoMap)){
+            return;
+        }
+        if (null != appDtoMap.get(serveCollect.getServeId())){
+            serveCollect.setServeTypeCode(appDtoMap.get(serveCollect.getServeId()).getTypeCode());
+            serveCollect.setServeTypeName(appDtoMap.get(serveCollect.getServeId()).getTypeName());
+        }
+    }
+
     @Override
     public List<Long> getAllCollect(Long wechatUserId,String typeCode) {
         return serveCollectDao.getAllCollect(wechatUserId,typeCode);

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

@@ -36,4 +36,8 @@ public interface ServeCollectDao extends BaseDao<ServeCollect> {
     List<CollectionTypeNameCodeClassifyVO> getDistinctTypeCode();
 
     void updateTypeName(Map<String,String> paramMap);
+
+    List<ServeCollect> List2ProcessedData();
+
+    void batchUpdate(List<ServeCollect> serveCollectList);
 }
\ No newline at end of file

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

@@ -66,6 +66,16 @@ public class ServeCollectDaoImpl extends BaseDaoImpl<ServeCollect> implements Se
     }
 
     @Override
+    public List<ServeCollect> List2ProcessedData() {
+        return null;
+    }
+
+    @Override
+    public void batchUpdate(List<ServeCollect> serveCollectList) {
+        getSessionTemplate().update(getStatement("batchUpdate"),serveCollectList);
+    }
+
+    @Override
     public List<Long> getAllCollect(Long wechatUserId,String typeCode) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("wechatUserId",wechatUserId);

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

@@ -147,4 +147,12 @@ public class ServeCollectFacade {
         serveCollectBiz.processingData();
         return new ResponseDto<>();
     }
+
+    @ApiOperation("填充收藏TypeCode与TypeName")
+    @GetMapping("processingData2TypeCode")
+    public ResponseDto<?> processingData2TypeCode(@RequestHeader("token") String token){
+        SessionUtil.getToken4Redis(token);
+        serveCollectBiz.processingData2TypeCode();
+        return new ResponseDto<>();
+    }
 }
\ No newline at end of file

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

@@ -317,4 +317,29 @@
         where
             serve_type_code =#{serveTypeCode}
     </update>
+
+    <select id="List2ProcessedData" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List"/>
+        from
+            serve_collect
+        where
+            serve_type_code is null
+    </select>
+
+    <update id="batchUpdate" parameterType="list">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update serve_collect
+            <set>
+                update_time = NOW(),
+                <if test="item.serveTypeCode != null">
+                    serve_type_code = #{item.serveTypeCode},
+                </if>
+                <if test="item.serveTypeName != null">
+                    serve_type_name = #{item.serveTypeName}
+                </if>
+            </set>
+            where id = #{item.id}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file