From ce28be6895705bd619ce091aecc8bd3017c19c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= <hello@itcast.cn>
Date: Tue, 29 Mar 2022 10:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AppRegisterServiceImpl.java  |  1 +
 .../TenantBasicManagementServiceImpl.java     | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
index 00a5c86..735a10c 100644
--- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
@@ -61,6 +61,7 @@ public class AppRegisterServiceImpl implements AppRegisterService {
         ocpTenantExtent.setClusterName(appRegisterDTO.getGroup());
         ocpTenantExtent.setDeploymentName(appRegisterDTO.getDeploymentName());
         ocpTenantExtent.setIsDelete((short) 0);
+        ocpTenantExtent.setTenantState((short) 0);
         int j = ocpTenantExtentMapper.insert(ocpTenantExtent);
 
         OcpTenantGroup ocpTenantGroup = new OcpTenantGroup();
diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
index 086c06e..f022617 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
@@ -410,7 +410,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         OcpTenantBase ocpTenantBase = new OcpTenantBase();
         BeanUtils.copyProperties(ocpBaseTiocnDto, ocpTenantBase);
         ocpTenantBase.setIsDelete((short) 0);
-        ocpTenantBase.setTenantCtime(new Timestamp(System.currentTimeMillis()));
+
         LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
         lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode);
 //        boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2);
@@ -421,22 +421,34 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         int delete = tenantBasicManagementMapper.delete(lambdaQueryWrapper2);
         if (delete == 0) {
             log.info("增加");
+            ocpTenantBase.setTenantCtime(new Timestamp(System.currentTimeMillis()));
+            ocpTenantBase.setTenantMtime(new Timestamp(System.currentTimeMillis()));
         } else {
             log.info("编辑");
+            ocpTenantBase.setTenantMtime(new Timestamp(System.currentTimeMillis()));
         }
         boolean save1 = this.save(ocpTenantBase);
-        if (save1) {
-            log.info("基础表添加成功");
+        OcpTenantExtent ocpTenantExtent = new OcpTenantExtent();
+        ocpTenantExtent.setTenantCode(tenantCode);
+        ocpTenantExtent.setTenantState((short) 0);
+        ocpTenantExtent.setIsDelete((short) 0);
+        LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(StringUtils.isNotEmpty(tenantCode),OcpTenantExtent::getTenantCode,tenantCode);
+        int delete1 = ocpTenantExtentMapper.delete(lambdaQueryWrapper1);
+        if (delete1 == 0) {
+            log.info("增加");
+            ocpTenantExtent.setTenantCtime(new Timestamp(System.currentTimeMillis()));
+            ocpTenantExtent.setTenantMtime(new Timestamp(System.currentTimeMillis()));
+        } else {
+            log.info("编辑");
+            ocpTenantExtent.setTenantMtime(new Timestamp(System.currentTimeMillis()));
         }
+        ocpTenantExtentMapper.insert(ocpTenantExtent);
+
 
         LambdaQueryWrapper<OcpTenantIocn> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(OcpTenantIocn::getCodeNo, tenantCode);
         boolean remove = ocpTenantIocnService.remove(lambdaQueryWrapper);
-        if (remove) {
-            log.info("图标表删除成功");
-            System.out.println("图标表删除成功");
-        }
-
         //添加新的数据到图标表
         OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
         String ownerCompanyCode = ocpBaseTiocnDto.getOwnerCompanyCode();
@@ -445,10 +457,6 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
 //        ocpTenantIocn.setIocn(ocpBaseTiocnDto.getIocn());
         ocpTenantIocn.setCompanyCode(ownerCompanyCode);
         boolean save = ocpTenantIocnService.save(ocpTenantIocn);
-        if (save) {
-            log.info("添加图标表成功");
-            System.out.println("添加图标表成功");
-        }
         if (save1 && save) {
             return ResponseVO.ok("添加成功");
         }
-- 
2.26.0