From 4011b8d0b377af33e2bc435f7726329630d706cb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 02 三月 2021 18:28:52 +0800
Subject: [PATCH] 搜索引擎接口更新

---
 src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java b/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java
index 661bb14..3001d79 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java
@@ -35,10 +35,15 @@
     @Resource
     private VideoResourceMapExtraInfoService videoResourceMapExtraInfoService;
 
-    public List<HomeType> getHomeType() {
+    public List<HomeType> getHomeTypeDetailList() {
         List<HomeType> list = homeTypeDao.list("from HomeType h order by h.orderby desc");
 
         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);
+        return list;
     }
 
     @SuppressWarnings("unchecked")
@@ -231,7 +236,7 @@
                     for (HomeVideo sp : homeVideoList)
                         session.delete(sp);
 
-                    session.delete(new HomeType(id));
+                    session.delete(session.get(HomeType.class,id));
                     session.flush();
                     session.getTransaction().commit();
                 } catch (Exception e) {
@@ -341,7 +346,7 @@
                     for (int i = 0; i < list.size(); i++) {
                         List<HomeVideo> videoList = session
                                 .createQuery(
-                                        "select h from HomeVideo h LEFT JOIN h.juhe as v  where v.id=h.video.id and h.video.show='1' and hometype=:hometype order by v.orderby desc,v.watchCount desc,h.createtime desc")
+                                        "select h from HomeVideo h   where h.video.show='1' and hometype=:hometype order by h.video.orderby desc,h.video.watchCount desc,h.video.createtime desc")
                                 .setParameter("hometype", ((HomeType) list.get(i)).getId()).setFirstResult(0)
                                 .setMaxResults(list.get(i).getNumber()).list();
                         ((HomeType) list.get(i)).setHomeVideoList(videoList);
@@ -437,19 +442,19 @@
      */
 
     @SuppressWarnings("unchecked")
-    public List<HomeTypeAdmin> getHomeTypeAdmin(final String key, final int detailSystem, final int page) {
+    public List<HomeTypeAdmin> getHomeTypeAdmin(final String key, final String systemId, final int detailSystem, final int page) {
 
         return (List<HomeTypeAdmin>) homeTypeDao.excute(new HibernateCallback<List<HomeTypeAdmin>>() {
             public List<HomeTypeAdmin> doInHibernate(Session session) throws HibernateException {
                 List<HomeTypeAdmin> zhiBoClassList = new ArrayList<>();
                 try {
-                    List<DetailSystem> detailSystemList = session.createQuery("from DetailSystem").list();
+                    List<DetailSystem> detailSystemList = session.createQuery("from DetailSystem ds where ds.system.id=" + systemId).list();
                     String sql = "";
                     if (detailSystem > 0)
                         sql = "select sh.homeType from SuperHomeType sh where sh.homeType.name like ? and sh.detailSystem.id="
                                 + detailSystem + " order by  sh.homeType.orderby desc";
                     else
-                        sql = "from HomeType zb where zb.name like ? order by zb.orderby desc";
+                        sql = "from HomeType zb where zb.name like ? and zb.system.id=" + systemId + " order by zb.orderby desc";
 
                     List<HomeType> list = session.createQuery(sql).setParameter(0, "%" + key + "%")
                             .setFirstResult((page - 1) * Constant.pageCount).setMaxResults(Constant.pageCount).list();
@@ -491,14 +496,14 @@
 
     }
 
-    public long getHomeTypeAdminCount(String key, 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 + "%' group by zb.hometypeid) s";
+                    + key + "%' and c.system="+systemId+" group by zb.hometypeid) s";
 
         return homeTypeDao.getCountSQL(sql);
     }

--
Gitblit v1.8.0