From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
index 42ab067..a89ee60 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
@@ -1,15 +1,15 @@
package com.doumee.api.web;
+import com.doumee.core.haikang.model.param.respose.OrgListResponse;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.model.request.erp.ApproveAddRequest;
-import com.doumee.model.request.erp.OrgListRequest;
-import com.doumee.model.request.erp.UserListRequest;
-import com.doumee.model.response.CarEventListResponse;
-import com.doumee.model.response.erp.ApproveInfoResponse;
-import com.doumee.model.response.erp.OrgListRespone;
-import com.doumee.model.response.erp.UserListRespone;
+import com.doumee.core.model.openapi.request.erp.ApproveAddRequest;
+import com.doumee.core.model.openapi.request.erp.MemberFailRequest;
+import com.doumee.core.model.openapi.request.erp.OrgListRequest;
+import com.doumee.core.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.model.openapi.response.erp.ApproveInfoResponse;
+import com.doumee.core.model.openapi.response.erp.UserListRespone;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -17,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.UUID;
/**
@@ -28,32 +29,37 @@
@Api(tags = "2銆併�怑RP銆戠鎻愪緵鎺ュ彛锛堝悜璁垮绔彁渚涙垨鎻愪氦鏁版嵁淇℃伅锛�")
@RestController
-@RequestMapping("/erp")
+@RequestMapping("/erp/resource")
@Slf4j
public class ErpResourceController extends ApiController{
@ApiOperation(value = "鍏ㄩ噺缁勭粐淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴缁勭粐淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�")
- @PostMapping("/resource/org/list")
- public ApiResponse<PageData<OrgListRespone>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {
+ @PostMapping("/org/list")
+ public ApiResponse<PageData<OrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {
return ApiResponse.success(null);
}
@ApiOperation(value = "鍏ㄩ噺浜哄憳淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴浜哄憳淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�")
- @PostMapping("/resource/user/list")
+ @PostMapping("/user/list")
public ApiResponse<PageData<UserListRespone>> userList (@RequestBody PageWrap<UserListRequest> pageWrap) {
return ApiResponse.success(null);
}
@ApiOperation(value = "璁垮鐢宠鎻愪氦瀹℃壒鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇蜂俊鎭�,鎺ュ彛鎻愪氦鎴愬姛锛孍RP绔繑鍥炲鎵硅褰曠紪鐮�")
@PostMapping("/event/approve/apply")
- public ApiResponse<String> approveApply(@RequestBody ApproveAddRequest account ) {
+ public ApiResponse<String> approveApply(@RequestBody ApproveAddRequest param ) {
return ApiResponse.success(UUID.randomUUID().toString());
}
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉鏌ヨ鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾煡璇㈣瀹㈢敵璇峰鎵圭粨鏋�")
- @GetMapping("/resource/approve/info")
+ @GetMapping("/approve/info")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "瀹℃壒璁板綍鍞竴鏍囪瘑", required = true)
})
public ApiResponse<ApproveInfoResponse> approveInfo(@RequestParam String id ) {
return ApiResponse.success(null );
}
+ @ApiOperation(value = "鍛樺伐鍚屾澶辫触鎺ㄩ�佹帴鍙�", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屽憡鐭rp鍛樺伐淇℃伅鍚屾澶辫触鐨勬暟鎹�")
+ @PostMapping("/member/fail")
+ public ApiResponse<ApproveInfoResponse> memberFail(@RequestBody List<MemberFailRequest> param) {
+ return ApiResponse.success(null );
+ }
}
--
Gitblit v1.9.3