soc-modules-deploy模块后台代码迁移-升级状态查询详情页接口改为分页

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/controller/AppUpgradeStatusController.java

@@ -54,9 +54,9 @@ public class AppUpgradeStatusController  extends BaseController{
      * 升级状态查询-详情
      */
     @GetMapping("/detail")
-    public AjaxResult detail(String id, String orgName, Integer status){
-        List<BatchHostInfo> batchHosts = upgradeBatchInfoService.getBatchHosts(id,orgName,status);
-        return AjaxResult.success(batchHosts);
+    public TableDataInfo detail(Page<BatchHostInfo> page,String id, String orgName, Integer status){
+        IPage<BatchHostInfo> batchHosts = upgradeBatchInfoService.selectBatchHostsPage(page,id,orgName,status);
+        return getDataTable(batchHosts);
     }
     /**
      * 升级状态查询-详情下的二级详情
@@ -95,7 +95,7 @@ public class AppUpgradeStatusController  extends BaseController{
         Page<HostInfo> page = new Page<>();
         page.setSize(5000);
         page.setCurrent(1);
-        List<BatchHostInfo> list = upgradeBatchInfoService.getBatchHosts(id,orgName,status);
+        List<BatchHostInfo> list = upgradeBatchInfoService.getBatchHostsExport(id,orgName,status);
         Label label = null;
         WritableSheet sheet = null;
         WritableWorkbook workBook = null;

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/dao/BatchHostInfoDao.java

@@ -1,10 +1,11 @@
 package com.xunmei.deploy.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.deploy.domain.BatchHostInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-
 import java.util.List;
 
 /**
@@ -12,6 +13,7 @@ import java.util.List;
  */
 @Repository
 public interface BatchHostInfoDao extends BaseMapper<BatchHostInfo> {
-
+    IPage<BatchHostInfo> selectPage(Page<BatchHostInfo> page, @Param("batchId") String batchId,
+                                    @Param("orgName") String orgName, @Param("status") Integer status);
     List<BatchHostInfo> selectListInfo(@Param("batchId") String batchId, @Param("orgName") String orgName, @Param("status") Integer status);
 }

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/UpgradeBatchInfoService.java

@@ -18,11 +18,14 @@ public interface UpgradeBatchInfoService extends IService<UpgradeBatchInfo> {
      */
     IPage<UpgradeBatchInfo> selectPage(Page<UpgradeBatchInfo> page, UpgradeBatchInfo info);
 
-
     /**
      * 批次主机信息
      */
-    List<BatchHostInfo> getBatchHosts(String batchId, String orgName, Integer status);
+    IPage<BatchHostInfo> selectBatchHostsPage(Page<BatchHostInfo> page,String batchId, String orgName, Integer status);
+    /**
+     * 批次主机信息
+     */
+    List<BatchHostInfo> getBatchHostsExport(String batchId, String orgName, Integer status);
 
     /**
      * 定时任务，同级任务状态

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/service/impl/UpgradeBatchInfoServiceImpl.java

@@ -75,9 +75,15 @@ public class UpgradeBatchInfoServiceImpl extends ServiceImpl<UpgradeBatchInfoDao
         return baseMapper.selectPage(page,info);
     }
 
-
+    /**
+     * 批次主机信息
+     */
+    @Override
+    public IPage<BatchHostInfo> selectBatchHostsPage(Page<BatchHostInfo> page,String batchId, String orgName, Integer status){
+        return batchHostInfoDao.selectPage(page,batchId,orgName,status);
+    }
     @Override
-    public List<BatchHostInfo> getBatchHosts(String batchId, String orgName, Integer status) {
+    public List<BatchHostInfo> getBatchHostsExport(String batchId, String orgName, Integer status) {
         List<BatchHostInfo> list = batchHostInfoDao.selectListInfo(batchId, orgName, status);
         return list;
     }

soc-modules/soc-modules-deploy/src/main/resources/mapper/BatchHostInfoDao.xml

@@ -2,6 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.deploy.dao.BatchHostInfoDao">
 
+    <select id="selectPage"  resultType="com.xunmei.deploy.domain.BatchHostInfo">
+        select t.*,t1.zip_version from t_batch_host_info t
+        left join t_upgrade_batch_info t1 on t1.id = t.batch_id
+        <where>
+            <if test="batchId != '' and batchId != null">
+                t.batch_id = #{batchId}
+            </if>
+            <if test="orgName != '' and orgName != null">
+                and t.org_name like concat('%',#{orgName},'%')
+            </if>
+            <if test="status != null">
+                and t.status = #{status}
+            </if>
+        </where>
+    </select>
+
     <select id="selectListInfo" resultType="com.xunmei.deploy.domain.BatchHostInfo">
         select t.*,t1.zip_version from t_batch_host_info t
         left join t_upgrade_batch_info t1 on t1.id = t.batch_id