From 7b3be7b18ddb0308190bf4463a63043b5b7649f9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 17:00:50 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java        |    3 
 server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConfig.java                      |   61 +++
 server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java                           |   33 +
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java       |   17 
 server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java                             |    6 
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java           |   19 +
 server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisUtil.java                        |   86 +++++
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java      |  504 +++++++++++++++++++++++++++++
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java    |    3 
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java       |    3 
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java       |   18 
 server/openapi/src/main/java/com/doumee/api/web/ApiController.java                                     |    7 
 server/dmvisit_service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java                |   10 
 server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java                           |    2 
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java                         |    2 
 server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java                    |    2 
 server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java                |    4 
 server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConverter.java                   |   38 ++
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java        |    4 
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java      |   23 
 server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java                   |   57 +++
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java   |    3 
 server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java                             |   55 ++
 server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java                              |   11 
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java  |   15 
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java |    1 
 server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java      |    2 
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java                        |    1 
 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java               |    4 
 29 files changed, 919 insertions(+), 75 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
index 065a6cd..43dc056 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
@@ -18,14 +18,14 @@
     /**
      * 鐢ㄦ埛id
      */
-    private Integer memberId;
+    private String memberId;
     private long expire;
 
 
     public JwtPayLoad() {
     }
 
-    public JwtPayLoad(Integer memberId) {
+    public JwtPayLoad(String memberId) {
         this.memberId = memberId;
     }
 
@@ -52,7 +52,7 @@
             return new JwtPayLoad();
         } else {
             JwtPayLoad jwtPayLoad = new JwtPayLoad();
-            jwtPayLoad.setMemberId((Integer) map.get("memberId"));
+            jwtPayLoad.setMemberId((String) map.get("memberId"));
 
             return jwtPayLoad;
         }
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
index e368861..9609518 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
@@ -126,7 +126,7 @@
     /**
      * 鐢熸垚token,鏍规嵁userId鍜岃繃鏈熸椂闂�
      */
