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 +++++++++++++++---
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ErpOrgListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 16 ++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 49 +++++++---------
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ErpUserListResponse.java | 11 ---
5 files changed, 78 insertions(+), 55 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
index a2ea405..c7a57ca 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -8,8 +8,8 @@
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.ERPApiResponse;
-import com.doumee.core.erp.model.openapi.response.erp.OrgListRespone;
-import com.doumee.core.erp.model.openapi.response.erp.UserListRespone;
+import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
import com.doumee.core.utils.HttpsUtil;
import org.apache.commons.lang3.StringUtils;
@@ -22,12 +22,12 @@
* @param param
* @return
*/
- public static List<OrgListRespone> getErpOrgList(String url,OrgListRequest param){
+ public static List<ErpOrgListResponse> getErpOrgList(String url, OrgListRequest param){
String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
if(StringUtils.isNotBlank(result)){
TypeReference typeReference =
- new TypeReference<ERPApiResponse<List<OrgListRespone>>>(){};
- ERPApiResponse<List<OrgListRespone>> response = JSONObject.parseObject(result, typeReference.getType());
+ new TypeReference<ERPApiResponse<List<ErpOrgListResponse>>>(){};
+ ERPApiResponse<List<ErpOrgListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
if(response!=null){
return response.getData();
}
@@ -42,12 +42,12 @@
* @param param
* @return
*/
- public static List<UserListRespone> getErpUserList(String url, UserListRequest param){
+ public static List<ErpUserListResponse> getErpUserList(String url, UserListRequest param){
String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
if(StringUtils.isNotBlank(result)){
TypeReference typeReference =
- new TypeReference<ERPApiResponse<List<UserListRespone>>>(){};
- ERPApiResponse<List<UserListRespone>> response = JSONObject.parseObject(result, typeReference.getType());
+ new TypeReference<ERPApiResponse<List<ErpUserListResponse>>>(){};
+ ERPApiResponse<List<ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
if(response!=null){
return response.getData();
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/OrgListRespone.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ErpOrgListResponse.java
similarity index 96%
rename from server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/OrgListRespone.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ErpOrgListResponse.java
index e4f6bf5..ca8f270 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/OrgListRespone.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ErpOrgListResponse.java
@@ -12,7 +12,7 @@
*/
@Data
@ApiModel("缁勭粐淇℃伅鍚屾杩斿洖淇℃伅")
-public class OrgListRespone {
+public class ErpOrgListResponse {
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
private String id;
@ApiModelProperty(value = "鍚嶇О" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/UserListRespone.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ErpUserListResponse.java
similarity index 83%
rename from server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/UserListRespone.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ErpUserListResponse.java
index 2b7159f..de3685c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/UserListRespone.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ErpUserListResponse.java
@@ -1,16 +1,9 @@
package com.doumee.core.erp.model.openapi.response.erp;
-import com.doumee.core.constants.ResponseStatus;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
import lombok.Data;
-import org.springframework.http.HttpStatus;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -20,7 +13,7 @@
*/
@Data
@ApiModel("浜哄憳淇℃伅鍚屾杩斿洖淇℃伅")
-public class UserListRespone {
+public class ErpUserListResponse {
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
private String id;
@ApiModelProperty(value = "濮撳悕" )
@@ -40,7 +33,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿,濡�2023-11-24 09:47:36")
private Date editDate;
@ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�")
- private Integer orgId;
+ private String orgId;
@ApiModelProperty(value = "浜鸿劯鐓х墖鍦板潃,鍥剧墖鍏綉璁块棶鍦板潃")
private String faceImg;
@ApiModelProperty(value = "宸ュ彿")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index f1ecd22..d16049c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -12,20 +12,15 @@
import com.doumee.core.erp.ErpConstants;
import com.doumee.core.erp.ErpTool;
import com.doumee.core.erp.model.openapi.request.erp.*;
-import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.OrgAddRequest;
-import com.doumee.core.haikang.model.param.request.OrgDelRequest;
-import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.*;
import com.doumee.core.erp.model.openapi.response.*;
-import com.doumee.core.erp.model.openapi.response.erp.OrgListRespone;
-import com.doumee.core.erp.model.openapi.response.erp.UserListRespone;
+import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
@@ -39,11 +34,8 @@
import com.doumee.service.business.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.hikvision.artemis.sdk.config.ArtemisConfig;
-import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -131,7 +123,7 @@
@Transactional
public String syncCompany(OrgListRequest param){
//鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
- List<OrgListRespone> list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param);
+ List<ErpOrgListResponse> list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param);
if(list !=null && list.size()>0){
List<Company> addList = new ArrayList<>();
List<Company> updateList = new ArrayList<>();
@@ -167,9 +159,9 @@
* @param delIds
* @param allList
*/
- private void dealCompanyChangeList(List<OrgListRespone> list, List<Company> addList, List<Company> updateList, List<Integer> delIds, List<Company> allList) {
+ private void dealCompanyChangeList(List<ErpOrgListResponse> list, List<Company> addList, List<Company> updateList, List<Integer> delIds, List<Company> allList) {
Date date = new Date();
- for(OrgListRespone respone : list){
+ for(ErpOrgListResponse respone : list){
//鏍规嵁erpid鏌ヨ浼佷笟淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
Company company = findCompanyByERPId(allList,respone.getId());
if(company == null){
@@ -206,7 +198,7 @@
* @param date
* @return
*/
- private Company addUpdateCompanyModel(OrgListRespone respone,Company company,Date date) {
+ private Company addUpdateCompanyModel(ErpOrgListResponse respone, Company company, Date date) {
company.setName(respone.getName());
company.setErpId(respone.getId());
company.setEditDate(date);
@@ -223,7 +215,7 @@
* @param date
* @return
*/
- private Company getAddCompanyModel(OrgListRespone respone, Date date) {
+ private Company getAddCompanyModel(ErpOrgListResponse respone, Date date) {
Company company = new Company();
company.setIsdeleted(Constants.ZERO);
company.setName(respone.getName());
@@ -236,8 +228,8 @@
return company;
}
- private boolean isCompanyDeleted(Company c, List<OrgListRespone> list) {
- for(OrgListRespone m : list){
+ private boolean isCompanyDeleted(Company c, List<ErpOrgListResponse> list) {
+ for(ErpOrgListResponse m : list){
if(StringUtils.equals(c.getErpId(),m.getId())){
return true;
}
@@ -267,7 +259,7 @@
@Override
@Transactional
public String syncUsers(UserListRequest param){
- List<UserListRespone> list = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
+ List<ErpUserListResponse> list = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
if(list !=null && list.size()>0) {
List<Member> addList = new ArrayList<>();
List<Member> updateList = new ArrayList<>();
@@ -286,6 +278,7 @@
if(updateList.size()>0){
for(Member c : updateList){
dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
+ c.setHkStatus(Constants.ZERO);
memberMapper.updateById(c);
}
}
@@ -294,7 +287,8 @@
dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
}
delIds = delList.stream().map(m->m.getId()).collect(Collectors.toList());
- memberMapper.update(null,new UpdateWrapper<Member>().lambda().set(Member::getHkStatus,Constants.ZERO)
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getHkStatus,Constants.ZERO)
.set(Member::getIsdeleted, Constants.ONE).in(Member::getId,delIds));
}
}else{
@@ -311,9 +305,9 @@
}
- private void dealUserChangeList(List<UserListRespone> list, List<Member> addList, List<Member> updateList,List<Member> delList, List<Member> allList) {
+ private void dealUserChangeList(List<ErpUserListResponse> list, List<Member> addList, List<Member> updateList, List<Member> delList, List<Member> allList) {
Date date = new Date();
- for(UserListRespone response : list){
+ for(ErpUserListResponse response : list){
//鏍规嵁 erpId 鏌ヨ鐢ㄦ埛淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
Member member = findUserByERPId(allList,response.getId());
if(member == null){
@@ -330,7 +324,6 @@
member.setRoleIds(response.getRoleIds());
delList.add(member);
// delIds.add(member.getId());
-
continue;
}
updateList.add(addUpdateMemberModel(response,member,date));
@@ -346,7 +339,7 @@
}
}
- private Member getAddMemberModel(UserListRespone param, Date date) {
+ private Member getAddMemberModel(ErpUserListResponse param, Date date) {
Member member = new Member();
BeanUtils.copyProperties(param,member);
member.setCreateDate(new Date());
@@ -359,18 +352,18 @@
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setCompanyId(param.getOrgId());
+ member.setErpOrgId(param.getOrgId());
member.setHkStatus(Constants.ZERO);
member.setRoleIds(param.getRoleIds());
return member;
}
- private Member addUpdateMemberModel(UserListRespone param,Member member,Date date) {
+ private Member addUpdateMemberModel(ErpUserListResponse param, Member member, Date date) {
BeanUtils.copyProperties(param,member);
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setCompanyId(param.getOrgId());
+ member.setErpOrgId(param.getOrgId());
member.setEditDate(new Date());
member.setErpDate(new Date());
member.setHkStatus(Constants.ZERO);
@@ -378,8 +371,8 @@
return member;
}
- private boolean isUserDeleted(Member c, List<UserListRespone> list) {
- for(UserListRespone m : list){
+ private boolean isUserDeleted(Member c, List<ErpUserListResponse> list) {
+ for(ErpUserListResponse m : list){
if(StringUtils.equals(c.getErpId(),m.getId().toString())){
c.setRoleIds(m.getRoleIds());
return true;
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