wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1102' of https://axzsource.com/universal/infrastructure/backend/tyr into feature/REQ-1102

Browse Source
This commit is contained in:
yangsong 2023-09-11 11:10:20 +08:00
commit a075351fa9
10 changed files with 85 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile Normal file
View File

@ -0,0 +1,3 @@
FROM registry.cn-hangzhou.aliyuncs.com/axzo-k8s/jdk1.8-fc:v1
COPY tyr-server/target/tyr.jar ./tyr.jar
ENTRYPOINT [{ENTRYPOINT}]

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

@ -35,7 +35,7 @@ public interface SaasBasicDictApi {
ApiResult<List<BasicDictNodeResp>> getBasicDictNodeList(@RequestBody @Validated BasicDictQueryReq req);
/**
* 获取字典树，需要单测树时才传type
* 获取字典树，需要单侧树时才传type
*
* @param type
* @return

3
tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleApi.java
View File

@ -43,7 +43,6 @@ public interface SaasRoleApi {
* @return
*/
@GetMapping("/api/saasRole/queryByIdentityIdType")
ApiResult<List<SaasRoleVO>> queryByIdentityIdType(@RequestParam(required = true) Long identityId,@RequestParam(required = true) Integer identityType,@RequestParam(required = true) Long workspaceId,@RequestParam(required = true) Long ouId
);
ApiResult<List<SaasRoleVO>> queryByIdentityIdType(@RequestParam(required = true) Long identityId,@RequestParam(required = true) Integer identityType,@RequestParam(required = true) Long workspaceId,@RequestParam(required = true) Long ouId);
}

1
tyr-server/pom.xml
View File

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

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

@ -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

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

@ -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));
}
}

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

@ -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.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.model.dict.response.BasicDictNodeResp;
import cn.axzo.tyr.client.model.dict.request.*;
/**
* @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);
}

6
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
View File

@ -80,8 +80,10 @@ public class ProductServiceImpl implements ProductService {
public ApiResult<ProductVO> delete(Long id) {
ProductModule productModule = productModuleDao.getById(id);
AssertUtil.isTrue(Objects.nonNull(productModule), "产品不存在");
productModule.setIsDelete(id);
productModuleDao.updateById(productModule);
productModuleDao.lambdaUpdate()
.eq(ProductModule::getId, productModule.getId())
.set(ProductModule::getIsDelete, productModule.getId())
.update();
return ApiResult.ok(BeanMapper.copyBean(productModule, ProductVO.class));
}
}

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

@ -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 null;
return ApiResult.ok(saasBasicDictDao.getBasicDictNodeList(req));
}
@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

2
tyr-server/src/main/resources/bootstrap.yml
View File

@ -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