-    public static String generateToken(Integer userId, Date exppiredDate, Map<String, Object> claims) {
+    public static String generateToken(String userId, Date exppiredDate, Map<String, Object> claims) {
 
         final Date createdDate = new Date();
         String secret = getJwtSecret();
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index 39f139d..8081e3e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -1,14 +1,19 @@
 package com.doumee.config.Jwt;
 
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.annotation.ErpLoginRequired;
 import com.doumee.config.annotation.LoginRequired;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.redis.RedisUtil;
 import io.jsonwebtoken.JwtException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.method.HandlerMethod;
@@ -26,6 +31,12 @@
 
     @Autowired
     private JdbcTemplate dao;
+
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+
+    @Autowired
+    private RedisTemplate<String,Object> redisTemplate;
 
     /**
      * 娣诲姞鎷︽埅鍣�
@@ -47,7 +58,7 @@
 //                Method method = handlerMethod.getMethod();
 
                 // 鏈� @LoginRequired 娉ㄨВ锛岄渶瑕佺櫥褰曡璇�
-                if (beanType.isAnnotationPresent(LoginRequired.class)) {
+                if (beanType.isAnnotationPresent(LoginRequired.class) || handlerMethod.hasMethodAnnotation(LoginRequired.class)) {
                     //鑾峰彇token
                     String token = request.getHeader(JwtTokenUtil.HEADER_KEY);  // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
                     if (StringUtils.isNotBlank(token)) {
@@ -55,12 +66,16 @@
                     } else {
                         throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
                     }
-                }else if (handlerMethod.hasMethodAnnotation(LoginRequired.class)){
-                    //鑾峰彇token
-                    String token = request.getHeader(JwtTokenUtil.HEADER_KEY);  // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
-                    if (StringUtils.isNotBlank(token)) {
-                        checkLogin(request,response);
-                    } else {
+                } else if(beanType.isAnnotationPresent(ErpLoginRequired.class) || handlerMethod.hasMethodAnnotation(ErpLoginRequired.class)){
+                    try {
+                        //ERP 涓氬姟娉ㄨВ
+                        String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
+                        String redisToken = RedisUtil.getObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,String.class);
+                        if(StringUtils.isBlank(redisToken)||!token.equals(redisToken)){
+                            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈櫥褰�");
+                        }
+                        request.setAttribute(JwtTokenUtil.HEADER_KEY,token);
+                    } catch (IllegalArgumentException | JwtException e) {
                         throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
                     }
 //                    request.setAttribute("token", token);
@@ -68,7 +83,7 @@
                 return true;
             }
         };
-        registry.addInterceptor(TokenInterceptor).addPathPatterns("/web/**");
+        registry.addInterceptor(TokenInterceptor).addPathPatterns("/web/**","/visitbiz/**");
     }
 
 
@@ -82,7 +97,7 @@
                 throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
             }
             //鑾峰彇璐﹀彿ID
-            Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
+            String memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
             Integer isDeleted = dao.queryForObject(" select COALESCE(DELETED,1)  from `system_user` where id  = ?", Integer.class, memberId);
             if(isDeleted== Constants.ONE){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java b/server/dmvisit_service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java
new file mode 100644
index 0000000..971a6ff
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java
@@ -0,0 +1,10 @@
+package com.doumee.config.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD,ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ErpLoginRequired {}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
index 63ce885..5a0877b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
@@ -1,8 +1,12 @@
 package com.doumee.core.haikang.model.param;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @Data
 public class BaseRequst<T> {
     private T data;
+    @ApiModelProperty(hidden = true)
+    private String token;
 }
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
index 8afb6bf..9bdd2f0 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
@@ -1,5 +1,6 @@
 package com.doumee.core.model.openapi.request;
 
+import com.doumee.core.haikang.model.param.BaseRequst;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +11,7 @@
  */
 @Data
 @ApiModel("闂ㄧ鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
-public class CarEventListRequest {
+public class CarEventListRequest extends BaseRequst {
     @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
     private Integer eventId;
     @ApiModelProperty(value = "鍋滆溅搴撶紪鐮侊紙璁垮绔疘D锛�" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
index c675a66..5268119 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
@@ -1,5 +1,6 @@
 package com.doumee.core.model.openapi.request;
 
+import com.doumee.core.haikang.model.param.BaseRequst;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +11,7 @@
  */
 @Data
 @ApiModel("闂ㄧ鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
-public class DoorEventListRequest {
+public class DoorEventListRequest extends BaseRequst {
     @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
     private Integer eventId;
     @ApiModelProperty(value = "濮撳悕,鏀寔妯＄硦鍖归厤" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
index d648d12..206af61 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
@@ -1,5 +1,6 @@
 package com.doumee.core.model.openapi.request;
 
+import com.doumee.core.haikang.model.param.BaseRequst;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,20 +13,22 @@
  */
 @Data
 @ApiModel("缁勭粐淇℃伅鏇存柊璇锋眰淇℃伅")
-public class OrgUpdateRequest {
-    @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
-    private Integer id;
-    @ApiModelProperty(value = "鍚嶇О" )
+public class OrgUpdateRequest extends BaseRequst {
+    @ApiModelProperty(value = "鍞竴鏍囪瘑" ,required = true)
+    private String id;
+    @ApiModelProperty(value = "鍚嶇О" ,required = true)
     private String name;
+    @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜")
+    private String parentId;
     @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�",example = "0")
     private int isdeleted  ;
     @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤",example = "0")
     private int status  ;
-    @ApiModelProperty(value = "鏇存柊鏃堕棿,濡�2023-11-24 09:47:36")
+    @ApiModelProperty(value = "鏇存柊鏃堕棿,濡�2023-11-24 09:47:36",required = true)
     private Date editDate;
-    @ApiModelProperty(value = "鑱旂郴浜哄鍚�")
+    @ApiModelProperty(value = "鑱旂郴浜哄鍚�",required = true)
     private String linkName;
-    @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+    @ApiModelProperty(value = "鑱旂郴鐢佃瘽",required = true)
     private String linkPhone;
 
 }
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
index dc3b8bd..707073f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
@@ -1,5 +1,6 @@
 package com.doumee.core.model.openapi.request;
 
+import com.doumee.core.haikang.model.param.BaseRequst;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +11,7 @@
  */
 @Data
 @ApiModel("鍋滆溅搴撴帴鍙ｈ姹備俊鎭�")
-public class ParkListRequest {
+public class ParkListRequest extends BaseRequst {
     @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
     private Integer id;
     @ApiModelProperty(value = "鍚嶇О,鏀寔妯＄硦鍖归厤" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
index 79f3172..5735992 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
@@ -1,5 +1,6 @@
 package com.doumee.core.model.openapi.request;
 
+import com.doumee.core.haikang.model.param.BaseRequst;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,9 +12,10 @@
  */
 @Data
 @ApiModel("闂ㄧ缁勬帴鍙ｈ姹備俊鎭�")
-public class RoleListRequest {
+public class RoleListRequest extends BaseRequst {
     @ApiModelProperty(value = "闂ㄧ缁勫敮涓�鏍囪瘑" ,example = "1")
     private Integer id;
     @ApiModelProperty(value = "鍚嶇О,鏀寔妯＄硦鍖归厤" )
     private String name;
+
 }
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java
new file mode 100644
index 0000000..71dbbab
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java
@@ -0,0 +1,19 @@
+package com.doumee.core.model.openapi.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鍒嗙被淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("Token鑾峰彇绫�")
+public class TokenRequest {
+    @ApiModelProperty(value = "璁块棶key" ,example = "1")
+    private String accessKey;
+    @ApiModelProperty(value = "璁块棶绉橀挜" )
+    private String accessSecret;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
index 430c1e4..9e26308 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
@@ -1,5 +1,6 @@
 package com.doumee.core.model.openapi.request;
 
+import com.doumee.core.haikang.model.param.BaseRequst;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,16 +14,16 @@
  */
 @Data
 @ApiModel("浜哄憳淇℃伅鏇存柊璇锋眰淇℃伅")
-public class UserUpdateRequest {
-    @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
-    private Integer id;
-    @ApiModelProperty(value = "濮撳悕" )
+public class UserUpdateRequest extends BaseRequst {
+    @ApiModelProperty(value = "鍞竴鏍囪瘑" ,required = true)
+    private String id;
+    @ApiModelProperty(value = "濮撳悕"  ,required = true)
     private String name;
-    @ApiModelProperty(value = "璇佷欢鍙�" )
+    @ApiModelProperty(value = "璇佷欢鍙�"  ,required = true)
     private String idNo;
-    @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境閫氳璇� 2鎶ょ収 ,榛樿涓�0" ,example = "0")
+    @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境閫氳璇� 2鎶ょ収 ,榛樿涓�0"  ,required = true)
     private int idType;
-    @ApiModelProperty(value = "璁垮鎬у埆 1-鐢� 2-濂�" ,example = "1")
+    @ApiModelProperty(value = "璁垮鎬у埆 1-鐢� 2-濂�"  ,required = true)
     private Integer sex;
     @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�",example = "0")
     private int isdeleted  ;
@@ -30,11 +31,11 @@
     private int status  ;
     @ApiModelProperty(value = "鏇存柊鏃堕棿,濡�2023-11-24 09:47:36")
     private Date editDate;
-    @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�")
-    private String orgId;
-    @ApiModelProperty(value = "浜鸿劯鐓х墖鍦板潃")
+    @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�" ,required = true)
+    private Integer orgId;
+    @ApiModelProperty(value = "浜鸿劯鐓х墖鍦板潃" ,required = true)
     private String faceImg;
-    @ApiModelProperty(value = "宸ュ彿")
+    @ApiModelProperty(value = "宸ュ彿" ,required = true)
     private String code;
     @ApiModelProperty(value = "鎵嬫満鍙�" , required = true)
     private String phone;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
index 028486b..e476921 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
@@ -1,5 +1,6 @@
 package com.doumee.core.model.openapi.request;
 
+import com.doumee.core.haikang.model.param.BaseRequst;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +11,7 @@
  */
 @Data
 @ApiModel("璁垮鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
-public class VisitListRequest {
+public class VisitListRequest extends BaseRequst {
     @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
     private Integer eventId;
     @ApiModelProperty(value = "璁垮鍚嶇О,鏀寔妯＄硦鍖归厤" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
index c4cf71d..fcbcd76 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
@@ -62,19 +62,4 @@
     @ApiModelProperty(value = "瀛愬搧鐗屽勾娆�")
     private Integer subModel;
 
-    @ApiModelProperty(value = "浜哄憳绫诲瀷锛�0 鏈煡锛�1 鏅�氾紝2 鏉ュ锛�3 榛戝悕鍗曪紝4 绠＄悊鍛�",example = "1")
-    private Integer type;
-    @ApiModelProperty(value = "杩涘嚭绫诲瀷 1-杩� 0-鍑� -1:鏈煡",example = "1" )
-    private Integer eventInOut;
-    @ApiModelProperty(value = "浜哄憳閫氶亾鍙�" ,example = "1")
-    private Integer extAccessChannel;
-    @ApiModelProperty(value = "浜х敓鏃堕棿" )
-    private String createTime ;
-    @ApiModelProperty(value = "浜烘墜鏈哄彿" )
-    private String phone ;
-    @ApiModelProperty(value = "浜哄憳Id锛坋rp绔敤鎴风紪鐮侊級" )
-    private String userId ;
-    @ApiModelProperty(value = "鎵�灞炵粍缁嘔d(erp绔粍缁囩紪鐮�)" )
-    private String orgId	 ;
-
 }
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
index d28152d..f786218 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
@@ -17,7 +17,6 @@
     private Integer eventId;
     @ApiModelProperty(value = "浜嬩欢绫诲瀷 0-浜鸿劯璁よ瘉閫氳繃锛�196893锛� 1-鍒峰崱璁よ瘉閫氳繃锛�198915锛�" )
     private String eventType;
-
     @ApiModelProperty(value = "鎬у埆 1-鐢� 2-濂�" ,example = "1")
     private Integer sex;
     @ApiModelProperty(value = "璁惧鍚嶇О" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
index 51c7968..fce5f57 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
@@ -15,7 +15,7 @@
 
     @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
     private Integer id;
-    @ApiModelProperty(value = "" )
+    @ApiModelProperty(value = "鍚嶇О" )
     private String name;
     @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
     private Integer status;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 47a1f0e..73e6cc5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -50,7 +50,12 @@
     public static final String CAR_EVENT_IMG = "CAR_EVENT_IMG";
     public static final String DEVICE_EVENT_IMG = "DEVICE_EVENT_IMG";
     public static  boolean DEALING_HK_IMG = false;
-
+    // ERP鎺ュ彛閰嶇疆
+    public static final String ERP_CONFIG = "ERP_CONFIG";
+    // ERP ACCESS_KEY
+    public static final String ERP_ACCESS_KEY = "ERP_ACCESS_KEY";
+    // ERP ACCESS_SECRET
+    public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET";
 
     public static  Date  getBirthdyByCardNo(String idCard){
     if(idCard ==null || idCard.length()<14){
@@ -153,6 +158,7 @@
 
 
 
+
     public static final String WX_PLATFORM = "WX_PLATFORM";
     public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
     public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
@@ -164,6 +170,9 @@
 
 
     public interface RedisKeys {
+        public static final String ERP_TOKEN ="ERP_TOKEN";
+        public static final long EXPIRE_TIME = 7200;
+
         public static final String GOODSORDER_KEY = "ordercode_";
         public static final String ACTIVITY_SIGN_KEY = "actcode_";
         public static final String AFTERSALE_KEY = "salecode_";
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConfig.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConfig.java
new file mode 100644
index 0000000..e463111
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConfig.java
@@ -0,0 +1,61 @@
+package com.doumee.core.utils.redis;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * @author jiangping
+ * @date 2021-8-10 14:40:35
+ * redis閰嶇疆
+ */
+@Configuration
+public class RedisConfig {
+
+    @Bean
+    @SuppressWarnings("all")
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+        RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
+        template.setConnectionFactory(factory);
+        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+        ObjectMapper om = new ObjectMapper();
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
+        jackson2JsonRedisSerializer.setObjectMapper(om);
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+        // key閲囩敤String鐨勫簭鍒楀寲鏂瑰紡
+        template.setKeySerializer(stringRedisSerializer);
+        // hash鐨刱ey涔熼噰鐢⊿tring鐨勫簭鍒楀寲鏂瑰紡
+        template.setHashKeySerializer(stringRedisSerializer);
+        // value搴忓垪鍖栨柟寮忛噰鐢╦ackson
+        template.setValueSerializer(jackson2JsonRedisSerializer);
+        // hash鐨剉alue搴忓垪鍖栨柟寮忛噰鐢╦ackson
+        template.setHashValueSerializer(jackson2JsonRedisSerializer);
+        template.afterPropertiesSet();
+        return template;
+    }
+}
+/*@Configuration
+public class RedisConfig {
+
+    *//**
+     * @param factory
+     * @return 鑷畾涔塺edisTemplate锛岃嚜甯︾殑bean娌℃湁搴忓垪鍖栧櫒
+     *//*
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(factory);
+        redisTemplate.setKeySerializer(new StringRedisSerializer());//璁剧疆key鐨勫簭鍒楀寲鍣�
+        redisTemplate.setValueSerializer(new RedisConverter());//璁剧疆鍊肩殑搴忓垪鍖栧櫒
+        return redisTemplate;
+    }
+
+}*/
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConverter.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConverter.java
new file mode 100644
index 0000000..ff27fcd
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConverter.java
@@ -0,0 +1,38 @@
+package com.doumee.core.utils.redis;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.serializer.support.DeserializingConverter;
+import org.springframework.core.serializer.support.SerializingConverter;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+
+/**
+ * @author 褰紵
+ * @date 2018/8/28 9:31
+ */
+public class RedisConverter implements RedisSerializer<Object> {
+    private Converter<Object, byte[]> serializer = new SerializingConverter();//搴忓垪鍖栧櫒
+    private Converter<byte[], Object> deserializer = new DeserializingConverter();//鍙嶅簭鍒楀寲鍣�
+
+    @Override
+    public byte[] serialize(Object o) throws SerializationException {//灏嗗璞″簭鍒楀寲鎴愬瓧鑺傛暟缁�
+        if (o == null) return new byte[0];
+        try {
+            return serializer.convert(o);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new byte[0];
+        }
+    }
+
+    @Override
+    public Object deserialize(byte[] bytes) throws SerializationException {//灏嗗瓧鑺傛暟缁勫弽搴忓垪鍖栨垚瀵硅薄
+        if (bytes == null || bytes.length == 0) return null;
+        try {
+            return deserializer.convert(bytes);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisUtil.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisUtil.java
new file mode 100644
index 0000000..28d5cb9
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisUtil.java
@@ -0,0 +1,86 @@
+package com.doumee.core.utils.redis;
+
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.concurrent.TimeUnit;
+
+public class RedisUtil {
+    /**
+     * 娣诲姞涓�涓猇alue涓篠tring
+     * @param stringRedisTemplate
+     * @param key
+     * @param str
+     */
+    public static void addString( StringRedisTemplate stringRedisTemplate, String key, String str) {
+        //1,娣诲姞涓�涓猇alue涓篠tring
+        stringRedisTemplate.opsForValue().set(key, str);
+
+    }
+
+    /**
+     * 鏍规嵁key鍒犻櫎瀛楃涓茬紦瀛�
+     * @param stringRedisTemplate
+     * @param key
+     */
+    public static void delString( StringRedisTemplate stringRedisTemplate, String key ) {
+        //1,娣诲姞涓�涓猇alue涓篠tring
+        stringRedisTemplate.delete(key);
+
+    }
+
+    /**
+     * 鏍规嵁key鍒犻櫎瀵硅薄鏁版嵁
+     * @param redisTemplate
+     * @param key
+     */
+    public static void deleteObject( RedisTemplate<String, Object> redisTemplate  , String key ) {
+
+        redisTemplate.delete(key);
+
+    }
+    /**
+     * 娣诲姞涓�涓猇alue涓哄璞�
+     * @param redisTemplate
+     * @param key
+     * @param obj
+     */
+    public static void addObject(RedisTemplate<String, Object> redisTemplate  , String key, Object obj) {
+        redisTemplate.opsForValue().set(key, obj);
+    }
+    /**
+     * 娣诲姞涓�涓猇alue涓哄璞�
+     * @param redisTemplate
+     * @param key
+     * @param obj
+     */
+    public static void addObject(RedisTemplate<String, Object> redisTemplate  , String key, Object obj,long time) {
+//        redisTemplate.opsForValue().set(key, obj);
+        redisTemplate.opsForValue().set(key,obj,time, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 鏍规嵁鍙傛暟瀵硅薄绫诲瀷锛岃繑鍥炵浉搴旂紦瀛樺璞℃暟鎹�
+     * @param stringRedisTemplate
+     * @param key
+     * @return
+     */
+    public static String getString(StringRedisTemplate stringRedisTemplate, String key){
+       String val = stringRedisTemplate.opsForValue().get(key);
+        return val;
+    }
+
+    /**
+     * 鏍规嵁鍙傛暟瀵硅薄绫诲瀷锛岃繑鍥炵浉搴旂紦瀛樺璞℃暟鎹�
+     * @param redisTemplate
+     * @param key
+     * @param clazz
+     * @param <T>
+     * @return
+     */
+    public static <T> T getObject(RedisTemplate<String, Object> redisTemplate  , String key,Class<T> clazz){
+        T t = (T) redisTemplate.opsForValue().get(key);
+        return t;
+    }
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index d947c43..c69f152 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -114,6 +114,7 @@
     @ApiModelProperty(value = "ERP鏍囪瘑")
     @ExcelColumn(name="ERP鏍囪瘑")
     private String erpId;
+
     @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
     @ExcelColumn(name="璐熻矗浜虹紪鐮�")
     private String headId;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 922f31e..de1a53f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -152,7 +152,7 @@
 
     @ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
     @ExcelColumn(name="ERP鏍囪瘑")
-    private Integer erpId;
+    private String erpId;
 
     @ApiModelProperty(value = "ERP鍚屾鏃堕棿")
     @ExcelColumn(name="ERP鍚屾鏃堕棿")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
index 62ec5a3..06d371a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
@@ -2,6 +2,8 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.RoleListRequest;
+import com.doumee.core.model.openapi.response.RoleListResponse;
 import com.doumee.dao.business.model.DeviceRole;
 import com.doumee.dao.web.response.DeviceRoleVO;
 
@@ -108,4 +110,6 @@
 
 
     List<DeviceRoleVO> findListByType(Integer type);
+
+
 }
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
index 83bdbc4..37bc20f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
@@ -1,11 +1,16 @@
 package com.doumee.service.business;
 
 import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
-import com.doumee.core.haikang.model.param.request.ParkListRequest;
 import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.*;
 import com.doumee.core.model.openapi.request.erp.OrgListRequest;
 import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
 import com.doumee.core.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.model.openapi.response.*;
+
+import java.util.List;
 
 /**
  * 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹氫箟
@@ -34,4 +39,54 @@
      * @return
      */
     String syncUserInfo(UserInfoRequest param);
+
+
+    /**
+     * 鍒涘缓ERP璁块棶浠ょ墝
+     * @param accessKey
+     * @param accessSecret
+     * @return
+     */
+    AccessTokenResponse createERPToken(String accessKey, String accessSecret);
+
+
+    /**
+     * 闂ㄧ缁勫叏閲忔帴鍙�
+     * @param param
+     * @return
+     */
+    List<RoleListResponse> erpQueryDeviceList(RoleListRequest param);
+
+    /**
+     * 鍋滆溅鍦哄叏閲忎俊鎭帴鍙�
+     * @param param
+     * @return
+     */
+    List<ParkListResponse> parkList(ParkListRequest param);
+
+    /**
+     * 璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛
+     * @param param
+     * @return
+     */
+    PageData<VisitEventListResponse> visitListPage(PageWrap<VisitListRequest> param);
+
+
+    /**
+     * 闂ㄧ鍑哄叆浜嬩欢鍚屾鎺ュ彛
+     * @param param
+     * @return
+     */
+    PageData<DoorEventListResponse> doorEventListPage(PageWrap<DoorEventListRequest> param);
+
+    /**
+     * 杞﹁締鍑哄叆浜嬩欢鍚屾鎺ュ彛
+     * @param param
+     * @return
+     */
+    PageData<CarEventListResponse> carEventList(PageWrap<CarEventListRequest> param);
+
+    void orgUpdate(OrgUpdateRequest param);
+
+    void userUpdate(UserUpdateRequest param);
 }
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index f3bd2d6..55b51c1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.response.AccessTokenResponse;
 import com.doumee.dao.admin.request.LaborEmpowerDTO;
 import com.doumee.dao.admin.request.LaborMemberDTO;
 import com.doumee.dao.admin.request.MemberQuery;
@@ -166,7 +167,6 @@
 
 
     MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
-
 
 
 
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 7449ddc..a5b0b7d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -5,8 +5,12 @@
 import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.RoleListRequest;
+import com.doumee.core.model.openapi.response.DeviceListResponse;
+import com.doumee.core.model.openapi.response.RoleListResponse;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.DeviceMapper;
 import com.doumee.dao.business.DeviceRoleMapper;
 import com.doumee.dao.business.model.Device;
 import com.doumee.dao.business.model.DeviceRole;
@@ -16,17 +20,19 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.models.auth.In;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 闂ㄧ瑙掕壊淇℃伅琛⊿ervice瀹炵幇
@@ -38,6 +44,7 @@
 
     @Autowired
     private DeviceRoleMapper deviceRoleMapper;
+
 
     @Override
     public Integer create(DeviceRole deviceRole) {
@@ -248,4 +255,9 @@
     }
 
 
+
+
+
+
+
 }
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 ee3c8b9..9429df2 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
@@ -1,23 +1,56 @@
 package com.doumee.service.business.impl.erp;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.Jwt.JwtPayLoad;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
 import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
 import com.doumee.core.haikang.model.param.request.DoorsListRequest;
-import com.doumee.core.haikang.model.param.request.ParkListRequest;
 import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
 import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
 import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
 import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.*;
 import com.doumee.core.model.openapi.request.erp.OrgListRequest;
 import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
 import com.doumee.core.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.model.openapi.response.*;
 import com.doumee.core.model.openapi.response.erp.OrgListRespone;
-import com.doumee.service.business.ERPSyncService;
-import com.doumee.service.business.HkSyncService;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DESUtil;
+import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.redis.RedisUtil;
+import com.doumee.dao.admin.response.MemberInfoDTO;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.CarEventJoinMapper;
+import com.doumee.dao.business.join.DeviceEventJoinMapper;
+import com.doumee.dao.business.join.VisitEventJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.web.reqeust.CheckVisitedDTO;
+import com.doumee.dao.web.response.MemberVO;
+import com.doumee.service.business.*;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 璁惧淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +59,49 @@
  */
 @Service
 public class ErpSyncServiceImpl implements ERPSyncService {
+
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
+    @Autowired
+    private DeviceRoleMapper deviceRoleMapper;
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+    @Autowired
+    private ParksMapper parksMapper;
+
+    @Autowired
+    private VisitEventMapper visitEventMapper;
+
+
+    @Autowired
+    private VisitEventJoinMapper visitEventJoinMapper;
+
+    @Autowired
+    private DeviceEventJoinMapper deviceEventJoinMapper;
+
+    @Autowired
+    private CarEventJoinMapper carEventJoinMapper;
+
+    @Autowired
+    private CompanyMapper companyMapper;
+
+    @Autowired
+    private MemberMapper memberMapper;
+    
+    @Autowired
+    private MemberRoleMapper memberRoleMapper;
+
+    @Autowired
+    private MemberCardMapper memberCardMapper;
+
+    @Autowired
+    private InterfaceLogService interfaceLogService;
 
     /**
      * 鍚屾ERP缁勭粐淇℃伅
@@ -58,4 +134,422 @@
     public  String syncUserInfo(UserInfoRequest param){
         return  null;
     }
+
+
+    @Override
+    public AccessTokenResponse createERPToken(String accessKey, String accessSecret){
+        AccessTokenResponse result = new AccessTokenResponse();
+        try{
+            String erpAccessKey = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_KEY).getCode();
+            String erpAccessSecret = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_SECRET).getCode();
+            if(!accessKey.equals(erpAccessKey)||!erpAccessSecret.equals(accessSecret)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绉橀挜鍖归厤澶辫触");
+            }
+            JwtPayLoad payLoad = new JwtPayLoad(erpAccessKey+"-"+erpAccessSecret);
+            String token = JwtTokenUtil.generateToken(payLoad);
+            RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,token,Constants.RedisKeys.EXPIRE_TIME);
+            result.setToken(token);
+            result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
+        }catch (Exception e){
+
+        }finally {
+            Map<String,String> param = new HashMap<>();
+            param.put("accessKey",accessKey);
+            param.put("accessSecret",accessSecret);
+            saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
+        }
+
+
+        return result;
+    }
+
+    /**
+     * 闂ㄧ缁勫叏閲忔帴鍙�
+     * @param param
+     * @return
+     */
+    @Override
+    public List<RoleListResponse> erpQueryDeviceList(RoleListRequest param){
+        List<RoleListResponse> result = new ArrayList<>();
+        try{
+           List<DeviceRole> deviceRoleList = this.deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+                   .eq(DeviceRole::getIsdeleted,Constants.ZERO)
+                   .eq(!Objects.isNull(param.getId()),DeviceRole::getId,param.getId())
+                   .like(StringUtils.isNotBlank(param.getName()),DeviceRole::getName,param.getName())
+                   .orderByAsc(DeviceRole::getCreateDate)
+           );
+           List<String> roleIds = new ArrayList<String>();
+           if(CollectionUtils.isNotEmpty(deviceRoleList)){
+               for (DeviceRole deviceRole:deviceRoleList) {
+                   if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
+                       List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
+                       roleIds.addAll(doorList);
+                   }
+               }
+               if(CollectionUtils.isNotEmpty(roleIds)){
+                   List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,roleIds));
+                   for (DeviceRole deviceRole:deviceRoleList) {
+                       RoleListResponse roleListResponse = new RoleListResponse();
+                       BeanUtils.copyProperties(deviceRole,roleListResponse);
+                       if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
+                           List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
+                           List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
+                           List<Device> roleDeviceList = deviceList.stream().filter(m-> doorList.contains(m.getId().toString())).collect(Collectors.toList());
+                           for (Device device:roleDeviceList) {
+                               DeviceListResponse deviceListResponse = new DeviceListResponse();
+                               BeanUtils.copyProperties(device,deviceListResponse);
+                               DeviceListResponseList.add(deviceListResponse);
+                           }
+                           roleListResponse.setDeviceList(DeviceListResponseList);
+                       }
+                       result.add(roleListResponse);
+                   }
+               }
+           }
+       }catch (Exception e){
+           e.printStackTrace();
+       }finally {
+           saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO);
+       }
+       return result;
+    }
+
+
+
+
+    /**
+     * 鍋滆溅鍦哄叏閲忎俊鎭帴鍙�
+     * @param param
+     * @return
+     */
+    @Override
+    public List<ParkListResponse> parkList(ParkListRequest param){
+        List<ParkListResponse> result = new ArrayList<>();
+        try{
+            List<Parks> parksList = this.parksMapper.selectList(new QueryWrapper<Parks>().lambda()
+                    .eq(Parks::getIsdeleted,Constants.ZERO)
+                    .eq(!Objects.isNull(param.getId()),Parks::getId,param.getId())
+                    .like(StringUtils.isNotBlank(param.getName()),Parks::getName,param.getName())
+            );
+            if(CollectionUtils.isNotEmpty(parksList)){
+                for (Parks parks:parksList) {
+                    ParkListResponse parkListResponse = new ParkListResponse();
+                    BeanUtils.copyProperties(parks,parkListResponse);
+                    result.add(parkListResponse);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO);
+        }
+        return result;
+    }
+
+    /**
+     * 璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛
+     * @param param
+     * @return
+     */
+    @Override
+    public PageData<VisitEventListResponse> visitListPage(PageWrap<VisitListRequest> param) {
+        PageData<VisitEventListResponse> result = new PageData<>();
+        try{
+            VisitListRequest visitListRequest = param.getModel();
+            IPage<VisitEvent> page = new Page<>(param.getPage(), param.getCapacity());
+            MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
+            Utils.MP.blankToNull(visitListRequest);
+
+            queryWrapper.selectAll(VisitEvent.class);
+            queryWrapper.selectAs(Visits::getName, VisitEventListResponse::getVisitorName);
+            queryWrapper.leftJoin(Visits.class,Visits::getId,VisitEvent::getVisitorId);
+
+            if(!Objects.isNull(visitListRequest)){
+                queryWrapper.eq(!Objects.isNull(visitListRequest.getEventId()),VisitEvent::getEventId, visitListRequest.getEventId());
+                queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorName()),Visits::getName, visitListRequest.getVisitorName());
+                queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),VisitEvent::getIdNo, visitListRequest.getIdNo());
+                queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonId()),VisitEvent::getBeVisitedPersonId, visitListRequest.getBeVisitedPersonId());
+                queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonOrgId()),VisitEvent::getBeVisitedPersonOrgId, visitListRequest.getBeVisitedPersonOrgId());
+                queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorWorkUint()),VisitEvent::getVisitorWorkUint, visitListRequest.getVisitorWorkUint());
+                queryWrapper.ge(StringUtils.isNotBlank(visitListRequest.getInStartTime()),VisitEvent::getStartTime, visitListRequest.getInStartTime());
+                queryWrapper.le(StringUtils.isNotBlank(visitListRequest.getInEndTime()),VisitEvent::getStartTime, visitListRequest.getInEndTime());
+                queryWrapper.ge(StringUtils.isNotBlank(visitListRequest.getOutStartTime()),VisitEvent::getEndTime, visitListRequest.getOutStartTime());
+                queryWrapper.le(StringUtils.isNotBlank(visitListRequest.getOutEndTime()),VisitEvent::getEndTime, visitListRequest.getOutEndTime());
+
+                for(PageWrap.SortData sortData: param.getSorts()) {
+                    if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+                        queryWrapper.orderByDesc(sortData.getProperty());
+                    } else {
+                        queryWrapper.orderByAsc(sortData.getProperty());
+                    }
+                }
+            }
+            IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper);
+            result = PageData.from(pageData);
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO);
+        }
+        return result;
+    }
+
+
+    @Override
+    public PageData<DoorEventListResponse> doorEventListPage(PageWrap<DoorEventListRequest> param) {
+        PageData<DoorEventListResponse> result = new PageData<>();
+        try{
+            DoorEventListRequest doorEventListRequest = param.getModel();
+            IPage<DeviceEvent> page = new Page<>(param.getPage(), param.getCapacity());
+            MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
+            Utils.MP.blankToNull(doorEventListRequest);
+            queryWrapper.selectAs(DeviceEvent::getEventId,DoorEventListResponse::getEventId);
+            queryWrapper.selectAs(DeviceEvent::getEventType,DoorEventListResponse::getEventType);
+            queryWrapper.selectAs(DeviceEvent::getSex,DoorEventListResponse::getSex);
+            queryWrapper.selectAs(DeviceEvent::getSrcName,DoorEventListResponse::getSrcName);
+            queryWrapper.selectAs(DeviceEvent::getSrcType,DoorEventListResponse::getSrcType);
+            queryWrapper.selectAs(DeviceEvent::getIdcardDecode,DoorEventListResponse::getIdcardNo);
+            queryWrapper.selectAs(DeviceEvent::getName,DoorEventListResponse::getName);
+            queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
+            queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
+            queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
+            queryWrapper.selectAs(DeviceEvent::getCreateDate,DoorEventListResponse::getCreateTime);
+            queryWrapper.selectAs(Member::getPhone,DoorEventListResponse::getPhone);
+            queryWrapper.selectAs(Member::getErpId,DoorEventListResponse::getUserId);
+            queryWrapper.selectAs(Member::getCompanyId,DoorEventListResponse::getOrgId);
+            queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo);
+
+            if(!Objects.isNull(doorEventListRequest)){
+                queryWrapper.eq(!Objects.isNull(doorEventListRequest.getEventId()),DeviceEvent::getEventId, doorEventListRequest.getEventId());
+                queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),DeviceEvent::getName, doorEventListRequest.getName());
+                if(StringUtils.isNotBlank(doorEventListRequest.getIdNo())){
+                    //杩涜鍔犲瘑
+                    String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,doorEventListRequest.getIdNo());
+                    queryWrapper.eq(DeviceEvent::getIdNum, encryptIdNo);
+                }
+                queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getHappenTime, doorEventListRequest.getStartTime());
+                queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getHappenTime, doorEventListRequest.getEndTime());
+                for(PageWrap.SortData sortData: param.getSorts()) {
+                    if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+                        queryWrapper.orderByDesc(sortData.getProperty());
+                    } else {
+                        queryWrapper.orderByAsc(sortData.getProperty());
+                    }
+                }
+            }
+
+            IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper);
+            result = PageData.from(pageData);
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO);
+        }
+        return result;
+    }
+
+
+    @Override
+    public PageData<CarEventListResponse> carEventList(PageWrap<CarEventListRequest> param) {
+        PageData<CarEventListResponse> result = new PageData<>();
+        try{
+            CarEventListRequest carEventListRequest = param.getModel();
+            IPage<CarEvent> page = new Page<>(param.getPage(), param.getCapacity());
+            MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
+            Utils.MP.blankToNull(carEventListRequest);
+            queryWrapper.selectAs(CarEvent::getEventId,CarEventListResponse::getEventId);
+            queryWrapper.selectAs(CarEvent::getEventType,CarEventListResponse::getEventType);
+            queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getEventType);
+            queryWrapper.selectAs(CarEvent::getAlarmCar,CarEventListResponse::getAlarmCar);
+            queryWrapper.selectAs(CarEvent::getCarAttributeName,CarEventListResponse::getCarAttributeName);
+            queryWrapper.selectAs(CarEvent::getCardNo,CarEventListResponse::getCardNo);
+            queryWrapper.selectAs(CarEvent::getEventCmd,CarEventListResponse::getEventCmd);
+            queryWrapper.selectAs(CarEvent::getGateIndex,CarEventListResponse::getGateIndex);
+            queryWrapper.selectAs(CarEvent::getGateName,CarEventListResponse::getGateName);
+            queryWrapper.selectAs(CarEvent::getMainLogo,CarEventListResponse::getMainLogo);
+            queryWrapper.selectAs(CarEvent::getParkIndex,CarEventListResponse::getParkId);
+            queryWrapper.selectAs(CarEvent::getParkName,CarEventListResponse::getParkName);
+            queryWrapper.selectAs(CarEvent::getPlatePicUrl,CarEventListResponse::getPlatePicUrl);
+            queryWrapper.selectAs(CarEvent::getVehiclePicUrl,CarEventListResponse::getVehiclePicUrl);
+            queryWrapper.selectAs(CarEvent::getPlateNos,CarEventListResponse::getPlateNo);
+            queryWrapper.selectAs(CarEvent::getPlateColor,CarEventListResponse::getPlateColor);
+            queryWrapper.selectAs(CarEvent::getRoadwayName,CarEventListResponse::getRoadwayName);
+            queryWrapper.selectAs(CarEvent::getRoadwayType,CarEventListResponse::getRoadwayType);
+            queryWrapper.selectAs(CarEvent::getSubLogo,CarEventListResponse::getSubLogo);
+            queryWrapper.selectAs(CarEvent::getSubModel,CarEventListResponse::getSubModel);
+
+            if(!Objects.isNull(carEventListRequest)){
+                queryWrapper.eq(!Objects.isNull(carEventListRequest.getEventId()),CarEvent::getEventId, carEventListRequest.getEventId());
+                queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getParkId()),CarEvent::getParkIndex, carEventListRequest.getParkId());
+                queryWrapper.like(StringUtils.isNotBlank(carEventListRequest.getParkName()),CarEvent::getParkName, carEventListRequest.getParkName());
+                queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getPlateNo()),CarEvent::getPlateNos, carEventListRequest.getPlateNo());
+                queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getHappenTime, carEventListRequest.getStartTime());
+                queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getHappenTime, carEventListRequest.getEndTime());
+                for(PageWrap.SortData sortData: param.getSorts()) {
+                    if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+                        queryWrapper.orderByDesc(sortData.getProperty());
+                    } else {
+                        queryWrapper.orderByAsc(sortData.getProperty());
+                    }
+                }
+            }
+            IPage<CarEventListResponse> pageData = carEventJoinMapper.selectJoinPage(page, CarEventListResponse.class,queryWrapper);
+            result = PageData.from(pageData);
+            result.getRecords().forEach(i->{
+                if(i.getPlatePicUrl().startsWith(HKConstants.IMG_INDEX)){
+                    i.setPlatePicUrl(null);
+                }
+                if(i.getVehiclePicUrl().startsWith(HKConstants.IMG_INDEX)){
+                    i.setVehiclePicUrl(null);
+                }
+            });
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
+        }
+
+        return  result;
+    }
+
+
+
+
+    @Override
+    public void orgUpdate(OrgUpdateRequest param){
+        try{
+            if(Objects.isNull(param)
+                    ||Objects.isNull(param.getId())
+                    ||StringUtils.isBlank(param.getName())
+                    ||StringUtils.isBlank(param.getLinkName())
+                    ||StringUtils.isBlank(param.getLinkPhone())
+                    ||Objects.isNull(param.getEditDate())
+            ){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST);
+            }
+            Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getId()).last("limit 1"));
+            if(Objects.isNull(company)){
+                company = new Company();
+                BeanUtils.copyProperties(param,company);
+                company.setId(null);
+                company.setCreateDate(new Date());
+                company.setHkStatus(Constants.ZERO);
+                company.setErpStatus(Constants.ONE);
+                company.setErpDate(new Date());
+                company.setErpId(param.getId());
+                company.setFsStatus(Constants.ZERO);
+                company.setType(Constants.ONE);
+                companyMapper.insert(company);
+                //TODO 娴峰悍鏁版嵁鍒涘缓
+            }else{
+                BeanUtils.copyProperties(param,company);
+                company.setEditDate(new Date());
+                company.setErpDate(new Date());
+                companyMapper.updateById(company);
+                //TODO 娴峰悍鏁版嵁鏇存柊
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            saveInterfaceLog(param,"/visitBiz/resource/orgUpdate",null,Constants.ZERO);
+        }
+    }
+
+
+
+    @Override
+    public void userUpdate(UserUpdateRequest param){
+        try{
+            if(Objects.isNull(param)
+                    ||Objects.isNull(param.getId())
+                    ||StringUtils.isBlank(param.getName())
+                    ||StringUtils.isBlank(param.getIdNo())
+                    ||Objects.isNull(param.getIdType())
+                    ||Objects.isNull(param.getSex())
+                    ||Objects.isNull(param.getOrgId())
+                    ||StringUtils.isNotBlank(param.getFaceImg())
+                    ||StringUtils.isNotBlank(param.getCode())
+                    ||StringUtils.isNotBlank(param.getPhone())
+                    ||Objects.isNull(param.getEditDate())
+            ){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST);
+            }
+            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
+            if(Objects.isNull(member)){
+                member = new Member();
+                BeanUtils.copyProperties(param,member);
+                member.setCreateDate(new Date());
+                member.setHkStatus(Constants.ZERO);
+                member.setErpStatus(Constants.ONE);
+                member.setErpDate(new Date());
+                member.setErpId(param.getId());
+                member.setFsStatus(Constants.ZERO);
+                member.setType(Constants.memberType.internal);
+                String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
+                member.setIdcardNo(encryptIdNo);
+                member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
+                member.setCompanyId(param.getOrgId());
+                memberMapper.insert(member);
+
+                //TODO 娴峰悍鏁版嵁鍒涘缓
+            }else{
+                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.setEditDate(new Date());
+                member.setErpDate(new Date());
+                memberMapper.updateById(member);
+                //鍒犻櫎鐢ㄦ埛鍗＄墖鏁版嵁  浜哄憳瑙掕壊鍏宠仈
+                memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
+                memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+                //TODO 娴峰悍鏁版嵁鏇存柊
+            }
+            //娣诲姞浜哄憳瑙掑叧鑱旀暟鎹�
+            if(!Objects.isNull(param.getRoleIds())&&param.getRoleIds().length>Constants.ZERO){
+                //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
+                List<MemberRole> memberRoleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getId,param.getRoleIds()));
+                List<Integer> roleIds = Arrays.asList(param.getRoleIds());
+
+//                List<MemberRole> memberRoleList = new ArrayList<>();
+//
+//                for (Integer id:roleIds) {
+//
+//                }
+
+
+
+
+            }
+            
+            
+            
+            
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO);
+        }
+    }
+
+
+
+
+
+    private void saveInterfaceLog(Object param, String path,String result,Integer type) {
+        InterfaceLog interfaceLog=new InterfaceLog();
+        interfaceLog.setType(type);
+        interfaceLog.setCreateDate(new Date());
+        interfaceLog.setIsdeleted(Constants.ZERO);
+        if(param!=null){
+            interfaceLog.setRequest(JSONObject.toJSONString(param));
+        }
+        interfaceLog.setPlat(Constants.ONE);
+        interfaceLog.setRepose(result);
+        interfaceLog.setName(path);
+        interfaceLog.setUrl(path);
+        interfaceLogService.create(interfaceLog);
+    }
+
 }
