From e89544b39defc21b8f80312a9371f695fbb67545 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Wed, 28 Jun 2023 17:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E9=94=AE=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E6=8F=90=E7=A4=BA=E2=80=9C=E5=8C=85=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E2=80=9D=E9=97=AE=E9=A2=98=20https://gitee.com/elunez/eladmin-?= =?UTF-8?q?mp/issues/I7GSJY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhengjie/modules/mnt/mapper/DeployMapper.java | 4 +--- .../mnt/service/impl/DeployServiceImpl.java | 3 +-- .../modules/system/mapper/DictMapper.java | 2 -- .../modules/system/mapper/RoleMapper.java | 2 -- .../modules/system/mapper/UserMapper.java | 3 --- .../main/resources/mapper/mnt/DeployMapper.xml | 15 +++++++++++++-- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployMapper.java index d1edd14..bf76d57 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/mapper/DeployMapper.java @@ -16,13 +16,10 @@ package me.zhengjie.modules.mnt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.mnt.domain.Deploy; import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - import java.util.List; import java.util.Set; @@ -40,4 +37,5 @@ public interface DeployMapper extends BaseMapper { Set getIdByAppIds(@Param("appIds") Set appIds); + Deploy getDeployById(@Param("deployId") Long deployId); } diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java index 2a2d61e..f21caf5 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java @@ -115,8 +115,7 @@ public class DeployServiceImpl extends ServiceImpl impleme * @param id ID */ private void deployApp(String fileSavePath, Long id) { - - Deploy deploy = getById(id); + Deploy deploy = deployMapper.getDeployById(id); if (deploy == null) { sendMsg("部署信息不存在", MsgType.ERROR); throw new BadRequestException("部署信息不存在"); diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictMapper.java index 2add9a8..4ad83ce 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/DictMapper.java @@ -16,8 +16,6 @@ package me.zhengjie.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.domain.vo.DictQueryCriteria; import org.apache.ibatis.annotations.Mapper; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java index 8e50369..5536b95 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/RoleMapper.java @@ -16,8 +16,6 @@ package me.zhengjie.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.system.domain.Role; import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria; import org.apache.ibatis.annotations.Mapper; diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java index b85d311..d039c85 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/mapper/UserMapper.java @@ -16,14 +16,11 @@ package me.zhengjie.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import me.zhengjie.modules.system.domain.User; import me.zhengjie.modules.system.domain.vo.UserQueryCriteria; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; - import java.util.Date; import java.util.List; import java.util.Set; diff --git a/eladmin/eladmin-system/src/main/resources/mapper/mnt/DeployMapper.xml b/eladmin/eladmin-system/src/main/resources/mapper/mnt/DeployMapper.xml index 0f4a580..60e6da1 100644 --- a/eladmin/eladmin-system/src/main/resources/mapper/mnt/DeployMapper.xml +++ b/eladmin/eladmin-system/src/main/resources/mapper/mnt/DeployMapper.xml @@ -33,7 +33,7 @@ - s_deploy.server_id as s_server_id,s_deploy.name as s_name,s_deploy.ip as s_ip,s_deploy.port as s_port,s_deploy.account as s_account,s_deploy.password as s_password + server.server_id as s_server_id,server.name as s_name,server.ip as s_ip,server.port as s_port,server.account as s_account,server.password as s_password @@ -60,7 +60,7 @@ ) t left join mnt_deploy_server mds on t.d_deploy_id = mds.deploy_id - left join mnt_server s_deploy on s_deploy.server_id = mds.server_id + left join mnt_server server on server.server_id = mds.server_id order by t.d_deploy_id desc @@ -79,4 +79,15 @@ #{appId} + + \ No newline at end of file