From ba345976f0a6a67bcb20627e33251ded000a3d8f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期六, 25 五月 2024 22:40:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java |   77 +++++++++++++++++++++++++++++++++++---
 1 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java
index 738ed1b..5c13be2 100644
--- a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java
@@ -5,13 +5,13 @@
 import com.vci.ubcs.deploy.service.IDeployAppsService;
 import com.vci.ubcs.deploy.vo.DeployAppsVO;
 import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.apache.http.auth.AuthenticationException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.ServletRequest;
@@ -24,17 +24,82 @@
  */
 @NonDS
 @RestController
-@AllArgsConstructor
+@RequiredArgsConstructor
 @RequestMapping("/deploy")
 @ApiIgnore
 @Api(value = "搴旂敤绠＄悊", tags = "鎺ュ彛")
+@Slf4j
 public class DeployAppsController {
 
 	private final IDeployAppsService deployAppsService;
 
+	/**
+	 * 鑾峰彇鏈嶅姟杩愯鍒楄〃
+	 * @param servletRequest
+	 * @return
+	 * @throws ServiceException
+	 */
 	@GetMapping("/applications")
 	public R<List<DeployAppsVO>> getApplications(ServletRequest servletRequest) throws ServiceException {
 		return R.data(deployAppsService.getApplications(servletRequest));
 	}
 
+	/**
+	 * 鑾峰彇鏈嶅姟閰嶇疆淇℃伅
+	 * @param deployAppsVO
+	 * @return
+	 * @throws ServiceException
+	 */
+	@PostMapping("/saveOrGetServiceConfInfo")
+	public R<DeployApps> saveOrGetServiceConfInfo(@RequestBody DeployAppsVO deployAppsVO) throws ServiceException {
+		return R.data(deployAppsService.saveOrGetServiceConfInfo(deployAppsVO));
+	}
+
+	/**
+	 * 鏂板鎴栬幏鍙栨湇鍔￠粯璁ら厤缃俊鎭�
+	 * @param deployAppsVO
+	 * @return
+	 * @throws ServiceException
+	 */
+	@PostMapping("/saveOrUpdateServiceInfo")
+	public R saveOrUpdateDefault(@RequestBody DeployAppsVO deployAppsVO) throws ServiceException {
+		return deployAppsService.saveOrUpdateServiceInfo(deployAppsVO);
+	}
+
+	/**
+	 * 娣诲姞鏈嶅姟淇℃伅
+	 * @param deployApps
+	 * @return
+	 * @throws ServiceException
+	 */
+	@PostMapping("/addSave")
+	public R addSave(@RequestBody DeployApps deployApps) throws ServiceException {
+		return R.status(deployAppsService.addSave(deployApps));
+	}
+
+	/**
+	 * 鏈嶅姟鏇存柊鍖�
+	 * @param files 鏇存柊鐨刯ar鎴栨枃浠跺す
+	 * @param serverName 鏈嶅姟鍚嶇О
+	 * @return
+	 * @throws ServiceException
+	 */
+	@PostMapping("/importUpdateServiceJar")
+	public R importClassify(@RequestParam("files") MultipartFile[] files,@RequestParam String serverName) throws ServiceException {
+		if(Func.isBlank(serverName)){
+			return R.fail("Mandatory parameter service name not found!");
+		}
+		return deployAppsService.importJarUpdate(files,serverName);
+	}
+
+	/**
+	 * 鎵ц鍛戒护
+	 * @param deployAppsVO
+	 * @return
+	 */
+	@PostMapping("/cmdExecute")
+	public R cmdExecute(@RequestBody DeployAppsVO deployAppsVO) throws ServiceException {
+		return deployAppsService.cmdExecute(deployAppsVO);
+	}
+
 }

--
Gitblit v1.9.3