修改bug，补充env与deploy的列表查询接口

src/main/java/com/qmth/ops/api/controller/admin/DeployController.java

@@ -13,6 +13,7 @@ import com.qmth.ops.api.vo.CodeNameVO;
 import com.qmth.ops.api.vo.DeployVO;
 import com.qmth.ops.api.vo.OrgVO;
 import com.qmth.ops.api.vo.SuccessVO;
+import com.qmth.ops.biz.domain.AppDeploy;
 import com.qmth.ops.biz.domain.Deploy;
 import com.qmth.ops.biz.domain.DeployMode;
 import com.qmth.ops.biz.query.DeployQuery;
@@ -60,6 +61,11 @@ public class DeployController {
         return deployService.query(query).convert(deploy -> new DeployVO(deploy, appService));
     }
 
+    @PostMapping("/list")
+    public List<AppDeploy> listAppDeploy() {
+        return deployService.listAppDeploy();
+    }
+
     @PostMapping("/insert")
     public DeployVO insert(@RequestAttribute AdminSession adminSession,
             @Validated(DeployForm.InsertGroup.class) @RequestBody DeployForm form) {

src/main/java/com/qmth/ops/api/controller/admin/EnvController.java

@@ -7,13 +7,12 @@ import com.qmth.ops.api.security.AdminSession;
 import com.qmth.ops.api.security.Permission;
 import com.qmth.ops.api.vo.CodeNameVO;
 import com.qmth.ops.api.vo.EnvVO;
+import com.qmth.ops.biz.domain.AppEnv;
 import com.qmth.ops.biz.domain.Env;
 import com.qmth.ops.biz.domain.EnvType;
+import com.qmth.ops.biz.service.AppService;
 import com.qmth.ops.biz.service.EnvService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
@@ -27,6 +26,9 @@ public class EnvController {
     @Resource
     private EnvService envService;
 
+    @Resource
+    private AppService appService;
+
     @RequestMapping("/types")
     @Aac(auth = BOOL.FALSE)
     public Object types() {
@@ -48,7 +50,12 @@ public class EnvController {
     }
 
     @PostMapping("/list")
-    public List<EnvVO> list(Long appId) {
+    public List<AppEnv> list() {
+        return envService.listAppEnv();
+    }
+
+    @PostMapping("/app/list")
+    public List<EnvVO> listByApp(@RequestParam Long appId) {
         return envService.list(appId).stream().map(EnvVO::new).collect(Collectors.toList());
     }
 

src/main/java/com/qmth/ops/biz/dao/DeployDao.java

@@ -1,8 +1,15 @@
 package com.qmth.ops.biz.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.ops.biz.domain.AppDeploy;
 import com.qmth.ops.biz.domain.Deploy;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 public interface DeployDao extends BaseMapper<Deploy> {
 
+    @Select("select d.id, d.name, d.mode, a.code appCode, a.name appName "
+            + " from deploy d, app a where d.app_id=a.id order by d.app_id, d.id")
+    List<AppDeploy> listAppDeploy();
 }

src/main/java/com/qmth/ops/biz/dao/EnvDao.java

@@ -1,8 +1,15 @@
 package com.qmth.ops.biz.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.ops.biz.domain.AppEnv;
 import com.qmth.ops.biz.domain.Env;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 public interface EnvDao extends BaseMapper<Env> {
 
+    @Select("select e.id, e.code, e.name, e.type, a.code appCode, a.name appName "
+            + " from env e, app a where e.app_id=a.id order by e.app_id, e.id")
+    List<AppEnv> listAppEnv();
 }

src/main/java/com/qmth/ops/biz/dao/UserPermissionDao.java

@@ -8,6 +8,6 @@ import org.apache.ibatis.annotations.Update;
 
 public interface UserPermissionDao extends BaseMapper<UserPermission> {
 
-    @Update("replace into user_permission (user_id, permission, scope) values (#{userId}, #{permission}, #{scope}")
+    @Update("replace into user_permission (user_id, permission, scope) values (#{userId}, #{permission}, #{scope})")
     void save(@Param("userId") Long userId, @Param("permission") Permission permission, @Param("scope") String scope);
 }

src/main/java/com/qmth/ops/biz/domain/AppDeploy.java

@@ -0,0 +1,54 @@
+package com.qmth.ops.biz.domain;
+
+public class AppDeploy {
+
+    private Long id;
+
+    private String appCode;
+
+    private String appName;
+
+    private String name;
+
+    private DeployMode mode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAppCode() {
+        return appCode;
+    }
+
+    public void setAppCode(String appCode) {
+        this.appCode = appCode;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public DeployMode getMode() {
+        return mode;
+    }
+
+    public void setMode(DeployMode mode) {
+        this.mode = mode;
+    }
+}

src/main/java/com/qmth/ops/biz/domain/AppEnv.java

@@ -0,0 +1,64 @@
+package com.qmth.ops.biz.domain;
+
+public class AppEnv {
+
+    private Long id;
+
+    private String appCode;
+
+    private String appName;
+
+    private String code;
+
+    private String name;
+
+    private EnvType type;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public EnvType getType() {
+        return type;
+    }
+
+    public void setType(EnvType type) {
+        this.type = type;
+    }
+
+    public String getAppCode() {
+        return appCode;
+    }
+
+    public void setAppCode(String appCode) {
+        this.appCode = appCode;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+}

src/main/java/com/qmth/ops/biz/domain/DeployOrg.java

@@ -2,7 +2,7 @@ package com.qmth.ops.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-@TableName(value = "deploy_device", autoResultMap = true)
+@TableName(value = "deploy_org", autoResultMap = true)
 public class DeployOrg {
 
     private Long deployId;

src/main/java/com/qmth/ops/biz/service/DeployService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.ops.biz.dao.DeployDao;
 import com.qmth.ops.biz.dao.DeployDeviceDao;
 import com.qmth.ops.biz.dao.DeployOrgDao;
+import com.qmth.ops.biz.domain.AppDeploy;
 import com.qmth.ops.biz.domain.Deploy;
 import com.qmth.ops.biz.domain.DeployDevice;
 import com.qmth.ops.biz.domain.DeployOrg;
@@ -32,6 +33,10 @@ public class DeployService extends ServiceImpl<DeployDao, Deploy> {
     @Resource
     private DeployOrgDao deployOrgDao;
 
+    public List<AppDeploy> listAppDeploy() {
+        return deployDao.listAppDeploy();
+    }
+
     @Transactional
     public Deploy insert(Deploy deploy) {
         deploy.setAccessKey(UUID.randomUUID().toString().replaceAll("-", ""));

src/main/java/com/qmth/ops/biz/service/EnvService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.ops.biz.dao.EnvDao;
+import com.qmth.ops.biz.domain.AppEnv;
 import com.qmth.ops.biz.domain.Env;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +39,10 @@ public class EnvService extends ServiceImpl<EnvDao, Env> {
         return envDao.selectList(new LambdaQueryWrapper<Env>().eq(Env::getAppId, appId));
     }
 
+    public List<AppEnv> listAppEnv() {
+        return envDao.listAppEnv();
+    }
+
     public Env findByAppAndCode(Long appId, String code) {
         return envDao.selectOne(new LambdaQueryWrapper<Env>().eq(Env::getAppId, appId).eq(Env::getCode, code));
     }