fix(tcm):生产问题处理

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/EnterpriseManageServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dao.EsBaseEnterpriseInfoDao;
+import com.yeejoin.amos.boot.module.common.api.entity.EsBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
@@ -24,13 +25,11 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -52,6 +51,7 @@ public class EnterpriseManageServiceImpl {
      *
      * @param ids 企业ids
      */
+    @Transactional(rollbackFor = Exception.class)
     public List<TzBaseEnterpriseInfo> delete(List<String> ids) {
         // 校验
         List<TzBaseEnterpriseInfo> enterpriseInfos = enterpriseInfoService.getBaseMapper().selectBatchIds(ids);
@@ -64,10 +64,19 @@ public class EnterpriseManageServiceImpl {
             this.deleteEnterprise(e);
             this.deleteAmosUser(e);
             this.deleteAmosCompany(e);
+            this.deleteEsEnterpriseInfo(e);
         });
         return enterpriseInfos;
     }
 
+    private void deleteEsEnterpriseInfo(TzBaseEnterpriseInfo e) {
+        Optional<EsBaseEnterpriseInfo> op = esBaseEnterpriseInfoDao.findById(e.getSequenceNbr() + "");
+        op.ifPresent(v -> {
+            esBaseEnterpriseInfoDao.deleteById(v.getSequenceNbr());
+        });
+    }
+
+
     /**
      * 批量启用企业
      *
@@ -80,6 +89,7 @@ public class EnterpriseManageServiceImpl {
         this.checkForEnable(ids, enterpriseInfos);
         enterpriseInfos.forEach(enterpriseInfo -> {
             this.updateEnterpriseDeletedStatus(enterpriseInfo, false);
+            // 保留防止之前勿删除了
             this.insertEnterprise2Es(enterpriseInfo);
             this.unlockLoginAccount(enterpriseInfo);
         });
@@ -99,7 +109,6 @@ public class EnterpriseManageServiceImpl {
         this.checkForDisable(ids, enterpriseInfos);
         enterpriseInfos.forEach(enterpriseInfo -> {
             this.updateEnterpriseDeletedStatus(enterpriseInfo, true);
-            this.deleteEnterpriseFromEs(enterpriseInfo);
             this.lockLoginAccount(enterpriseInfo);
         });
         return true;
@@ -119,10 +128,6 @@ public class EnterpriseManageServiceImpl {
         refreshHandler.doRefresh(new TzsDataRefreshMessage().setDataId(enterpriseInfo.getSequenceNbr() + "").setOperation(DataRefreshEvent.Operation.INSERT.name()));
     }
 
-    private void deleteEnterpriseFromEs(TzBaseEnterpriseInfo enterpriseInfo) {
-        esBaseEnterpriseInfoDao.deleteById(enterpriseInfo.getSequenceNbr() + "");
-    }
-
     private void lockLoginAccount(TzBaseEnterpriseInfo enterpriseInfo) {
         CompanyModel companyModel = FeignUtil.remoteCall(() -> Privilege.companyClient.queryByCompanyCode(enterpriseInfo.getUseCode()));
         List<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByCompanyId(companyModel.getSequenceNbr(), null, null, false));