Merge branch 'fix-rsy' into 'master'

屏蔽质检测试类

See merge request rays/pcloud-book!628

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/PcloudRobotClassifyBiz.java

@@ -34,7 +34,7 @@ public interface PcloudRobotClassifyBiz {
     /**
      * 分页查询所有小号分类
      */
-    PageBeanNew<PcloudRobotClassifyResponseVO> listClassifyByPage(Integer currentPage, Integer numPerPage);
+    PageBeanNew<PcloudRobotClassifyResponseVO> listClassifyByPage(Integer currentPage, Integer numPerPage,Boolean testShow);
 
     ClassifyWelcomeDTO getClassifyWelcome(Long classifyId,Integer robotType);
 

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/impl/PcloudRobotClassifyBizImpl.java

@@ -101,8 +101,10 @@ public class PcloudRobotClassifyBizImpl implements PcloudRobotClassifyBiz {
     }
 
     @Override
-    public PageBeanNew<PcloudRobotClassifyResponseVO> listClassifyByPage(Integer currentPage, Integer numPerPage) {
-        PageBeanNew<PcloudRobotClassifyResponseVO> listClassifyByPage = pcloudRobotClassifyDao.listPageNew(new PageParam(currentPage, numPerPage), new HashMap<>(), "listClassifyByPage");
+    public PageBeanNew<PcloudRobotClassifyResponseVO> listClassifyByPage(Integer currentPage, Integer numPerPage,Boolean testShow) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("testShow",testShow);
+        PageBeanNew<PcloudRobotClassifyResponseVO> listClassifyByPage = pcloudRobotClassifyDao.listPageNew(new PageParam(currentPage, numPerPage), map, "listClassifyByPage");
         if(ListUtils.isEmpty(listClassifyByPage.getRecordList())){
             return new PageBeanNew<>(currentPage, numPerPage, 0, new ArrayList<>());
         }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/facade/PcloudRobotClassifyFacade.java

@@ -54,9 +54,10 @@ public class PcloudRobotClassifyFacade {
 
     @GetMapping("listClassifyByPage")
     public ResponseDto<?> listClassifyByPage(
+            @RequestParam(value = "testShow", required = false) Boolean testShow,
             @RequestParam("currentPage") Integer currentPage,
             @RequestParam("numPerPage") Integer numPerPage)  throws BizException, PermissionException {
-        return new ResponseDto<>(pcloudRobotClassifyBiz.listClassifyByPage(currentPage, numPerPage));
+        return new ResponseDto<>(pcloudRobotClassifyBiz.listClassifyByPage(currentPage, numPerPage, testShow));
     }
 
     @GetMapping("listClassifyByPage4Mini")

pcloud-service-book/src/main/resources/mapper/pcloudkeyword/PcloudRobotClassify.Mapper.xml

@@ -77,11 +77,14 @@
         from pcloud_robot_classify where id=#{id}
     </select>
 
-    <select id="listClassifyByPage" resultMap="pageResultMap">
+    <select id="listClassifyByPage" resultMap="pageResultMap" parameterType="map">
         select
         id, classify_name, qrcode_url, seq_num, mimi_app_qr miniAppQr,mini_app_content
         from pcloud_robot_classify
         where is_delete = 0
+        <if test="testShow!=null and testShow==false">
+            and classify_name!="质检测试类"
+        </if>
         order by seq_num
     </select>