diff --git a/server/openapi/src/main/java/com/doumee/api/web/ApiController.java b/server/openapi/src/main/java/com/doumee/api/web/ApiController.java
index b4b2a20..ecceb79 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/ApiController.java
@@ -1,5 +1,6 @@
 package com.doumee.api.web;
 
+import com.doumee.config.Jwt.JwtTokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -25,4 +26,10 @@
         return request;
     }
 
+    protected String getToken() {
+        Object obj = this.getRequest().getAttribute(JwtTokenUtil.HEADER_KEY);
+        return obj != null ? obj.toString() : null;
+    }
+
+
 }
diff --git a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
index a6d2a65..c0c9384 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
@@ -1,17 +1,30 @@
 package com.doumee.api.web;
 
+import com.doumee.config.Jwt.JwtPayLoad;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.config.annotation.ErpLoginRequired;
+import com.doumee.config.annotation.LoginRequired;
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.model.openapi.request.*;
 import com.doumee.core.model.openapi.response.*;
+import com.doumee.core.utils.Constants;
+import com.doumee.service.business.DeviceRoleService;
+import com.doumee.service.business.DeviceService;
+import com.doumee.service.business.ERPSyncService;
+import com.doumee.service.business.MemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,9 +37,13 @@
 
 @Api(tags = "1銆併�愯瀹㈢銆戞暟鎹祫婧愭帴鍙ｏ紙鍚慐RP绔彁渚涙垨鎻愪氦鏁版嵁淇℃伅锛�")
 @RestController
