用户行为分析产品列表只显示有数据的产品

portal-manager/src/main/java/com/mortals/xhx/module/page/model/vo/PageInfoVo.java

@@ -8,13 +8,4 @@ import com.mortals.framework.model.BaseEntityLong;
 */
 public class PageInfoVo extends BaseEntityLong {
 
-    private Long platformId;
-
-    public Long getPlatformId() {
-        return platformId;
-    }
-
-    public void setPlatformId(Long platformId) {
-        this.platformId = platformId;
-    }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/page/web/PageInfoController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.product.ProductPdu;
 import com.mortals.xhx.feign.product.IProductFeign;
 import com.mortals.xhx.module.page.model.PageInfoEntity;
@@ -58,12 +59,30 @@ public class PageInfoController extends BaseCRUDJsonBodyMappingController<PageIn
 
         int code=1;
         try {
-            List<PageInfoEntity> result = service.getProductList();
-            for(PageInfoEntity item:result){
-                item.setPlatformId(item.getProductId());
+            List<PageInfoEntity> list = service.getProductList();
+            Map<Long,Long> productMap = new HashMap<>();
+            for(PageInfoEntity infoEntity:list){
+                productMap.put(infoEntity.getProductId(),infoEntity.getProductId());
             }
-            model.put("data", result);
+//
+//            model.put("data", result);
+//            model.put("message_info", busiDesc + "成功");
+            Rest<RespData<List<ProductPdu>>> result = productFeign.list(query);
+            code = result.getCode();
+            if(code > 0) {
+                List<ProductPdu> pduList = new ArrayList<>();
+                for(ProductPdu pdu:result.getData().getData()){
+                    if(productMap.containsKey(pdu.getId())){
+                        pduList.add(pdu);
+                    }
+                }
+                model.put("data", pduList);
+//                model.put("pageInfo", result.getData().getPageInfo());
+                model.put("dict", result.getData().getDict());
                 model.put("message_info", busiDesc + "成功");
+            }else {
+                model.put("message_info", result.getMsg());
+            }
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {
             code = -1;