sitAws 生产端测shell 脚本

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/dto/TestShDto.java

@@ -0,0 +1,18 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by owen on 2022/11/23 0023 17:20
+ */
+@Data
+public class TestShDto {
+
+    @ApiModelProperty(value = "场景码", required = true)
+    private String sceneCode;
+
+    @ApiModelProperty(value = "0:正常脚本， 1：测试脚本", required = true)
+    private String type;
+
+}

720yun_fd_manage/gis_service/src/main/java/com/gis/service/TestService.java

@@ -2,6 +2,7 @@ package com.gis.service;
 
 
 import com.gis.common.util.Result;
+import com.gis.domain.dto.TestShDto;
 import org.springframework.web.multipart.MultipartFile;
 
 
@@ -21,5 +22,5 @@ public interface TestService  {
 
     Result awsUpload(MultipartFile file);
 
-    Result sh(Integer i);
+    Result sh(TestShDto param);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/TestServiceImpl.java

@@ -11,6 +11,7 @@ import com.gis.common.constant.ErrorEnum;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.util.CmdUtils;
 import com.gis.common.util.Result;
+import com.gis.domain.dto.TestShDto;
 import com.gis.domain.entity.FodderEntity;
 import com.gis.domain.entity.WorkEntity;
 import com.gis.oss.util.AliYunOssUtil;
@@ -189,10 +190,11 @@ public class TestServiceImpl implements TestService {
     }
 
     @Override
-    public Result sh(Integer i) {
-        String cmd = "bash /mnt/720yun_fd_manage_data/baseData/aws_upload.sh test-4dkankan /mnt/720yun_fd_manage_data/fd720_n5ArPVAwm 720yun_fd_manage/fd720_n5ArPVAwm";
-        if (i==1){
-            cmd = "sudo bash /mnt/720yun_fd_manage_data/baseData/aws_upload_1.sh test-4dkankan /mnt/720yun_fd_manage_data/fd720_n5ArPVAwm 720yun_fd_manage/fd720_n5ArPVAwm";
+    public Result sh(TestShDto param) {
+        String sceneCode = param.getSceneCode();
+        String cmd = String.format("bash /mnt/720yun_fd_manage_data/baseData/aws_upload.sh test-4dkankan /mnt/720yun_fd_manage_data/{0} 720yun_fd_manage/{0}", sceneCode);
+        if ("1".equals(param.getType())){
+            cmd = "sudo " + cmd;
         }
 
         log.info("cmd : {}", cmd);

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/TestController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.io.FileUtil;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.config.RabbitConfig;
 import com.gis.common.util.Result;
+import com.gis.domain.dto.TestShDto;
 import com.gis.oss.util.AliYunOssUtil;
 import com.gis.oss.util.FileUtils;
 import com.gis.service.TestService;
@@ -20,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.*;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
@@ -257,9 +259,9 @@ public class TestController extends BaseController {
 
 
     @ApiOperation(value = "testShell-测试脚本")
-    @GetMapping("/testShell/{i}")
-    public Result shell(@PathVariable Integer i)  {
-        return testService.sh(i);
+    @PostMapping("/testShell")
+    public Result shell(@Valid @RequestBody TestShDto param)  {
+        return testService.sh(param);
     }