fix: 合并代码整合

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/async/subscribe/PermissionServiceUpdateMessage.java

@@ -7,7 +7,6 @@ import com.dragoninfo.dcuc.auth.auth.entity.ServiceAuthResult;
 import com.dragoninfo.dcuc.auth.auth.service.IServiceAuthResultService;
 import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
 import com.dragoninfo.dcuc.auth.config.DcucAuthConfig;
-import com.dragoninfo.dcuc.auth.util.DcucConstantsUtil;
 import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
@@ -68,7 +67,6 @@ public class PermissionServiceUpdateMessage {
                     vo.setServiceCode(item.getServiceCode());
                     serviceAuthenticationResVOS.add(vo);
                 });
-                serviceAuthResultService.setAuthtionResultToRedis(appServiceCodeDto.getAppCode(), serviceAuthenticationResVOS);
             }
         }
     }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/IServiceAuthResultService.java

@@ -4,7 +4,6 @@ package com.dragoninfo.dcuc.auth.auth.service;
 import com.dragoninfo.dcuc.auth.auth.dto.ServiceAuthResultDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.ServiceAuthFlow;
 import com.dragoninfo.dcuc.auth.auth.entity.ServiceAuthResult;
-import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
 import org.springframework.data.domain.Page;
@@ -120,7 +119,6 @@ public interface IServiceAuthResultService {
      */
     void sendPermssionServiceUpdate(String serviceCode, String type);
 
-    void setAuthtionResultToRedis(String appCode, List<ServiceAuthenticationResVO> serviceCodes);
 
     ServiceAuthResultDTO getDetailByAppAndService(String appCode, String serviceCode);
 

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/ServiceAuthResultServiceImpl.java

@@ -17,11 +17,8 @@ import com.dragoninfo.dcuc.auth.auth.enumresources.WorkFlowStatusEnum;
 import com.dragoninfo.dcuc.auth.auth.enumresources.WorkFlowTypeEnum;
 import com.dragoninfo.dcuc.auth.auth.po.ServiceAuthResultPO;
 import com.dragoninfo.dcuc.auth.auth.service.IAuthFlowService;
-import com.dragoninfo.dcuc.auth.auth.service.IPermissionUpdateService;
 import com.dragoninfo.dcuc.auth.auth.service.IServiceAuthResultService;
 import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
-import com.dragoninfo.dcuc.auth.util.DcucConstantsUtil;
-import com.dragoninfo.dcuc.user.user.facade.IUserInfoFacade;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
@@ -62,9 +59,7 @@ public class ServiceAuthResultServiceImpl implements IServiceAuthResultService {
     private ServiceAuthResultBPO serviceAuthResultBPO;
 
     @Autowired
-    IServiceResourceFacade iServiceResourceFacade;
-    @Autowired
-    private IPermissionUpdateService permissionUpdateService;
+    private IServiceResourceFacade iServiceResourceFacade;
 
     @Autowired
     private PermssionServiceUpdateEventBus permssionServiceUpdateEventBus;
@@ -206,7 +201,7 @@ public class ServiceAuthResultServiceImpl implements IServiceAuthResultService {
         //新增授权
         for (String serviceCode : serviceResourceMap.keySet()) {
                 //已经存在的更新
-            if(allAuthResultMap.keySet().contains(serviceCode)){
+            if (allAuthResultMap.containsKey(serviceCode)) {
                 ServiceAuthResult serviceAuthResult = allAuthResultMap.get(serviceCode);
                 serviceAuthResult.setStartTime(startTime);
                 serviceAuthResult.setEndTime(endTime);
@@ -215,7 +210,7 @@ public class ServiceAuthResultServiceImpl implements IServiceAuthResultService {
                 serviceAuthResult.setFlowId(serviceAuthFlow.getFlowId());
                 serviceAuthResult.setMessageId(serviceAuthFlow.getMessageId());
                 serviceAuthResultBPO.update(serviceAuthResult);
-            }else {
+            } else {
                 //不存在的新增
                 ServiceAuthResult serviceAuthResult = new ServiceAuthResult();
                 serviceAuthResult.setAppCode(appCode);