-@RequestMapping("/visitbiz/resource")
+@RequestMapping("/visitbiz")
 @Slf4j
 public class BizResourceController extends ApiController{
+
+    @Autowired
+    private ERPSyncService erpSyncService;
+
 
     @ApiOperation(value = "璋冪敤鍑嵁鑾峰彇鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝鍚慐RP鎻愪緵缁熸帴鍙ｈ皟鐢ㄥ嚟璇�")
     @GetMapping("/accesstoken")
@@ -34,16 +51,19 @@
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "accessKey", value = "璁块棶key锛岀敱璁垮绔彁渚�", required = true),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "accessSecret", value = "璁块棶绉橀挜锛岀敱璁垮绔彁渚�", required = true)
     })
-    public ApiResponse<AccessTokenResponse> roleList(@RequestParam  String accessKey, @RequestParam  String accessSecret) {
-        return  ApiResponse.success(new AccessTokenResponse());
+    public ApiResponse<AccessTokenResponse> accesstoken(@RequestParam  String accessKey, @RequestParam  String accessSecret) {
+        return  ApiResponse.success(erpSyncService.createERPToken(accessKey,accessSecret));
     }
+
+    @ErpLoginRequired
     @ApiOperation(value = "闂ㄧ缁勫叏閲忔帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔悓姝ヨ幏鍙栭棬绂佺粍鍏ㄩ噺淇℃伅")
     @PostMapping("/resource/role/list")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
     })
     public ApiResponse<List<RoleListResponse>> roleList(@RequestBody RoleListRequest param) {
-        return  ApiResponse.success(new ArrayList<RoleListResponse>());
+        param.setToken(this.getToken());
+        return  ApiResponse.success(erpSyncService.erpQueryDeviceList(param));
     }
 
     @ApiOperation(value = "鍋滆溅鍦哄叏閲忎俊鎭帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔悓姝ュ叏閮ㄥ仠杞﹀満鏁版嵁")
