soc-modules-deploy模块后台代码迁移-查询条件机构筛选优化

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

@@ -37,7 +37,7 @@ public class AgentUpgradeStatusController   extends BaseController{
      * 白令海管理-白令海版本升级-列表
      */
     @RequestMapping("/list")
-    public TableDataInfo list(Page<HostInfo> page, HostInfo info){
+    public TableDataInfo list(Page<HostInfo> page, HostInfoVo info){
         IPage<HostInfoVo> hostInfoIPage = hostInfoService.selectPage(page, info);
 
         return getDataTable(hostInfoIPage);

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

@@ -35,5 +35,5 @@ public interface HostInfoDao extends BaseMapper<HostInfo> {
                                @Param("uploadVersion") String uploadVersion, @Param("hostIp") String hostIp);
 
     //白令海版本升级-列表
-    IPage<HostInfoVo> selectPage(Page<HostInfo> page, @Param("info") HostInfo hostInfo);
+    IPage<HostInfoVo> selectPage(Page<HostInfo> page, @Param("info") HostInfoVo hostInfoVo);
 }

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

@@ -24,5 +24,5 @@ public interface HostInfoService extends IService<HostInfo> {
      */
     List<HostInfo> selectByOrg(UploadAgentVo uploadAgentVo);
     //白令海版本升级-列表
-    IPage<HostInfoVo> selectPage(Page<HostInfo> page, HostInfo hostInfo);
+    IPage<HostInfoVo> selectPage(Page<HostInfo> page, HostInfoVo hostInfo);
 }

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

@@ -180,7 +180,7 @@ public class HostInfoServiceImpl extends ServiceImpl<HostInfoDao, HostInfo> impl
 
     //白令海版本升级-列表
     @Override
-    public IPage<HostInfoVo> selectPage(Page<HostInfo> page, HostInfo hostInfo) {
+    public IPage<HostInfoVo> selectPage(Page<HostInfo> page, HostInfoVo hostInfo) {
         return baseMapper.selectPage(page,hostInfo);
     }
 

soc-modules/soc-modules-deploy/src/main/java/com/xunmei/deploy/vo/HostInfoVo.java

@@ -1,5 +1,6 @@
 package com.xunmei.deploy.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -23,7 +24,8 @@ public class HostInfoVo {
     private String hostOrgName;
     private String id;
     private String registerDateTime;
-
+    @ApiModelProperty("包含下级")
+    private  Boolean checkSub=false;
     /**
      * 是否需要升级 0否  1是
      */

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

@@ -26,11 +26,15 @@
             <if test="infoVo.hostIp != '' and infoVo.hostIp != null">
                 and t.hostIp LIKE CONCAT('%', #{infoVo.hostIp}, '%' )
             </if>
-<!--            <if test="infoVo.mirrorVersion != '' and infoVo.mirrorVersion != null">
-                and h.mirror_version LIKE CONCAT('%', #{infoVo.mirrorVersion}, '%' )
-            </if>-->
-            <if test="infoVo.hostOrg != '' and infoVo.hostOrg != null">
-                and h.PATH LIKE CONCAT('%#', #{infoVo.hostOrg}, '#%' )
+            <if test=" infoVo.hostOrg != null ">
+                <choose>
+                    <when test=" infoVo.checkSub == true">
+                        and h.path like CONCAT('%', #{infoVo.hostOrg}, '%' )
+                    </when>
+                    <otherwise>
+                        and h.org_id = #{infoVo.hostOrg}
+                    </otherwise>
+                </choose>
             </if>
             <if test="infoVo.hostName != '' and infoVo.hostName != null">
                 and t.hostName LIKE CONCAT('%', #{infoVo.hostName}, '%' )
@@ -147,9 +151,6 @@
         LEFT JOIN hv_host_org v ON h.id = v.register_code
         LEFT JOIN hv_org o ON v.org_id = o.org_id
         <where>
-            <if test="info.hostOrg != '' and info.hostOrg != null">
-                o.IS_DELETED = 0 AND o.PATH LIKE CONCAT('%#', #{info.hostOrg}, '#%' )
-            </if>
             <if test="info.agentVersion != '' and info.agentVersion != null">
                 AND h.agentVersion = #{info.agentVersion}
             </if>
@@ -162,6 +163,17 @@
             <if test="info.hostStatus != '' and info.hostStatus != null">
                 AND h.hostStatus = #{info.hostStatus}
             </if>
+            <if test=" info.hostOrg != null ">
+                v.is_deleted = 0
+                <choose>
+                    <when test=" info.checkSub == true">
+                        and v.path like CONCAT('%', #{info.hostOrg}, '%' )
+                    </when>
+                    <otherwise>
+                        and v.org_id = #{info.hostOrg}
+                    </otherwise>
+                </choose>
+            </if>
         </where>
     </select>