From 8ac25fa49c0fbe3fef01104d353b93062cc2ba87 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 06 十二月 2023 11:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
.idea/libraries/Maven__io_netty_netty_handler_4_1_45_Final.xml | 13 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserInfoRequest.java | 4
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/VisitEventListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java | 4
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/OrgListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/RoleListResponse.java | 3
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java | 2
.idea/libraries/Maven__io_netty_netty_transport_4_1_45_Final.xml | 13 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/AccessTokenResponse.java | 21 +++
.idea/libraries/Maven__org_springframework_spring_context_support_5_2_4_RELEASE.xml | 13 +
.idea/libraries/Maven__org_springframework_spring_oxm_5_2_4_RELEASE.xml | 13 +
.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_5_RELEASE.xml | 13 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java | 2
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 15 +-
.idea/libraries/Maven__io_netty_netty_codec_4_1_45_Final.xml | 13 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java | 2
.idea/libraries/Maven__io_netty_netty_buffer_4_1_45_Final.xml | 13 +
.idea/libraries/Maven__io_netty_netty_common_4_1_45_Final.xml | 13 +
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_5_RELEASE.xml | 13 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java | 59 ++++++++
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarAuthorRequest.java | 2
.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_5_RELEASE.xml | 13 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java | 5
.idea/libraries/Maven__io_netty_netty_resolver_4_1_45_Final.xml | 13 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java | 34 ++++
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java | 2
.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml | 13 +
.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_5_RELEASE.xml | 13 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/ApproveInfoResponse.java | 2
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java | 5
/dev/null | 28 ----
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DeviceListResponse.java | 4
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 12 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java | 3
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/ApproveAddRequest.java | 2
43 files changed, 326 insertions(+), 76 deletions(-)
diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml
new file mode 100644
index 0000000..851d46f
--- /dev/null
+++ b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.lettuce:lettuce-core:5.2.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.2.2.RELEASE/lettuce-core-5.2.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.2.2.RELEASE/lettuce-core-5.2.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.2.2.RELEASE/lettuce-core-5.2.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_45_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_45_Final.xml
new file mode 100644
index 0000000..86e716b
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_45_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.netty:netty-buffer:4.1.45.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.45.Final/netty-buffer-4.1.45.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.45.Final/netty-buffer-4.1.45.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.45.Final/netty-buffer-4.1.45.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_45_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_45_Final.xml
new file mode 100644
index 0000000..20585b5
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_45_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.netty:netty-codec:4.1.45.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.45.Final/netty-codec-4.1.45.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.45.Final/netty-codec-4.1.45.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.45.Final/netty-codec-4.1.45.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_45_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_45_Final.xml
new file mode 100644
index 0000000..36e6da4
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_45_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.netty:netty-common:4.1.45.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.45.Final/netty-common-4.1.45.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.45.Final/netty-common-4.1.45.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.45.Final/netty-common-4.1.45.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_45_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_45_Final.xml
new file mode 100644
index 0000000..44a05a9
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_45_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.netty:netty-handler:4.1.45.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.45.Final/netty-handler-4.1.45.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.45.Final/netty-handler-4.1.45.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.45.Final/netty-handler-4.1.45.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_45_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_45_Final.xml
new file mode 100644
index 0000000..e1aed92
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_45_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.netty:netty-resolver:4.1.45.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.45.Final/netty-resolver-4.1.45.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.45.Final/netty-resolver-4.1.45.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.45.Final/netty-resolver-4.1.45.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_45_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_45_Final.xml
new file mode 100644
index 0000000..0d498f9
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_45_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: io.netty:netty-transport:4.1.45.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.45.Final/netty-transport-4.1.45.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.45.Final/netty-transport-4.1.45.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.45.Final/netty-transport-4.1.45.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..bbf23c3
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.2.5.RELEASE/spring-boot-starter-data-redis-2.2.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.2.5.RELEASE/spring-boot-starter-data-redis-2.2.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.2.5.RELEASE/spring-boot-starter-data-redis-2.2.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..ab3740b
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.data:spring-data-commons:2.2.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.5.RELEASE/spring-data-commons-2.2.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.5.RELEASE/spring-data-commons-2.2.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.2.5.RELEASE/spring-data-commons-2.2.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..71a4589
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.data:spring-data-keyvalue:2.2.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.2.5.RELEASE/spring-data-keyvalue-2.2.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.2.5.RELEASE/spring-data-keyvalue-2.2.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.2.5.RELEASE/spring-data-keyvalue-2.2.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..104591c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework.data:spring-data-redis:2.2.5.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.2.5.RELEASE/spring-data-redis-2.2.5.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.2.5.RELEASE/spring-data-redis-2.2.5.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.2.5.RELEASE/spring-data-redis-2.2.5.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_4_RELEASE.xml
new file mode 100644
index 0000000..a11c526
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.4.RELEASE/spring-context-support-5.2.4.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.4.RELEASE/spring-context-support-5.2.4.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.4.RELEASE/spring-context-support-5.2.4.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_4_RELEASE.xml
new file mode 100644
index 0000000..825cc7d
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-oxm:5.2.4.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.4.RELEASE/spring-oxm-5.2.4.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.4.RELEASE/spring-oxm-5.2.4.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.4.RELEASE/spring-oxm-5.2.4.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
new file mode 100644
index 0000000..c20b9ae
--- /dev/null
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
@@ -0,0 +1,59 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
+import com.doumee.core.haikang.model.param.request.ParkListRequest;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
+import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
+import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Api(tags = "ERP鏁版嵁鍚屾鎺ュ彛")
+@RestController
+@RequestMapping("/business/erp")
+public class ERPSyncController extends BaseController {
+
+ @Autowired
+ private HkSyncDeviceServiceImpl hkSyncDeviceService;
+ @Autowired
+ private HkSyncParkServiceImpl hkSyncParkService;
+ @Autowired
+ private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
+
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
+ @PostMapping("/getDevices")
+// @RequiresPermissions("business:hksync:device")
+ public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
+ String result = hkSyncDeviceService.syncHkDevices(param);
+ return ApiResponse.success(result);
+ }
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
+ @PostMapping("/getParks")
+// @RequiresPermissions("business:hksync:park")
+ public ApiResponse getParks(@RequestBody ParkListRequest param) {
+ String result = hkSyncParkService.syncHkParks(param);
+ return ApiResponse.success(result);
+ }
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
+ @PostMapping("/getPrivilege")
+// @RequiresPermissions("business:hksync:privilege")
+ public ApiResponse getPrivilege(@RequestBody ParkListRequest param) {
+ String result = hkSyncPrivilegeService.syncHkParks(param);
+ return ApiResponse.success(result);
+ }
+}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
index d5af113..fb68d05 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -14,6 +14,7 @@
import com.doumee.service.business.HkSyncService;
import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
+import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -37,6 +38,8 @@
private HkSyncDeviceServiceImpl hkSyncDeviceService;
@Autowired
private HkSyncParkServiceImpl hkSyncParkService;
+ @Autowired
+ private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
@@ -54,5 +57,12 @@
String result = hkSyncParkService.syncHkParks(param);
return ApiResponse.success(result);
}
-
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
+ @PostMapping("/getPrivilege")
+// @RequiresPermissions("business:hksync:privilege")
+ public ApiResponse getPrivilege(@RequestBody ParkListRequest param) {
+ String result = hkSyncPrivilegeService.syncHkParks(param);
+ return ApiResponse.success(result);
+ }
}
diff --git a/server/openapi/src/main/java/com/doumee/model/request/ApproveNoticeRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java
similarity index 92%
rename from server/openapi/src/main/java/com/doumee/model/request/ApproveNoticeRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java
index c761944..093374c 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/ApproveNoticeRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/CarAuthorRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarAuthorRequest.java
similarity index 95%
rename from server/openapi/src/main/java/com/doumee/model/request/CarAuthorRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarAuthorRequest.java
index a1f6295..ebea39a 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/CarAuthorRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarAuthorRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/CarEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
similarity index 94%
rename from server/openapi/src/main/java/com/doumee/model/request/CarEventListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
index d012964..8afb6bf 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/CarEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/DoorEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
similarity index 93%
rename from server/openapi/src/main/java/com/doumee/model/request/DoorEventListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
index 2bc9c29..c675a66 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/DoorEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/OrgUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
similarity index 86%
rename from server/openapi/src/main/java/com/doumee/model/request/OrgUpdateRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
index dd2a56d..d648d12 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/OrgUpdateRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
@@ -1,7 +1,5 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/ParkListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
similarity index 89%
rename from server/openapi/src/main/java/com/doumee/model/request/ParkListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
index b4820fe..dc3b8bd 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/ParkListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/RoleListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
similarity index 79%
rename from server/openapi/src/main/java/com/doumee/model/request/RoleListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
index cde1e63..79f3172 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/RoleListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
@@ -1,11 +1,8 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
-import com.doumee.model.response.DeviceListResponse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* 鍒嗙被淇℃伅琛�
diff --git a/server/openapi/src/main/java/com/doumee/model/request/UserAuthorRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java
similarity index 94%
rename from server/openapi/src/main/java/com/doumee/model/request/UserAuthorRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java
index bbe1fdf..d279fb1 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/UserAuthorRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/UserUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
similarity index 91%
rename from server/openapi/src/main/java/com/doumee/model/request/UserUpdateRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
index d27484e..4908f45 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/UserUpdateRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
@@ -1,7 +1,5 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/VisitListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
similarity index 96%
rename from server/openapi/src/main/java/com/doumee/model/request/VisitListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
index 0dc2fb8..028486b 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/VisitListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request;
+package com.doumee.core.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/erp/ApproveAddRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/ApproveAddRequest.java
similarity index 95%
rename from server/openapi/src/main/java/com/doumee/model/request/erp/ApproveAddRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/ApproveAddRequest.java
index 85ded17..925b498 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/erp/ApproveAddRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/ApproveAddRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request.erp;
+package com.doumee.core.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/erp/OrgListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/OrgListRequest.java
similarity index 93%
rename from server/openapi/src/main/java/com/doumee/model/request/erp/OrgListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/OrgListRequest.java
index 98cc7e8..d9558f1 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/erp/OrgListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/OrgListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request.erp;
+package com.doumee.core.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/erp/UserInfoRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserInfoRequest.java
similarity index 92%
rename from server/openapi/src/main/java/com/doumee/model/request/erp/UserInfoRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserInfoRequest.java
index 5e278b8..10de9c9 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/erp/UserInfoRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserInfoRequest.java
@@ -1,10 +1,8 @@
-package com.doumee.model.request.erp;
+package com.doumee.core.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* @author 姹熻箘韫�
diff --git a/server/openapi/src/main/java/com/doumee/model/request/erp/UserListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserListRequest.java
similarity index 94%
rename from server/openapi/src/main/java/com/doumee/model/request/erp/UserListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserListRequest.java
index 6e1c145..2dd2496 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/erp/UserListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.model.request.erp;
+package com.doumee.core.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/AccessTokenResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/AccessTokenResponse.java
new file mode 100644
index 0000000..cec9091
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/AccessTokenResponse.java
@@ -0,0 +1,21 @@
+package com.doumee.core.model.openapi.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鍒嗙被淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("鎺ュ彛璋冪敤鍑瘉杩斿洖淇℃伅")
+public class AccessTokenResponse {
+
+ @ApiModelProperty(value = "璋冪敤鍑瘉" )
+ private String token;
+ @ApiModelProperty(value = "鏈夋晥鏃堕棿锛堢锛�", example = "1")
+ private long expireTime;
+
+}
diff --git a/server/openapi/src/main/java/com/doumee/model/response/CarEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
similarity index 98%
rename from server/openapi/src/main/java/com/doumee/model/response/CarEventListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
index 06e31ed..c4cf71d 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/CarEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.model.response;
+package com.doumee.core.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/response/DeviceListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DeviceListResponse.java
similarity index 87%
rename from server/openapi/src/main/java/com/doumee/model/response/DeviceListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DeviceListResponse.java
index e44be72..a617aed 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/DeviceListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DeviceListResponse.java
@@ -1,10 +1,8 @@
-package com.doumee.model.response;
+package com.doumee.core.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* 鍒嗙被淇℃伅琛�
diff --git a/server/openapi/src/main/java/com/doumee/model/response/DoorEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
similarity index 96%
rename from server/openapi/src/main/java/com/doumee/model/response/DoorEventListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
index 32167b8..d28152d 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/DoorEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.model.response;
+package com.doumee.core.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/response/ParkListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
similarity index 84%
rename from server/openapi/src/main/java/com/doumee/model/response/ParkListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
index dd52a8f..51c7968 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/ParkListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
@@ -1,6 +1,5 @@
-package com.doumee.model.response;
+package com.doumee.core.model.openapi.response;
-import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/openapi/src/main/java/com/doumee/model/response/RoleListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/RoleListResponse.java
similarity index 87%
rename from server/openapi/src/main/java/com/doumee/model/response/RoleListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/RoleListResponse.java
index 0b537cd..f09dbb2 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/RoleListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/RoleListResponse.java
@@ -1,6 +1,5 @@
-package com.doumee.model.response;
+package com.doumee.core.model.openapi.response;
-import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/openapi/src/main/java/com/doumee/model/response/VisitEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/VisitEventListResponse.java
similarity index 96%
rename from server/openapi/src/main/java/com/doumee/model/response/VisitEventListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/VisitEventListResponse.java
index 52837cb..14b7290 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/VisitEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/VisitEventListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.model.response;
+package com.doumee.core.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/response/erp/ApproveInfoResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/ApproveInfoResponse.java
similarity index 91%
rename from server/openapi/src/main/java/com/doumee/model/response/erp/ApproveInfoResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/ApproveInfoResponse.java
index 2f730c3..e6e9ac0 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/erp/ApproveInfoResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/ApproveInfoResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.model.response.erp;
+package com.doumee.core.model.openapi.response.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/response/erp/OrgListRespone.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java
similarity index 94%
rename from server/openapi/src/main/java/com/doumee/model/response/erp/OrgListRespone.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java
index ffa7463..e2f4f03 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/erp/OrgListRespone.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java
@@ -1,4 +1,4 @@
-package com.doumee.model.response.erp;
+package com.doumee.core.model.openapi.response.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/openapi/src/main/java/com/doumee/model/response/erp/UserListRespone.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java
similarity index 96%
rename from server/openapi/src/main/java/com/doumee/model/response/erp/UserListRespone.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java
index 459130f..92b1a35 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/erp/UserListRespone.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java
@@ -1,4 +1,4 @@
-package com.doumee.model.response.erp;
+package com.doumee.core.model.openapi.response.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
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
new file mode 100644
index 0000000..fe614c6
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
@@ -0,0 +1,34 @@
+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;
+
+/**
+ * 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface ERPSyncService {
+ /**
+ * 鍚屾娴峰悍闂ㄧ璁惧
+ * @param param
+ * @return
+ */
+ String syncErpOrg(AcsDeviceListRequest param);
+
+ /**
+ * 鍚屾娴峰悍鍋滆溅搴�
+ * @param param
+ * @return
+ */
+
+ String syncHkParks(ParkListRequest param);
+
+ /**
+ * 鍚屾娴峰悍璁垮鏉冮檺缁�
+ * @param param
+ * @return
+ */
+ String syncPrivilege(PrivilegeGroupRequest param);
+}
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 2d49d63..a6d2a65 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
@@ -3,8 +3,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.model.request.*;
-import com.doumee.model.response.*;
+import com.doumee.core.model.openapi.request.*;
+import com.doumee.core.model.openapi.response.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -14,7 +14,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.UUID;
/**
* Created by IntelliJ IDEA.
diff --git a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
index 42ab067..6864bcf 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,14 @@
package com.doumee.api.web;
+import com.doumee.core.haikang.model.param.respose.OrgListResponse;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.model.request.erp.ApproveAddRequest;
-import com.doumee.model.request.erp.OrgListRequest;
-import com.doumee.model.request.erp.UserListRequest;
-import com.doumee.model.response.CarEventListResponse;
-import com.doumee.model.response.erp.ApproveInfoResponse;
-import com.doumee.model.response.erp.OrgListRespone;
-import com.doumee.model.response.erp.UserListRespone;
+import com.doumee.core.model.openapi.request.erp.ApproveAddRequest;
+import com.doumee.core.model.openapi.request.erp.OrgListRequest;
+import com.doumee.core.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.model.openapi.response.erp.ApproveInfoResponse;
+import com.doumee.core.model.openapi.response.erp.UserListRespone;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -33,7 +32,7 @@
public class ErpResourceController extends ApiController{
@ApiOperation(value = "鍏ㄩ噺缁勭粐淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴缁勭粐淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�")
@PostMapping("/resource/org/list")
- public ApiResponse<PageData<OrgListRespone>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {
+ public ApiResponse<PageData<OrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {
return ApiResponse.success(null);
}
@ApiOperation(value = "鍏ㄩ噺浜哄憳淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴浜哄憳淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�")
diff --git a/server/openapi/src/main/java/com/doumee/model/response/AccessTokenResponse.java b/server/openapi/src/main/java/com/doumee/model/response/AccessTokenResponse.java
deleted file mode 100644
index 13fdd28..0000000
--- a/server/openapi/src/main/java/com/doumee/model/response/AccessTokenResponse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.doumee.model.response;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 鍒嗙被淇℃伅琛�
- * @author 姹熻箘韫�
- * @date 2023/11/23 14:03
- */
-@Data
-@ApiModel("鎺ュ彛璋冪敤鍑瘉杩斿洖淇℃伅")
-public class AccessTokenResponse {
-
- @ApiModelProperty(value = "璋冪敤鍑瘉" )
- private String token;
- @ApiModelProperty(value = "鏈夋晥鏃堕棿锛堢锛�", example = "1")
- private long expireTime;
-
-}
--
Gitblit v1.9.3