删除冗余代码，初步优化首页的推荐专题，3.8.7之后在我的里面添加VIP分类

admin

2021-03-10 f7b2baec57a19039ca85880bbba4e17fe27f0511

 src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java

@@ -6,8 +6,10 @@
import javax.annotation.Resource;

import com.yeshi.buwan.dao.*;
import com.yeshi.buwan.dao.system.DetailSystemDao;
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.service.inter.VideoResourceMapExtraInfoService;
import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.service.inter.video.VideoInfoExtraService;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.springframework.cache.annotation.Cacheable;
@@ -33,7 +35,7 @@
    private DetailSystemDao detailSystemDao;

    @Resource
    private VideoResourceMapExtraInfoService videoResourceMapExtraInfoService;
    private VideoInfoExtraService videoInfoExtraService;

    public List<HomeType> getHomeTypeDetailList() {
        List<HomeType> list = homeTypeDao.list("from HomeType h order by h.orderby desc");
@@ -41,8 +43,8 @@
        return getHomeType(list);
    }

    public List<HomeType> getHomeTypeList(String systemId){
        List<HomeType> list = homeTypeDao.list("from HomeType h where h.system.id=? order by h.orderby desc",systemId);
    public List<HomeType> getHomeTypeList(String systemId) {
        List<HomeType> list = homeTypeDao.list("from HomeType h where h.system.id=? order by h.orderby desc", systemId);
        return list;
    }

@@ -97,7 +99,7 @@
                                video.setHpicture(obj[16] + "");
                                video.setLatestHpicture(obj[17] + "");
                                video.setWatchCount(obj[18] + "");
                                video.setCommentCount(Integer.parseInt(obj[19] + ""));
                                video.setCommentCount(obj[19] != null ? Integer.parseInt(obj[19] + "") : 0);

                                ht.setIcon(obj[20] + "");
                                hv.setVideo(video);
@@ -106,10 +108,15 @@
                                // hv.getVideo().getName());

                                // 更改图片显示
                                if (!StringUtil.isNullOrEmpty(hv.getVideo().getLatestHpicture()))
                                    hv.getVideo().setPicture(hv.getVideo().getLatestHpicture());
                                else
                                    hv.getVideo().setPicture(hv.getVideo().getHpicture());
                                //如果为竖版
                                if (ht.getColumns() == 2) {
                                    if (!StringUtil.isNullOrEmpty(hv.getVideo().getLatestHpicture()))
                                        hv.getVideo().setPicture(hv.getVideo().getLatestHpicture());
                                    else
                                        hv.getVideo().setPicture(hv.getVideo().getHpicture());
                                } else {
//                                    hv.getVideo().setPicture(hv.getVideo().getVpicture());
                                }

                                if (StringUtil.isNullOrEmpty(hv.getPicture()))
                                    hv.setPicture(hv.getVideo().getPicture());
@@ -155,28 +162,16 @@

            }
        });
        List<String> videoIdList = new ArrayList<>();
        List<VideoInfo> videoInfoList = new ArrayList<>();
        for (HomeType ht : homeTypeList) {
            if (ht.getHomeVideoList() != null)
                for (HomeVideo hv : ht.getHomeVideoList()) {
                    if (hv.getVideo() != null)
                        videoIdList.add(hv.getVideo().getId());
                        videoInfoList.add(hv.getVideo());
                }
        }

        Map<String, VideoResourceMapExtraInfo> videoMap = videoResourceMapExtraInfoService.listMap(videoIdList, resourceIds);
        for (HomeType ht : homeTypeList) {
            if (ht.getHomeVideoList() != null)
                for (HomeVideo hv : ht.getHomeVideoList()) {
                    if (hv.getVideo() != null) {
                        hv.getVideo().setVideoResourceMapExtraInfo(videoMap.get(hv.getVideo().getId()));
                        if (hv.getVideo().getVideoResourceMapExtraInfo() != null)
                            hv.getVideo().setFree(hv.getVideo().getVideoResourceMapExtraInfo().getFree());
                    }
                }
        }


        videoInfoExtraService.batchExtra(videoInfoList, resourceIds);
        return homeTypeList;
    }

@@ -236,7 +231,7 @@
                    for (HomeVideo sp : homeVideoList)
                        session.delete(sp);

                    session.delete(session.get(HomeType.class,id));
                    session.delete(session.get(HomeType.class, id));
                    session.flush();
                    session.getTransaction().commit();
                } catch (Exception e) {
@@ -496,14 +491,14 @@

    }

    public long getHomeTypeAdminCount(String key, String systemId,int detailSystem) {
    public long getHomeTypeAdminCount(String key, String systemId, int detailSystem) {
        String sql = "";
        if (detailSystem > 0)
            sql = "select count(*) from  (select count(*) from wk_video_super_hometype zb left join wk_video_hometype c on c.id=zb.hometypeid where zb.detailsystemid="
                    + detailSystem + " and c.name like '%" + key + "%' group by zb.hometypeid) s";
        else
            sql = "select count(*) from  (select count(*) from wk_video_super_hometype zb left join wk_video_hometype c on c.id=zb.hometypeid where  c.name like '%"
                    + key + "%' and c.system="+systemId+" group by zb.hometypeid) s";
                    + key + "%' and c.system=" + systemId + " group by zb.hometypeid) s";

        return homeTypeDao.getCountSQL(sql);
    }