From 75e493d0aa727b99134bf442d8c49191fc613681 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 11 三月 2024 12:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 64 insertions(+), 19 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 a89ee60..fcb986a 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,18 @@
package com.doumee.api.web;
-import com.doumee.core.haikang.model.param.respose.OrgListResponse;
-import com.doumee.core.model.ApiResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.core.erp.model.openapi.request.erp.ApproveAddRequest;
+import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest;
+import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-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 com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
+import com.doumee.core.erp.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
+import com.doumee.core.utils.Constants;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -17,6 +20,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -31,34 +36,74 @@
@RestController
@RequestMapping("/erp/resource")
@Slf4j
-public class ErpResourceController extends ApiController{
+public class ErpResourceController extends ApiController {
@ApiOperation(value = "鍏ㄩ噺缁勭粐淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴缁勭粐淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�")
@PostMapping("/org/list")
- public ApiResponse<PageData<OrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {
- return ApiResponse.success(null);
+ public ERPApiResponse<PageData<ErpOrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {
+ List<ErpOrgListResponse> list = new ArrayList<>();
+ String[] ids = new String[]{"","001","002","003"};
+ String[] names = new String[]{"","缁勭粐1","缁勭粐2","缁勭粐3"};
+ for(int i=1;i<4;i++){
+ ErpOrgListResponse r = new ErpOrgListResponse();
+ r.setParentOrgId(ids[i-1]);
+ r.setId(ids[i]);
+ r.setCreateDate(new Date());
+ r.setCode(ids[i]);
+ r.setStatus(Constants.ZERO);
+ r.setIsdeleted(Constants.ZERO);
+ r.setName(names[i]);
+ list.add(r);
+ }
+ IPage<ErpOrgListResponse> pageInfo = new Page<>(1,10,3);
+ pageInfo.setTotal(3);
+ pageInfo.setRecords(list);
+ PageData<ErpOrgListResponse> r = PageData.from( pageInfo);
+ return ERPApiResponse.success(r);
}
@ApiOperation(value = "鍏ㄩ噺浜哄憳淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴浜哄憳淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�")
@PostMapping("/user/list")
- public ApiResponse<PageData<UserListRespone>> userList (@RequestBody PageWrap<UserListRequest> pageWrap) {
- return ApiResponse.success(null);
+ public ERPApiResponse<PageData<ErpUserListResponse>> userList (@RequestBody PageWrap<UserListRequest> pageWrap) {
+ List<ErpUserListResponse> list = new ArrayList<>();
+ String[] ids = new String[]{"","DM1004","DM1005","DM1006"};
+ String[] names = new String[]{"","浜哄憳1","浜哄憳2","浜哄憳3"};
+ String[] orgs = new String[]{"","001","002","003"};
+ for(int i=1;i<4;i++){
+ ErpUserListResponse r = new ErpUserListResponse();
+ r.setOrgId(orgs[i]);
+ r.setId(ids[i]);
+ r.setName(names[i-1]);
+ r.setCode( ids[i]);
+ r.setIdNo("34112219880427042"+i);
+ r.setPhone("1534569000"+i);
+ r.setStatus(Constants.ZERO);
+ r.setRoleIds(new Integer[]{21+(i%2)});
+ r.setName(names[i]);
+ r.setFaceImg("/20223402/"+r.getId()+".png");
+ list.add(r);
+ }
+ IPage<ErpUserListResponse> pageInfo = new Page<>(1,10,3);
+ pageInfo.setRecords(list);
+ pageInfo.setTotal(3);
+ PageData<ErpUserListResponse> r = PageData.from( pageInfo);
+ return ERPApiResponse.success(r);
}
@ApiOperation(value = "璁垮鐢宠鎻愪氦瀹℃壒鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇蜂俊鎭�,鎺ュ彛鎻愪氦鎴愬姛锛孍RP绔繑鍥炲鎵硅褰曠紪鐮�")
@PostMapping("/event/approve/apply")
- public ApiResponse<String> approveApply(@RequestBody ApproveAddRequest param ) {
- return ApiResponse.success(UUID.randomUUID().toString());
+ public ERPApiResponse<String> approveApply(@RequestBody ApproveAddRequest param ) {
+ return ERPApiResponse.success(UUID.randomUUID().toString());
}
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉鏌ヨ鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾煡璇㈣瀹㈢敵璇峰鎵圭粨鏋�")
@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 );
+ public ERPApiResponse<ApproveInfoResponse> approveInfo(@RequestParam String id ) {
+ return ERPApiResponse.success(null );
}
@ApiOperation(value = "鍛樺伐鍚屾澶辫触鎺ㄩ�佹帴鍙�", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屽憡鐭rp鍛樺伐淇℃伅鍚屾澶辫触鐨勬暟鎹�")
@PostMapping("/member/fail")
- public ApiResponse<ApproveInfoResponse> memberFail(@RequestBody List<MemberFailRequest> param) {
- return ApiResponse.success(null );
+ public ERPApiResponse memberFail(@RequestBody List<UserFailRequest> param) {
+ return ERPApiResponse.success(null );
}
}
--
Gitblit v1.9.3