Merge remote-tracking branch 'origin/main' into main

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java

@@ -92,4 +92,11 @@ public class ZcloudPostFacadeImpl implements ZcloudPostFacade {
         List<ZcloudPostCO> zcloudUserCo = postCoConvertor.converCOsToDubboCOs(list);
         return MultiResponse.of(zcloudUserCo);
     }
+
+    @Override
+    public SingleResponse<ZcloudPostCO> getPostById(Long aLong) {
+        PostCO postCO =  postService.getPostById(aLong);
+        ZcloudPostCO zcloudPostCO = postCoConvertor.converCOToDubboCO(postCO);
+        return SingleResponse.of(zcloudPostCO);
+    }
 }

web-app/src/main/java/com/zcloud/basic/info/command/CorpQualificationInfoAddExe.java

@@ -4,7 +4,9 @@ import com.alibaba.cola.exception.BizException;
 import com.zcloud.basic.info.domain.gateway.CorpQualificationInfoGateway;
 import com.zcloud.basic.info.domain.model.CorpQualificationInfoE;
 import com.zcloud.basic.info.dto.CorpQualificationInfoAddCmd;
+import com.zcloud.gbscommon.utils.Tools;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;

web-app/src/main/java/com/zcloud/basic/info/command/convertor/PostCoConvertor.java

@@ -23,6 +23,11 @@ public interface PostCoConvertor {
      * @return
      */
     List<PostCO> converDOsToCOs(List<PostDO> postDOs);
+
+    PostCO converDOToCO(PostDO postDO);
+
     List<ZcloudPostCO> converCOsToDubboCOs(List<PostCO> data);
+
+    ZcloudPostCO converCOToDubboCO(PostCO data);
 }
 

web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java

@@ -66,7 +66,7 @@ public class DepartmentQueryExe {
             return Collections.emptyList();
         }
         List<DepartmentTreeInfoCO> examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse);
-        //GBS部门根节点父部门是1
+        //GBS部门根节点父部门是tenantId
         return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList",AuthContext.getTenantId());
     }
 

web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java

@@ -178,5 +178,10 @@ public class PostQueryExe {
         List<PostDO> list = postRepository.list();
         return postCoConvertor.converDOsToCOs(list);
     }
+
+    public PostCO getPostById(Long aLong) {
+        PostDO data = postRepository.getById(aLong);
+        return postCoConvertor.converDOToCO(data);
+    }
 }
 

web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java

@@ -43,8 +43,6 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
     @Override
     public SingleResponse add(CorpInfoAddCmd cmd) {
 
-//        Long userId = AuthContext.getUserId();
-        cmd.setCorpinfoId(Tools.get32UUID());
         Long id = corpInfoAddExe.execute(cmd);
         return SingleResponse.buildSuccess();
     }

web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java

@@ -81,5 +81,10 @@ public class PostServiceImpl implements PostServiceI {
     public List<PostCO> getPostList() {
         return postQueryExe.getPostList();
     }
+
+    @Override
+    public PostCO getPostById(Long aLong) {
+        return postQueryExe.getPostById(aLong);
+    }
 }
 

web-client/src/main/java/com/zcloud/basic/info/api/PostServiceI.java

@@ -37,5 +37,7 @@ public interface PostServiceI {
     List<PostCO> listByPostIds(Collection<Long> collection);
 
     List<PostCO> getPostList();
+
+    PostCO getPostById(Long aLong);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/CorpInfoGatewayImpl.java

@@ -4,7 +4,9 @@ import com.zcloud.basic.info.domain.gateway.CorpInfoGateway;
 import com.zcloud.basic.info.domain.model.CorpInfoE;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
 import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
+import com.zcloud.gbscommon.utils.Tools;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +27,9 @@ public class CorpInfoGatewayImpl implements CorpInfoGateway {
     public Long add(CorpInfoE corpInfoE) {
         CorpInfoDO d = new CorpInfoDO();
         BeanUtils.copyProperties(corpInfoE, d);
+        if(StringUtils.isEmpty(d.getCorpinfoId())){
+            d.setCorpinfoId(Tools.get32UUID());
+        }
         corpInfoRepository.save(d);
         return d.getId();
     }

web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java

@@ -6,6 +6,7 @@ import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
 import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
 import com.zcloud.gbscommon.utils.Tools;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +27,9 @@ public class DepartmentGatewayImpl implements DepartmentGateway {
     public Long add(DepartmentE departmentE) {
         DepartmentDO d = new DepartmentDO();
         BeanUtils.copyProperties(departmentE, d);
-        d.setDepartmentId(Tools.get32UUID());
+        if(StringUtils.isEmpty(d.getDepartmentId())){
+            d.setDepartmentId(Tools.get32UUID());
+        }
         departmentRepository.save(d);
         return d.getId();
     }