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

Merge branch 'hotfix/20241212' into 'master'

Browse Source 
feat:(hotfix) 临时修改以前的接口，参数从body里面获取

See merge request universal/infrastructure/backend/tyr!381
This commit is contained in:
李龙 2024-12-12 01:45:16 +00:00
commit 74babf0ad2
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java
View File

@ -6,6 +6,7 @@ import cn.axzo.tyr.client.model.req.DeleteFeatureResourceReq;
import cn.axzo.tyr.client.model.req.DetailFeatureResourceReq;
import cn.axzo.tyr.client.model.req.FeatureResourceTreeSaveReq;
import cn.axzo.tyr.client.model.req.GetFeatureResourceTreeReq;
import cn.axzo.tyr.client.model.req.ListFeatureCodeByFeatureResourceIdsReq;
import cn.axzo.tyr.client.model.req.PageSaasFeatureResourceReq;
import cn.axzo.tyr.client.model.req.ResourceSyncReq;
import cn.axzo.tyr.client.model.res.FeatureResourceTreeNode;
@ -77,6 +78,14 @@ public interface FeatureResourceApi {
@PostMapping("/api/featureResource/listFeatureCodeByFeatureResourceIds")
ApiResult<Map<Long, String>> listFeatureCodeByFeatureResourceIds(@RequestParam List<Long> featureResourceIds);
/**
* 临时copy的listFeatureCodeByFeatureResourceIds接口，因为线上url里面参数超长了，，改成从body里面取
* @param param
* @return
*/
@PostMapping("/api/featureResource/listFeatureCodeByFeatureResourceIds/v2")
ApiResult<Map<Long, String>> listFeatureCodeByFeatureResourceIdsV2(@Validated @RequestBody ListFeatureCodeByFeatureResourceIdsReq param);
@PostMapping("/api/featureResource/list")
ApiResult<List<SaasFeatureResourceResp>> list(@Validated @RequestBody PageSaasFeatureResourceReq param);

19
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListFeatureCodeByFeatureResourceIdsReq.java Normal file
View File

@ -0,0 +1,19 @@
package cn.axzo.tyr.client.model.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import java.util.Set;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ListFeatureCodeByFeatureResourceIdsReq {
@NotEmpty(message = "featureResourceIds不能为空")
private Set<Long> featureResourceIds;
}

7
tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java
View File

@ -7,6 +7,7 @@ import cn.axzo.tyr.client.model.req.DeleteFeatureResourceReq;
import cn.axzo.tyr.client.model.req.DetailFeatureResourceReq;
import cn.axzo.tyr.client.model.req.FeatureResourceTreeSaveReq;
import cn.axzo.tyr.client.model.req.GetFeatureResourceTreeReq;
import cn.axzo.tyr.client.model.req.ListFeatureCodeByFeatureResourceIdsReq;
import cn.axzo.tyr.client.model.req.PageSaasFeatureResourceReq;
import cn.axzo.tyr.client.model.req.ResourceSyncReq;
import cn.axzo.tyr.client.model.res.FeatureResourceTreeNode;
@ -15,6 +16,7 @@ import cn.axzo.tyr.server.service.FeatureResourceSyncService;
import cn.axzo.tyr.server.service.SaasFeatureResourceService;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RestController;
@ -106,6 +108,11 @@ public class FeatureResourceController implements FeatureResourceApi {
return ApiResult.ok(featureResourceSyncService.listFeatureCodeByFeatureResourceIds(featureResourceIds));
}
@Override
public ApiResult<Map<Long, String>> listFeatureCodeByFeatureResourceIdsV2(ListFeatureCodeByFeatureResourceIdsReq param) {
return ApiResult.ok(featureResourceSyncService.listFeatureCodeByFeatureResourceIds(Lists.newArrayList(param.getFeatureResourceIds())));
}
@Override
public ApiResult<List<SaasFeatureResourceResp>> list(PageSaasFeatureResourceReq param) {
return ApiResult.ok(featureResourceService.list(param));