@@ -51,8 +71,9 @@
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
     })
-    public ApiResponse<ParkListResponse> parkList(@RequestBody ParkListRequest param) {
-        return  ApiResponse.success(new ParkListResponse());
+    public ApiResponse<List<ParkListResponse>> parkList(@RequestBody ParkListRequest param) {
+        param.setToken(this.getToken());
+        return  ApiResponse.success(erpSyncService.parkList(param));
     }
 
     @ApiOperation(value = "璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬瀹㈠嚭鍏ヨ褰曚俊鎭�")
@@ -61,40 +82,52 @@
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
     })
     public ApiResponse<PageData<VisitEventListResponse>> visitList (@RequestBody PageWrap<VisitListRequest> pageWrap) {
-        return ApiResponse.success(null);
+        pageWrap.getModel().setToken(this.getToken());
+        return ApiResponse.success(erpSyncService.visitListPage(pageWrap));
     }
+
     @ApiOperation(value = "闂ㄧ鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栭棬绂佸嚭鍏ヨ褰曚俊鎭�")
     @PostMapping("/resource/doorEvent/list")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
     })
     public ApiResponse<PageData<DoorEventListResponse>> doorEventList (@RequestBody PageWrap<DoorEventListRequest> pageWrap) {
-        return ApiResponse.success(null);
+        pageWrap.getModel().setToken(this.getToken());
+        return ApiResponse.success(erpSyncService.doorEventListPage(pageWrap));
     }
