Merge branch 'develop' of 192.168.0.144:dcuc/dcuc-auth-service into mazq-kafka-0302

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/bpo/ServiceAuthResultBPO.java

@@ -31,7 +31,7 @@ public class ServiceAuthResultBPO extends BaseBPO<ServiceAuthResult,String> {
                 "FROM\n" +
                 "\tT_SERVICE_AUTH_RESULT t\n" +
                 "LEFT JOIN T_SERVICE_RESOURCE r ON r.id = t.service_id\n" +
-                "LEFT JOIN t_apply_info y ON (y.id = t.app_id) ";
+                "LEFT JOIN t_apply_info y ON (y.id = t.app_id) order by t.create_time desc";
         Page<ServiceAuthResultPO> paging = PersistentFactory.getJdbcDao().paging(sql, searchable,ServiceAuthResultPO.class);
         return paging;
     }

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

@@ -2,9 +2,11 @@ package com.dragoninfo.dcuc.auth.auth.service.impl;
 
 
 import cn.hutool.core.util.StrUtil;
+import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
 import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
 import com.dragoninfo.dcuc.app.facade.IResourceFacade;
+import com.dragoninfo.dcuc.app.facade.IServiceResourceFacade;
 import com.dragoninfo.dcuc.auth.auth.async.PermssionServiceUpdateEventBus;
 import com.dragoninfo.dcuc.auth.auth.bpo.ServiceAuthResultBPO;
 import com.dragoninfo.dcuc.auth.auth.dto.AppServiceCodeDto;
@@ -32,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,6 +69,9 @@ public class ServiceAuthResultServiceImpl implements IServiceAuthResultService {
     @Autowired
     private PermssionServiceUpdateEventBus permssionServiceUpdateEventBus;
 
+    @Autowired
+    private IServiceResourceFacade serviceResourceFacade;
+
     @Override
     public ServiceAuthResult saveAuthResult(ServiceAuthResult serviceAuthResult) {
         serviceAuthResult.setCreateTime(new Date());
@@ -261,6 +267,12 @@ public class ServiceAuthResultServiceImpl implements IServiceAuthResultService {
        try{
            ServiceAuthResult result=new ServiceAuthResult();
            BeanUtils.copyProperties(dto,result);
+           ApplyInfo app = applyInfoFacade.applyDetail(dto.getAppId());
+           result.setAppId(app.getId());
+           result.setAppCode(app.getApplyCode());
+           result.setDeleted(BooleanEnum.FALSE.value);
+           ServiceResource serviceResource = serviceResourceFacade.detailByCode(dto.getServiceCode());
+           result.setServiceId(serviceResource.getId());
            this.saveAuthResult(result);
        }catch (Exception e){
             log.error("save ServiceAuthResult error :",e);
@@ -290,7 +302,13 @@ public class ServiceAuthResultServiceImpl implements IServiceAuthResultService {
     @Override
     public ResponseDTO updateServiceAuthResult(ServiceAuthResultDTO dto){
         ServiceAuthResult result=serviceAuthResultBPO.get(dto.getId());
-        BeanUtils.copyProperties(result,dto);
+        //BeanUtils.copyProperties(result,dto);
+        ApplyInfo app = applyInfoFacade.applyDetail(dto.getAppId());
+        result.setAppId(app.getId());
+        result.setAppCode(app.getApplyCode());
+        result.setDeleted(BooleanEnum.FALSE.value);
+        ServiceResource serviceResource = serviceResourceFacade.detailByCode(dto.getServiceCode());
+        result.setServiceId(serviceResource.getId());
         result.setUpdateTime(new Date());
         serviceAuthResultBPO.update(result);
         return ResponseDTO.success("修改成功",null);