Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1102

tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasBasicDictApi.java

@@ -35,15 +35,15 @@ public interface SaasBasicDictApi {
     ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(@RequestBody @Validated BasicDictQueryReq req);
 
     /**
-     * 获取字典树，需要单测树时才传type
+     * 获取字典树，需要单侧树时才传type
      *
      * @param type
      * @return
      */
     @PostMapping("api/dict/node-tree")
     ApiResult<BasicDictTreeResp> getBasicDictNodeTree(@RequestBody
-                                                            @EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误")
+                                                      @EnumValidator(enumClass = DictTypeFiledEnum.class, message = "枚举类型错误")
-                                                            DictTypeFiledEnum type);
+                                                      DictTypeFiledEnum type);
 
     /**
      * 获取字典节点详情

tyr-server/pom.xml

@@ -70,6 +70,5 @@
             <groupId>cn.axzo.basics</groupId>
             <artifactId>basics-common</artifactId>
         </dependency>
-
     </dependencies>
 </project>

tyr-server/src/main/java/cn/axzo/tyr/server/controller/dict/SaasBasicDictController.java

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * @author： chenwenjian
  * @date： 2023/9/8 14:32
- * @description：
+ * @description： 字典controller
  * @modifiedBy：
  * @version: 1.0
  */
@@ -39,22 +39,22 @@ public class SaasBasicDictController implements SaasBasicDictApi {
 
     @Override
     public ApiResult<BasicDictNodeResp> getBasicDictNode(BasicDictNodeReq req) {
-        return null;
+        return saasBasicDictService.getBasicDictNode(req);
     }
 
     @Override
     public ApiResult<Long> create(BasicDictCreateReq req) {
-        return null;
+        return saasBasicDictService.create(req);
     }
 
     @Override
     public ApiResult<Boolean> update(BasicDictUpdateReq req) {
-        return null;
+        return saasBasicDictService.update(req);
     }
 
     @Override
     public ApiResult<Boolean> updateStatus(BasicDictUpdateStatusReq req) {
-        return null;
+        return saasBasicDictService.updateStauts(req);
     }
 
     @Override

tyr-server/src/main/java/cn/axzo/tyr/server/repository/SaasBasicDictDao.java

@@ -1,10 +1,17 @@
 package cn.axzo.tyr.server.repository;
 
+import cn.axzo.basics.common.BeanMapper;
+import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq;
+import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
 import cn.axzo.tyr.server.repository.entity.SaasBasicDict;
 import cn.axzo.tyr.server.repository.mapper.SaasBasicDictMapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * @author： chenwenjian
  * @date： 2023/9/7 17:43
@@ -15,4 +22,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class SaasBasicDictDao extends ServiceImpl<SaasBasicDictMapper, SaasBasicDict> {
 
+    public List<BasicDictNodeResp> getBasicDictNodeList(BasicDictQueryReq req) {
+        LambdaQueryChainWrapper<SaasBasicDict> queryChainWrapper = lambdaQuery();
+        if (Objects.nonNull(req)){
+            queryChainWrapper.eq(Objects.nonNull(req.getParentId()), SaasBasicDict::getParentId, req.getParentId())
+                    .eq(Objects.nonNull(req.getWorkspaceType()), SaasBasicDict::getWorkspaceType, Objects.nonNull(req.getWorkspaceType())?req.getWorkspaceType().getValue():"")
+                    .eq(Objects.nonNull(req.getType()), SaasBasicDict::getType, Objects.nonNull(req.getType())?req.getType().getValue():"")
+                    .eq(Objects.nonNull(req.getCode()), SaasBasicDict::getCode, req.getCode())
+                    .eq(Objects.nonNull(req.getStatus()), SaasBasicDict::getStatus, Boolean.TRUE.equals(req.getStatus()) ? 1 : 0)
+                    .like(Objects.nonNull(req.getName()), SaasBasicDict::getName, req.getName());
+        }
+        List<SaasBasicDict> basicDictList = queryChainWrapper.orderByDesc(SaasBasicDict::getSort).list();
+        return BeanMapper.copyList(basicDictList, BasicDictNodeResp.class, (s, b) -> b.setStatus(s.getStatus() == 1));
+    }
 }

tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasBasicDictService.java

@@ -2,14 +2,12 @@ package cn.axzo.tyr.server.service;
 
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.model.DictTypeFiledEnum;
-import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq;
+import cn.axzo.tyr.client.model.dict.request.*;
 import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
 import cn.axzo.tyr.client.model.dict.response.BasicDictTreeResp;
 
 import java.util.List;
-
+import cn.axzo.tyr.client.model.dict.request.*;
-import cn.axzo.framework.domain.web.result.ApiResult;
-import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
 
 /**
  * @author： chenwenjian
@@ -23,4 +21,12 @@ public interface SaasBasicDictService {
 
     ApiResult<BasicDictTreeResp> getBasicDictNodeTree(DictTypeFiledEnum type);
     ApiResult<BasicDictNodeResp> getById(Long id);
+
+    ApiResult<BasicDictNodeResp> getBasicDictNode(BasicDictNodeReq req);
+
+    ApiResult<Long> create(BasicDictCreateReq req);
+
+    ApiResult<Boolean> update(BasicDictUpdateReq req);
+
+    ApiResult<Boolean> updateStauts(BasicDictUpdateStatusReq req);
 }

tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java

@@ -3,7 +3,7 @@ package cn.axzo.tyr.server.service.impl;
 import cn.axzo.basics.common.BeanMapper;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.model.DictTypeFiledEnum;
-import cn.axzo.tyr.client.model.dict.request.BasicDictQueryReq;
+import cn.axzo.tyr.client.model.dict.request.*;
 import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
 import cn.axzo.tyr.client.model.dict.response.BasicDictTreeResp;
 import cn.axzo.tyr.server.repository.SaasBasicDictDao;
@@ -30,12 +30,46 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService {
 
     @Override
     public ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(BasicDictQueryReq req) {
-
+        return ApiResult.ok(saasBasicDictDao.getBasicDictNodeList(req));
-        return null;
     }
 
     @Override
     public ApiResult<BasicDictTreeResp> getBasicDictNodeTree(DictTypeFiledEnum type) {
+//        // 获取所有节点
+//        List<BasicDictNodeResp> basicDictNodeList = saasBasicDictDao.getBasicDictNodeList(null);
+//        // 单侧树
+//        if (Objects.nonNull(type)){
+//            basicDictNodeList.stream().filter(new Predicate<BasicDictNodeResp>() {
+//                @Override
+//                public boolean test(BasicDictNodeResp b) {
+//                    return b.getType().equals(type.getValue());
+//                }
+//            });
+//        }
+        return null;
+    }
+
+    public BasicDictTreeResp constructDictTree(List<BasicDictNodeResp> nodeList){
+        return null;
+    }
+
+    @Override
+    public ApiResult<BasicDictNodeResp> getBasicDictNode(BasicDictNodeReq req) {
+        return null;
+    }
+
+    @Override
+    public ApiResult<Long> create(BasicDictCreateReq req) {
+        return null;
+    }
+
+    @Override
+    public ApiResult<Boolean> update(BasicDictUpdateReq req) {
+        return null;
+    }
+
+    @Override
+    public ApiResult<Boolean> updateStauts(BasicDictUpdateStatusReq req) {
         return null;
     }
     @Override

tyr-server/src/main/resources/bootstrap.yml

@@ -8,7 +8,7 @@ spring:
         file-extension: yaml
         namespace: ${NACOS_NAMESPACE_ID}
   profiles:
-    active: ${NACOS_PROFILES_ACTIVE:local}
+    active: ${NACOS_PROFILES_ACTIVE:dev}
     include: swagger
   main:
     allow-bean-definition-overriding: true