+
     @ApiOperation(value = "杞﹁締鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬溅杈嗗嚭鍏ヨ褰曚俊鎭�")
     @PostMapping("/resource/carvisit/list")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
     })
-    public ApiResponse<PageData<CarEventListResponse>> carEventList (@RequestBody PageWrap<CarEventListResponse> pageWrap) {
-        return ApiResponse.success(null);
+    public ApiResponse<PageData<CarEventListResponse>> carEventList (@RequestBody PageWrap<CarEventListRequest> pageWrap) {
+        pageWrap.getModel().setToken(this.getToken());
+        return ApiResponse.success(erpSyncService.carEventList(pageWrap));
     }
+
     @ApiOperation(value = "缁勭粐鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔粍缁囦俊鎭悓姝ワ紝璇ユ帴鍙ｆ敮鎸佸崟涓粍缁囨柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
     @PostMapping("/event/org/update")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
     })
     public ApiResponse orgUpdate(@RequestBody OrgUpdateRequest param) {
+        param.setToken(this.getToken());
+        erpSyncService.orgUpdate(param);
         return  ApiResponse.success(null);
     }
+
     @ApiOperation(value = "浜哄憳鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔汉鍛樹俊鎭悓姝ワ紝璇ユ帴鍙ｆ敮鎸佸崟涓汉鍛樻柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
     @PostMapping("/event/user/update")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
     })
     public ApiResponse userUpdate(@RequestBody UserUpdateRequest param) {
+        param.setToken(this.getToken());
+        erpSyncService.userUpdate(param);
         return  ApiResponse.success(null);
     }
