From 76098707803a91fc69978e6f9f1cd9063ef229bd Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 21 十二月 2023 16:15:00 +0800 Subject: [PATCH] 海康接口对接开发 --- server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 46 insertions(+), 9 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 ac78e75..14ea118 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.erp.model.openapi.response.erp.ERPApiResponse; -import com.doumee.core.haikang.model.param.respose.OrgListResponse; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +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.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.UserListRespone; +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; @@ -34,13 +39,45 @@ public class ErpResourceController extends ApiController { @ApiOperation(value = "鍏ㄩ噺缁勭粐淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴缁勭粐淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�") @PostMapping("/org/list") - public ERPApiResponse<PageData<OrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) { - return ERPApiResponse.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.setCreateDate(new Date()); + r.setCode(UUID.randomUUID().toString()); + r.setStatus(Constants.ZERO); + r.setName(names[i]); + list.add(r); + } + IPage<ErpOrgListResponse> pageInfo = new Page<>(1,10,3); + pageInfo.setRecords(list); + PageData<ErpOrgListResponse> r = PageData.from( pageInfo); + return ERPApiResponse.success(r); } @ApiOperation(value = "鍏ㄩ噺浜哄憳淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴浜哄憳淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�") @PostMapping("/user/list") - public ERPApiResponse<PageData<UserListRespone>> userList (@RequestBody PageWrap<UserListRequest> pageWrap) { - return ERPApiResponse.success(null); + public ERPApiResponse<PageData<ErpUserListResponse>> userList (@RequestBody PageWrap<UserListRequest> pageWrap) { + List<ErpUserListResponse> list = new ArrayList<>(); + String[] ids = new String[]{"","1001","1002","1003"}; + 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.setName(names[i]); + r.setFaceImg("/20223402/"+r.getId()+".png"); + list.add(r); + } + IPage<ErpUserListResponse> pageInfo = new Page<>(1,10,3); + pageInfo.setRecords(list); + PageData<ErpUserListResponse> r = PageData.from( pageInfo); + return ERPApiResponse.success(r); } @ApiOperation(value = "璁垮鐢宠鎻愪氦瀹℃壒鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇蜂俊鎭�,鎺ュ彛鎻愪氦鎴愬姛锛孍RP绔繑鍥炲鎵硅褰曠紪鐮�") @PostMapping("/event/approve/apply") -- Gitblit v1.9.3