代码优化

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployQueryCriteria.java

@@ -2,6 +2,8 @@ package me.zhengjie.modules.mnt.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;
+import java.sql.Timestamp;
+import java.util.List;
 
 /**
 * @author zhanghouying
@@ -13,13 +15,10 @@ public class DeployQueryCriteria{
 	/**
 	 * 模糊
 	 */
-    @Query(type = Query.Type.EQUAL)
-    private String appId;
+    @Query(type = Query.Type.INNER_LIKE, propName = "name", joinName = "app")
+    private String appName;
 
-	/**
-	 * 模糊
-	 */
-    @Query(type = Query.Type.INNER_LIKE)
-    private String ip;
+	@Query(type = Query.Type.BETWEEN)
+	private List<Timestamp> createTime;
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java

@@ -14,7 +14,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.Optional;
 
 /**
 * @author zhanghouying
@@ -46,9 +45,9 @@ public class AppServiceImpl implements AppService {
 
     @Override
     public AppDTO findById(Long id) {
-		Optional<App> app = appRepository.findById(id);
-        ValidationUtil.isNull(app,"App","id",id);
-        return appMapper.toDto(app.get());
+		App app = appRepository.findById(id).orElseGet(App::new);
+        ValidationUtil.isNull(app.getId(),"App","id",id);
+        return appMapper.toDto(app);
     }
 
     @Override
@@ -60,11 +59,10 @@ public class AppServiceImpl implements AppService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(App resources) {
-        Optional<App> optionalApp = appRepository.findById(resources.getId());
-        ValidationUtil.isNull( optionalApp,"App","id",resources.getId());
-        App App = optionalApp.get();
-        App.copy(resources);
-        appRepository.save(App);
+        App app = appRepository.findById(resources.getId()).orElseGet(App::new);
+        ValidationUtil.isNull(app.getId(),"App","id",resources.getId());
+        app.copy(resources);
+        appRepository.save(app);
     }
 
     @Override

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java

@@ -16,8 +16,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
 /**
 * @author zhanghouying
 * @date 2019-08-24
@@ -48,9 +46,9 @@ public class DatabaseServiceImpl implements DatabaseService {
 
     @Override
     public DatabaseDTO findById(String id) {
-        Optional<Database> database = databaseRepository.findById(id);
-        ValidationUtil.isNull(database,"Database","id",id);
-        return databaseMapper.toDto(database.get());
+        Database database = databaseRepository.findById(id).orElseGet(Database::new);
+        ValidationUtil.isNull(database.getId(),"Database","id",id);
+        return databaseMapper.toDto(database);
     }
 
     @Override
@@ -63,9 +61,8 @@ public class DatabaseServiceImpl implements DatabaseService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(Database resources) {
-        Optional<Database> optionalDatabase = databaseRepository.findById(resources.getId());
-        ValidationUtil.isNull( optionalDatabase,"Database","id",resources.getId());
-        Database database = optionalDatabase.get();
+        Database database = databaseRepository.findById(resources.getId()).orElseGet(Database::new);
+        ValidationUtil.isNull(database.getId(),"Database","id",resources.getId());
         database.copy(resources);
         databaseRepository.save(database);
     }

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java

@@ -10,15 +10,12 @@ import me.zhengjie.modules.mnt.service.mapper.DeployHistoryMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
 import me.zhengjie.utils.ValidationUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
 /**
 * @author zhanghouying
 * @date 2019-08-24
@@ -27,11 +24,14 @@ import java.util.Optional;
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
 public class DeployHistoryServiceImpl implements DeployHistoryService {
 
-    @Autowired
-    private DeployHistoryRepository deployhistoryRepository;
+    private final DeployHistoryRepository deployhistoryRepository;
+
+    private final DeployHistoryMapper deployhistoryMapper;
 
-    @Autowired
-    private DeployHistoryMapper deployhistoryMapper;
+    public DeployHistoryServiceImpl(DeployHistoryRepository deployhistoryRepository, DeployHistoryMapper deployhistoryMapper) {
+        this.deployhistoryRepository = deployhistoryRepository;
+        this.deployhistoryMapper = deployhistoryMapper;
+    }
 
     @Override
     public Object queryAll(DeployHistoryQueryCriteria criteria, Pageable pageable){
@@ -46,9 +46,9 @@ public class DeployHistoryServiceImpl implements DeployHistoryService {
 
     @Override
     public DeployHistoryDTO findById(String id) {
-        Optional<DeployHistory> deployhistory = deployhistoryRepository.findById(id);
-        ValidationUtil.isNull(deployhistory,"DeployHistory","id",id);
-        return deployhistoryMapper.toDto(deployhistory.get());
+        DeployHistory deployhistory = deployhistoryRepository.findById(id).orElseGet(DeployHistory::new);
+        ValidationUtil.isNull(deployhistory.getId(),"DeployHistory","id",id);
+        return deployhistoryMapper.toDto(deployhistory);
     }
 
     @Override

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java

@@ -2,7 +2,6 @@ package me.zhengjie.modules.mnt.service.impl;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.mnt.domain.App;
@@ -22,18 +21,16 @@ import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
 import me.zhengjie.utils.SecurityUtils;
 import me.zhengjie.utils.ValidationUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.io.File;
 import java.io.IOException;
+import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -47,23 +44,21 @@ public class DeployServiceImpl implements DeployService {
 
 	private final String FILE_SEPARATOR = File.separatorChar + "";
 
-	@Autowired
-	private DeployRepository deployRepository;
+	private final DeployRepository deployRepository;
 
-	@Autowired
-	private DeployMapper deployMapper;
+	private final DeployMapper deployMapper;
 
-	@Autowired
-	private AppService appService;
+	private final ServerDeployService serverDeployService;
 
-	@Autowired
-	private ServerDeployService serverDeployService;
+	private final DeployHistoryService deployHistoryService;
 
-	@Autowired
-	private DeployHistoryService deployHistoryService;
+	public DeployServiceImpl(DeployRepository deployRepository, DeployMapper deployMapper, ServerDeployService serverDeployService, DeployHistoryService deployHistoryService) {
+		this.deployRepository = deployRepository;
+		this.deployMapper = deployMapper;
+		this.serverDeployService = serverDeployService;
+		this.deployHistoryService = deployHistoryService;
+	}
 
-	@Autowired
-	private DatabaseService databaseService;
 
 	@Override
 	public Object queryAll(DeployQueryCriteria criteria, Pageable pageable) {
@@ -78,9 +73,9 @@ public class DeployServiceImpl implements DeployService {
 
 	@Override
 	public DeployDTO findById(Long id) {
-		Optional<Deploy> Deploy = deployRepository.findById(id);
-		ValidationUtil.isNull(Deploy, "Deploy", "id", id);
-		return deployMapper.toDto(Deploy.get());
+		Deploy Deploy = deployRepository.findById(id).orElseGet(Deploy::new);
+		ValidationUtil.isNull(Deploy.getId(), "Deploy", "id", id);
+		return deployMapper.toDto(Deploy);
 	}
 
 	@Override
@@ -92,9 +87,8 @@ public class DeployServiceImpl implements DeployService {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void update(Deploy resources) {
-		Optional<Deploy> optionalDeploy = deployRepository.findById(resources.getId());
-		ValidationUtil.isNull(optionalDeploy, "Deploy", "id", resources.getId());
-		Deploy Deploy = optionalDeploy.get();
+		Deploy Deploy = deployRepository.findById(resources.getId()).orElseGet(Deploy::new);
+		ValidationUtil.isNull(Deploy.getId(), "Deploy", "id", resources.getId());
 		Deploy.copy(resources);
 		deployRepository.save(Deploy);
 	}
@@ -112,8 +106,8 @@ public class DeployServiceImpl implements DeployService {
 
 	/**
 	 * @param fileSavePath 本机路径
-	 * @param id
-	 * @return
+	 * @param id ID
+	 * @return string
 	 */
 	private String deployApp(String fileSavePath, Long id) {
 
@@ -131,7 +125,7 @@ public class DeployServiceImpl implements DeployService {
 		//这个是服务器部署路径
 		String uploadPath = app.getUploadPath();
 		StringBuilder sb = new StringBuilder();
-		String msg = "";
+		String msg;
 		Set<ServerDeployDTO> deploys = deploy.getDeploys();
 		for (ServerDeployDTO deployDTO : deploys) {
 			String ip = deployDTO.getIp();
@@ -199,7 +193,6 @@ public class DeployServiceImpl implements DeployService {
 		//还原信息入库
 		DeployHistory deployHistory = new DeployHistory();
 		deployHistory.setAppName(appName);
-		deployHistory.setDeployDate(deployDate);
 		deployHistory.setDeployUser(SecurityUtils.getUsername());
 		deployHistory.setIp(ip);
 		deployHistory.setDeployId(id);
@@ -209,9 +202,8 @@ public class DeployServiceImpl implements DeployService {
 	/**
 	 * 停App
 	 *
-	 * @param port
-	 * @param executeShellUtil
-	 * @return
+	 * @param port 端口
+	 * @param executeShellUtil /
 	 */
 	private void stopApp(int port, ExecuteShellUtil executeShellUtil) {
 		//发送停止命令
@@ -222,17 +214,13 @@ public class DeployServiceImpl implements DeployService {
 	/**
 	 * 指定端口程序是否在运行
 	 *
-	 * @param port
-	 * @param executeShellUtil
+	 * @param port 端口
+	 * @param executeShellUtil /
 	 * @return true 正在运行  false 已经停止
 	 */
 	private boolean checkIsRunningStatus(int port, ExecuteShellUtil executeShellUtil) {
 		String statusResult = executeShellUtil.executeForResult(String.format("fuser -n tcp %d", port));
-		if ("".equals(statusResult.trim())) {
-			return false;
-		} else {
-			return true;
-		}
+		return !"".equals(statusResult.trim());
 	}
 
 	private void sendMsg(String msg, MsgType msgType) {
@@ -265,20 +253,17 @@ public class DeployServiceImpl implements DeployService {
 	}
 
 	private boolean checkFile(ExecuteShellUtil executeShellUtil, AppDTO appDTO) {
-		StringBuffer sb = new StringBuffer();
-		sb.append("find ");
-		sb.append(appDTO.getDeployPath());
-		sb.append(" -name ");
-		sb.append(appDTO.getName());
-		boolean flag = executeShellUtil.executeShell(sb.toString());
-		return flag;
+		String sb = "find " +
+				appDTO.getDeployPath() +
+				" -name " +
+				appDTO.getName();
+		return executeShellUtil.executeShell(sb);
 	}
 
 	/**
 	 * 启动服务
-	 *
-	 * @param resources
-	 * @return
+	 * @param resources /
+	 * @return /
 	 */
 	@Override
 	public String startServer(Deploy resources) {
@@ -303,15 +288,15 @@ public class DeployServiceImpl implements DeployService {
 
 	/**
 	 * 停止服务
-	 * @param resources
-	 * @return
+	 * @param resources /
+	 * @return /
 	 */
 	@Override
 	public String stopServer(Deploy resources) {
 		Set<ServerDeploy> deploys = resources.getDeploys();
 		App app = resources.getApp();
 		for (ServerDeploy deploy : deploys) {
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			ExecuteShellUtil executeShellUtil = getExecuteShellUtil(deploy.getIp());
 			sb.append("服务器:").append(deploy.getName()).append("<br>应用:").append(app.getName());
 			sendMsg("下发停止命令", MsgType.INFO);
@@ -334,8 +319,8 @@ public class DeployServiceImpl implements DeployService {
 	@Override
 	public String serverReduction(DeployHistory resources) {
 		Long deployId = resources.getDeployId();
-		Deploy deployInfo = deployRepository.findById(deployId).get();
-		String deployDate = resources.getDeployDate();
+		Deploy deployInfo = deployRepository.findById(deployId).orElseGet(Deploy::new);
+		Timestamp deployDate = resources.getDeployDate();
 		App app = deployInfo.getApp();
 		if (app == null) {
 			sendMsg("应用信息不存在：" + resources.getAppName(), MsgType.ERROR);
@@ -350,7 +335,7 @@ public class DeployServiceImpl implements DeployService {
 		String deployPath = app.getDeployPath();
 		String ip = resources.getIp();
 		ExecuteShellUtil executeShellUtil = getExecuteShellUtil(ip);
-		String msg = "";
+		String msg;
 
 		msg = String.format("登陆到服务器:%s", ip);
 		log.info(msg);
@@ -398,7 +383,7 @@ public class DeployServiceImpl implements DeployService {
 		return ScpClientUtil.getInstance(ip, serverDeployDTO.getPort(), serverDeployDTO.getAccount(), serverDeployDTO.getPassword());
 	}
 
-	public void sendResultMsg(boolean result, StringBuilder sb) {
+	private void sendResultMsg(boolean result, StringBuilder sb) {
 		if (result) {
 			sb.append("<br>启动成功!");
 			sendMsg(sb.toString(), MsgType.INFO);

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java

@@ -15,8 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
 /**
 * @author zhanghouying
 * @date 2019-08-24
@@ -47,9 +45,9 @@ public class ServerDeployServiceImpl implements ServerDeployService {
 
     @Override
     public ServerDeployDTO findById(Long id) {
-        Optional<ServerDeploy> server = serverDeployRepository.findById(id);
-        ValidationUtil.isNull(server,"ServerDeploy","id",id);
-        return serverDeployMapper.toDto(server.get());
+        ServerDeploy server = serverDeployRepository.findById(id).orElseGet(ServerDeploy::new);
+        ValidationUtil.isNull(server.getId(),"ServerDeploy","id",id);
+        return serverDeployMapper.toDto(server);
     }
 
     @Override
@@ -67,9 +65,8 @@ public class ServerDeployServiceImpl implements ServerDeployService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ServerDeploy resources) {
-        Optional<ServerDeploy> optionalServer = serverDeployRepository.findById(resources.getId());
-        ValidationUtil.isNull( optionalServer,"ServerDeploy","id",resources.getId());
-        ServerDeploy serverDeploy = optionalServer.get();
+        ServerDeploy serverDeploy = serverDeployRepository.findById(resources.getId()).orElseGet(ServerDeploy::new);
+        ValidationUtil.isNull( serverDeploy.getId(),"ServerDeploy","id",resources.getId());
 		serverDeploy.copy(resources);
         serverDeployRepository.save(serverDeploy);
     }

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployMapper.java

@@ -10,7 +10,7 @@ import org.mapstruct.ReportingPolicy;
 * @author zhanghouying
 * @date 2019-08-24
 */
-@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
+@Mapper(componentModel = "spring",uses = {AppMapper.class, ServerDeployMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface DeployMapper extends BaseMapper<DeployDTO, Deploy> {
 
 }