【新增】

src/main/java/io/office/modules/manage/controller/BikefirmController.java

@@ -128,9 +128,7 @@ public class BikefirmController {
         //新增查询日志
         searchgtinlogService.save(searchgtinlogEntity);
 
-        return R.ok().
-
-                put("data", bikefirmService.getBikeFirm(bikeFirmVo));
+        return R.ok().put("data", bikefirmService.getBikeFirm(bikeFirmVo));
     }
 
 

src/main/java/io/office/modules/manage/controller/CasesController.java

@@ -41,9 +41,11 @@ public class CasesController {
     @RequestMapping("/api/frontList")
     @Login
     // @RequiresPermissions("manage:partners:list")
-    public R frontList(){
-        List<CasesEntity> casesList = this.casesService.frontList();
-        return R.ok().put("casesList", casesList);
+    public R frontList(@RequestBody Map<String, Object> params){
+
+        PageUtils pageUtils = new PageUtils(this.casesService.getPageList(params));
+
+        return R.ok().put("data", pageUtils);
     }
 
 

src/main/java/io/office/modules/manage/controller/NewsController.java

 package io.office.modules.manage.controller;
 
 
-import java.security.Policy;
+
 import java.util.List;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import io.office.modules.app.annotation.Login;
 import io.office.modules.manage.entity.*;
 import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.service.*;
+import io.office.modules.manage.vo.response.SearchVo;
 import io.office.modules.sys.controller.AbstractController;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
@@ -471,5 +470,17 @@ public class NewsController extends AbstractController {
         return R.ok().put("data", list);
     }
 
+    @Login
+    @RequestMapping("/api/getSearchInfo")
+    // @RequiresPermissions("manage:product:findPage")
+    public R getSearchInfo(@RequestBody Map<String,String> param){
+        Page<SearchVo> pag = this.newsService.getSearchInfo(param.get("name")==null?null:param.get("page"),
+                new Page(Integer.valueOf(param.get("page")),
+                        Integer.valueOf(param.get("size"))));
+        PageUtils pageUtils = new PageUtils(pag);
+        return R.ok().put("page", pageUtils);
+    }
+
+
 
 }

src/main/java/io/office/modules/manage/controller/PartnersController.java

@@ -54,9 +54,11 @@ public class PartnersController extends AbstractController {
     @RequestMapping("/api/frontList")
     @Login
     // @RequiresPermissions("manage:partners:list")
-    public R frontList(/*@RequestBody Map<String, Object> params*/){
-        List<PartnersEntity> partnersList = this.partnersService.frontList(null);
-        return R.ok().put("partnersList", partnersList);
+    public R frontList(@RequestBody Map<String, Object> params){
+
+        PageUtils pageUtils = new PageUtils(this.partnersService.frontList(params));
+
+        return R.ok().put("data", pageUtils);
     }
 
 

src/main/java/io/office/modules/manage/dao/CasesDao.java

 package io.office.modules.manage.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.modules.manage.entity.CasesEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -17,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface CasesDao extends BaseMapper<CasesEntity> {
     @Select("select  * from Cases where status=#{status}  and levels>#{levels} order by id desc")
-    List<CasesEntity> selectByStatusAndLevels(String status, String levels);
+    List<CasesEntity> selectByStatusAndLevels(@Param("status") String status,@Param("levels") String levels, Page page);
 }

src/main/java/io/office/modules/manage/dao/NewsDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.modules.manage.entity.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import io.office.modules.manage.entity.dto.NewsParams;
+import io.office.modules.manage.vo.response.SearchVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -92,4 +93,6 @@ public interface NewsDao extends BaseMapper<NewsEntity> {
     List<NewtopicEntity> zttjList();
 
     List<NewsEntity> relatedLinks(Map<String, Object> params);
+
+    List<SearchVo> getSearchInfo(@Param("name") String name, Page page);
 }

src/main/java/io/office/modules/manage/service/CasesService.java

 package io.office.modules.manage.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import io.office.common.utils.PageUtils;
 import io.office.modules.manage.entity.CasesEntity;
@@ -18,7 +19,9 @@ public interface CasesService extends IService<CasesEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List<CasesEntity> frontList();
+
+    Page<CasesEntity> getPageList(Map<String, Object> params);
+
 
 }
 

src/main/java/io/office/modules/manage/service/NewsService.java

@@ -6,6 +6,7 @@ import io.office.common.utils.PageUtils;
 import io.office.common.utils.R;
 import io.office.modules.manage.entity.*;
 import io.office.modules.manage.entity.dto.NewsParams;
+import io.office.modules.manage.vo.response.SearchVo;
 import io.office.modules.sys.entity.SysUserEntity;
 
 import java.util.*;
@@ -90,5 +91,7 @@ public interface NewsService extends IService<NewsEntity> {
     List<NewtopicEntity> zttjList();
 
     List<NewsEntity> relatedLinks(Map<String, Object> params);
+
+    Page<SearchVo> getSearchInfo(String name, Page page);
 }
 

src/main/java/io/office/modules/manage/service/PartnersService.java

@@ -27,6 +27,6 @@ public interface PartnersService extends IService<PartnersEntity> {
 
     R verifyPartners(PartnersEntity partnersEntity, SysUserEntity user);
 
-    List<PartnersEntity> frontList(Map<String, Object> params);
+    Page<PartnersEntity> frontList(Map<String, Object> params);
 }
 

src/main/java/io/office/modules/manage/service/impl/CasesServiceImpl.java

 package io.office.modules.manage.service.impl;
 
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
 import java.util.Map;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,6 +23,7 @@ public class CasesServiceImpl extends ServiceImpl<CasesDao, CasesEntity> impleme
 
     @Autowired
     private CasesDao casesDao;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<CasesEntity> page = this.page(
@@ -32,10 +35,24 @@ public class CasesServiceImpl extends ServiceImpl<CasesDao, CasesEntity> impleme
     }
 
     @Override
-    public List<CasesEntity> frontList() {
+    public Page<CasesEntity> getPageList(Map<String, Object> params) {
+
+        //E page, @Param("ew") Wrapper<T> queryWrapper
+        Page page = new Page(Integer.valueOf(params.get("page").toString()),
+                Integer.valueOf(params.get("size").toString()));
+        QueryWrapper<CasesEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", "1");
+        queryWrapper.gt("levels", "0");
+        if (params.get("title") != null && StringUtils.isNotBlank(params.get("title").toString())) {
+            queryWrapper.like("title", params.get("title").toString());
+        }
+        return casesDao.selectPage(page, queryWrapper);
+    }
+
+   /* public List<CasesEntity> frontList() {
         String status="1";//代表审核状态，编辑从后台提交专题后，默认初始状态为status=0，审核成功status=1，审核失败status=-1
         String levels="0";//levels代表级别，取值从0到9。其中，0代表隐藏，1级以上可以显示，9级为最高级
-        return  casesDao.selectByStatusAndLevels(status,levels);
-    }
+        return  casesDao.selectByStatusAndLevels(status,levels,page);
+    }*/
 
 }
\ No newline at end of file

src/main/java/io/office/modules/manage/service/impl/PartnersServiceImpl.java

@@ -2,7 +2,9 @@ package io.office.modules.manage.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.common.utils.R;
+import io.office.modules.manage.entity.CasesEntity;
 import io.office.modules.sys.entity.SysUserEntity;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -75,10 +77,21 @@ public class PartnersServiceImpl extends ServiceImpl<PartnersDao, PartnersEntity
     }
 
     @Override
-    public List<PartnersEntity> frontList(Map<String, Object> params) {
-        String status="1";//代表审核状态，编辑从后台提交专题后，默认初始状态为status=0，审核成功status=1，审核失败status=-1
-        String levels="0";//levels代表级别，取值从0到9。其中，0代表隐藏，1级以上可以显示，9级为最高级
-        return  partnersDao.selectByStatusAndLevels(status,levels);
+    public Page<PartnersEntity> frontList(Map<String, Object> params) {
+       /* String status="1";//代表审核状态，编辑从后台提交专题后，默认初始状态为status=0，审核成功status=1，审核失败status=-1
+        String levels="0";//levels代表级别，取值从0到9。其中，0代表隐藏，1级以上可以显示，9级为最高级*/
+
+        Page page = new Page(Integer.valueOf(params.get("page").toString()),
+                Integer.valueOf(params.get("size").toString()));
+        QueryWrapper<PartnersEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", "1");
+        queryWrapper.gt("levels", "0");
+        if (params.get("firmname") != null && StringUtils.isNotBlank(params.get("firmname").toString())) {
+            queryWrapper.like("firmname", params.get("firmname").toString());
+        }
+        return baseMapper.selectPage(page, queryWrapper);
+
+        //return  partnersDao.selectByStatusAndLevels(status,levels);
     }
 
 }
\ No newline at end of file

src/main/resources/mapper/manage/NewsDao.xml

@@ -607,4 +607,68 @@ AND Id != #{id}
 </if>
 order by releasedate desc
     </select>
+
+
+    <select id="getSearchInfo" parameterType="string" resultType="io.office.modules.manage.vo.response.SearchVo">
+        SELECT     id, title, keyword, [content], 1 AS type, id AS urlid, releasedate AS date ,source
+        FROM         dbo.news
+        WHERE     (status = 1) AND (levels > 0) AND (classid IN (32, 33))
+        <if test="name!=null and name!=''">
+            and title like concat('%',#{name},'%')
+        </if>
+        UNION ALL
+        SELECT     id, title, keyword, [content], 1 AS type, id AS urlid, releasedate AS date ,source
+        FROM         dbo.Policy
+        WHERE     (levels > 0) AND (class = '相关标准')
+        <if test="name!=null and name!=''">
+            and title like concat('%',#{name},'%')
+        </if>
+        UNION ALL
+        SELECT     id, title, keyword, [content], 2 AS type, id AS urlid, releasedate AS date ,source
+        FROM         dbo.Policy AS Policy_1
+        WHERE     (levels > 0) AND (class = '法律法规')
+        <if test="name!=null and name!=''">
+            and title like concat('%',#{name},'%')
+        </if>
+        UNION ALL
+        SELECT     id, title, keyword, [content], 3 AS type, id AS urlid, releasedate AS date ,source
+        FROM         dbo.news AS news_2
+        WHERE     (status = 1) AND (levels > 0) AND (classid NOT IN (12, 13, 14, 15, 16, 18, 19, 20, 21, 32, 33))
+        <if test="name!=null and name!=''">
+            and title like concat('%',#{name},'%')
+        </if>
+        UNION ALL
+        SELECT     ClassId, Title, Title AS keyword, '' AS Expr1, 31 AS type, ClassId AS urlid, checktime AS date ,'深度专题' AS source
+        FROM         dbo.NewTopic
+        WHERE     (levels > 0) AND (ParentId = 0) AND (checkflag = 1)
+        <if test="name!=null and name!=''">
+            and title like concat('%',#{name},'%')
+        </if>
+        UNION ALL
+        SELECT     id, title, keyword, brief, 32 AS type, id AS urlid, releasedate AS date ,'精彩视频' AS source
+        FROM         dbo.news_movie
+        WHERE     (status = 1) AND (levels > 0)
+        <if test="name!=null and name!=''">
+            and title like concat('%',#{name},'%')
+        </if>
+        UNION ALL
+        SELECT     id, title, keyword, [content], 5 AS type, id AS urlid, releasedate AS date ,source
+        FROM         dbo.news AS news_1
+        WHERE     (status = 1) AND (levels > 0) AND (classid IN (12, 13, 14, 15, 16, 18, 19, 20, 21))
+        <if test="name!=null and name!=''">
+            and title like concat('%',#{name},'%')
+        </if>
+        UNION ALL
+        SELECT     knowledgeInfoID, Title, Title AS keyword, [Content], 6 AS type, knowledgeInfoID AS urlid, inputDate AS date  ,'技术知识' AS source
+        FROM         dbo.knowledgeInfo
+        WHERE     status = 1
+        <if test="name!=null and name!=''">
+            and title like concat('%',#{name},'%')
+        </if>
+    </select>
+
+
+
+
+
 </mapper>
\ No newline at end of file