+
     @ApiOperation(value = "浜哄憳闂ㄧ缁勬巿鏉冩帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝璁垮绔汉鍛樺悓姝ラ棬绂佺粍鎺堟潈淇℃伅锛岃鎺ュ彛鏀寔浜哄憳闂ㄧ缁勬巿鏉冩柊澧炪�佹洿鏂般�佹竻绌洪渶姹傘��")
     @PostMapping("/event/role/userAuthor")
     @ApiImplicitParams({
@@ -103,6 +136,7 @@
     public ApiResponse roleUserAuthor(@RequestBody UserAuthorRequest param) {
         return  ApiResponse.success(null);
     }
+
     @ApiOperation(value = "杞﹁締鎺堟潈鍋滆溅鍦烘帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝璁垮绔悓姝ヨ溅杈嗗鍋滆溅鍦虹殑浣跨敤鏉冮檺锛岃鎺ュ彛鏀寔杞﹁締缁戝畾銆佽В缁戝綊灞炰汉锛屾敮鎸佹柊澧炪�佹洿鏂般�佹竻绌鸿溅杈嗘巿鏉冧俊鎭�")
     @PostMapping("/event/park/carAuthor")
     @ApiImplicitParams({
@@ -111,6 +145,7 @@
     public ApiResponse parkCarAuthor(@RequestBody CarAuthorRequest param) {
         return  ApiResponse.success(null);
     }
+
     @ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉閫氱煡鎺ュ彛", notes = "璁垮绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇峰鎵圭殑缁撴灉")
     @PostMapping("/event/approve/notice")
     @ApiImplicitParams({

--
Gitblit v1.9.3