应用下线功能

src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java

@@ -84,7 +84,8 @@ public class TenantBasicManagementController {
 
     @ApiOperation("应用树层级")
     @GetMapping("/tenantBaseTreeOther")
-    public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) {
+    public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode
+    ) {
         List<GroupDto> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
         return ResponseVO.ok(ocpApiGroups);
     }

src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.pms.ocp.mapper.OcpTenantAuditMapper;
 import com.pms.ocp.mapper.OcpTenantExtentMapper;
 import com.pms.ocp.mapper.OcpTenantGroupMapper;
 import com.pms.ocp.mapper.TenantBasicManagementMapper;
@@ -44,6 +45,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     private OcpTenantGroupService ocpTenantGroupService;
     @Autowired
     private OcpTenantGroupMapper ocpTenantGroupMapper;
+    @Autowired
+    private OcpTenantAuditMapper ocpTenantAuditMapper;
 
     List<String> tenantGroup = new ArrayList<>();
 
@@ -86,11 +89,15 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
         for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
             String tenantCode = ocpTenantExtent.getTenantCode();
-            if (ocpTenantExtent.getTenantState() == 0) {
-                return ResponseVO.error("数据为空");
+            if (ocpTenantExtent.getTenantState() == null) {
+                return ResponseVO.error("数据错误,状态为空");
             } else if (ocpTenantExtent.getTenantState() == 1) {
                 return ResponseVO.error(tenantCode + "已发布,请勿重复操作");
-            } else {
+            }
+//            else if (ocpTenantExtent.getTenantState() == 2) {
+//                return ResponseVO.error(tenantCode + "已下线,无法发布");
+//            }
+            else {
                 ocpTenantExtent.setTenantState((short) 1);
                 ocpTenantExtentMapper.updateById(ocpTenantExtent);
             }
@@ -143,22 +150,28 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
 
         String[] split = tenantCodes.split(",");
         List<String> list = Arrays.asList(split);
-        LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
-        List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
+
+//        LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
+//        List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
+
+        LambdaQueryWrapper<OcpTenantAudit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(OcpTenantAudit::getTenantCode, list);
+        List<OcpTenantAudit> ocpTenantExtents = ocpTenantAuditMapper.selectList(lambdaQueryWrapper);
+
         if (ocpTenantExtents.size() == 0) {
-            return ResponseVO.error("数据为空");
+            return ResponseVO.error("系统错误,数据为空");
         }
-        for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
+        for (OcpTenantAudit ocpTenantExtent : ocpTenantExtents) {
             String tenantCode = ocpTenantExtent.getTenantCode();
-            if (ocpTenantExtent.getTenantState() == null) {
+            if (ocpTenantExtent.getOperStatus() == null) {
                 return ResponseVO.error("系统错误,状态为空");
-            } else if (ocpTenantExtent.getTenantState() == 2) {
+            } else if (ocpTenantExtent.getOperStatus() == 2) {
 
                 return ResponseVO.error(tenantCode + "已下线,请勿重复下线");
             } else {
-                ocpTenantExtent.setTenantState((short) 2);
-                ocpTenantExtentMapper.updateById(ocpTenantExtent);
+                ocpTenantExtent.setOperStatus((short) 2);
+                ocpTenantAuditMapper.updateById(ocpTenantExtent);
             }
 
         }