From 2c4cfb7ed1ece6c3b80f7d551a267e9367ddb12b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 10:31:31 +0800
Subject: [PATCH] 整理
---
.gitignore | 1
server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 22 +++++
server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst | 0
server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 58 ++++++++++++++
server/dmvisit_web/target/visit_web.jar.original | 0
server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 11 ++
server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 9 ++
server/dmvisit_web/target/maven-archiver/pom.properties | 3
server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst | 0
server/openapi/src/main/java/com/doumee/api/BaseController.java | 1
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 1
server/dmvisit_admin/src/main/resources/application.yml | 2
/dev/null | 15 ---
server/dmvisit_admin/target/classes/application.yml | 2
server/openapi/target/openapi.jar.original | 0
server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst | 0
server/dmvisit_admin/target/dmvisit_admin.jar.original | 0
server/dmvisit_admin/target/maven-archiver/pom.properties | 3
server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst | 0
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 2
server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 22 +++++
server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 58 ++++++++++++++
22 files changed, 189 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8196b96..4f77cbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
*.jar
*.war
*.ear
+*.iml
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
diff --git a/server/dmvisit.iml b/server/dmvisit.iml
deleted file mode 100644
index f409c0e..0000000
--- a/server/dmvisit.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/server/dmvisit_admin/dmvisit_admin.iml b/server/dmvisit_admin/dmvisit_admin.iml
deleted file mode 100644
index c035f0b..0000000
--- a/server/dmvisit_admin/dmvisit_admin.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/server/dmvisit_admin/src/main/resources/application.yml b/server/dmvisit_admin/src/main/resources/application.yml
index 87285f9..a081a8b 100644
--- a/server/dmvisit_admin/src/main/resources/application.yml
+++ b/server/dmvisit_admin/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# 椤圭洰淇℃伅閰嶇疆
project:
- name: 鏅鸿兘浼氳瀹ら」鐩�
+ name: 璁垮绯荤粺
version: 1.0.0
env: development
# env: production
diff --git a/server/dmvisit_admin/target/classes/application.yml b/server/dmvisit_admin/target/classes/application.yml
index 87285f9..a081a8b 100644
--- a/server/dmvisit_admin/target/classes/application.yml
+++ b/server/dmvisit_admin/target/classes/application.yml
@@ -1,6 +1,6 @@
# 椤圭洰淇℃伅閰嶇疆
project:
- name: 鏅鸿兘浼氳瀹ら」鐩�
+ name: 璁垮绯荤粺
version: 1.0.0
env: development
# env: production
diff --git a/server/dmvisit_admin/target/dmvisit_admin.jar.original b/server/dmvisit_admin/target/dmvisit_admin.jar.original
new file mode 100644
index 0000000..26d49ce
--- /dev/null
+++ b/server/dmvisit_admin/target/dmvisit_admin.jar.original
Binary files differ
diff --git a/server/dmvisit_admin/target/maven-archiver/pom.properties b/server/dmvisit_admin/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..2e95c80
--- /dev/null
+++ b/server/dmvisit_admin/target/maven-archiver/pom.properties
@@ -0,0 +1,3 @@
+version=1.0.0-SNAPSHOT
+groupId=com.doumee
+artifactId=dmvisit_admin
diff --git a/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..f1d3e41
--- /dev/null
+++ b/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,58 @@
+com\doumee\api\business\ProblemLogController.class
+com\doumee\api\system\SystemPermissionController.class
+com\doumee\api\business\DeviceRoleController.class
+com\doumee\api\system\SystemUserController.class
+com\doumee\api\system\SystemDictController.class
+com\doumee\config\shiro\ShiroTokenManager.class
+com\doumee\config\shiro\ShiroAuthFilter.class
+com\doumee\api\business\RetentionController.class
+com\doumee\api\business\VisitsController.class
+com\doumee\api\system\SystemDataPermissionController.class
+com\doumee\config\shiro\ShiroToken.class
+com\doumee\api\business\ERPSyncController.class
+com\doumee\api\business\HkSyncController.class
+com\doumee\api\business\ApproveParamController.class
+com\doumee\api\business\CarsController.class
+com\doumee\api\common\CaptchaController.class
+com\doumee\api\business\CategoryController.class
+com\doumee\api\UserActionController.class
+com\doumee\api\system\SystemMenuController.class
+com\doumee\api\system\SystemPositionController.class
+com\doumee\config\swagger\SwaggerConfig.class
+com\doumee\api\system\SystemDepartmentController.class
+com\doumee\api\business\ParkBookController.class
+com\doumee\config\shiro\ShiroRealm.class
+com\doumee\api\system\SystemTraceLogController.class
+com\doumee\api\business\CompanyController.class
+com\doumee\config\shiro\ShiroCacheManager.class
+com\doumee\config\swagger\SwaggerInterceptorConfig.class
+com\doumee\AdminApplication.class
+com\doumee\api\business\EmpowerController.class
+com\doumee\api\business\VisitEventController.class
+com\doumee\service\impl\HkSyncEventServiceImpl.class
+com\doumee\api\business\ApproveController.class
+com\doumee\api\business\DeviceController.class
+com\doumee\api\system\SystemMonitorController.class
+com\doumee\config\shiro\ShiroConfig.class
+com\doumee\config\shiro\ShiroSessionSerializer.class
+com\doumee\config\shiro\ShiroCache.class
+com\doumee\config\shiro\ShiroCredentialsMatcher.class
+com\doumee\api\system\SystemLoginLogController.class
+com\doumee\api\system\SystemRoleController.class
+com\doumee\api\system\SystemDictDataController.class
+com\doumee\config\shiro\ShiroSessionManager.class
+com\doumee\api\business\DeviceEventController.class
+com\doumee\api\business\MemberRoleController.class
+com\doumee\api\business\CarEventController.class
+com\doumee\api\BaseController.class
+com\doumee\config\shiro\ShiroSessionDAO.class
+com\doumee\api\business\ProblemsController.class
+com\doumee\config\swagger\SwaggerInterceptor.class
+com\doumee\api\business\MemberCardController.class
+com\doumee\api\business\ParksController.class
+com\doumee\api\business\TrainTimeController.class
+com\doumee\api\common\PublicController.class
+com\doumee\api\system\SystemController.class
+com\doumee\api\business\MemberController.class
+com\doumee\api\business\InterfaceLogController.class
+com\doumee\task\ScheduleTool.class
diff --git a/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..2d347e9
--- /dev/null
+++ b/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,58 @@
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\DeviceRoleController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroSessionSerializer.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroSessionManager.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\swagger\SwaggerInterceptor.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\MemberController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroConfig.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemMenuController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemDictDataController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\TrainTimeController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\AdminApplication.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroAuthFilter.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\MemberRoleController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\ProblemsController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\ProblemLogController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\UserActionController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\common\CaptchaController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroToken.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\CategoryController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\CompanyController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\swagger\SwaggerInterceptorConfig.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\RetentionController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemDataPermissionController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\DeviceEventController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\common\PublicController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\InterfaceLogController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroCredentialsMatcher.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemMonitorController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemPermissionController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemDepartmentController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroCacheManager.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroCache.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemDictController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\service\impl\HkSyncEventServiceImpl.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemTraceLogController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\task\ScheduleTool.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\HkSyncController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\BaseController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroSessionDAO.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\ParkBookController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\ApproveController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\swagger\SwaggerConfig.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemUserController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\ApproveParamController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\ERPSyncController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroTokenManager.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemPositionController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\VisitsController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\ParksController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\DeviceController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemLoginLogController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\CarsController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\EmpowerController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\VisitEventController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\config\shiro\ShiroRealm.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\CarEventController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\system\SystemRoleController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_admin\src\main\java\com\doumee\api\business\MemberCardController.java
diff --git a/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
diff --git a/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/server/dmvisit_admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
diff --git a/server/dmvisit_service/dmmall_service.iml b/server/dmvisit_service/dmmall_service.iml
deleted file mode 100644
index 1adbd8d..0000000
--- a/server/dmvisit_service/dmmall_service.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
- </configuration>
- </facet>
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- </component>
-</module>
\ No newline at end of file
diff --git a/server/dmvisit_service/dmvisit_service.iml b/server/dmvisit_service/dmvisit_service.iml
deleted file mode 100644
index c035f0b..0000000
--- a/server/dmvisit_service/dmvisit_service.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
index 26af248..1e15e58 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -81,7 +81,7 @@
ERPApiResponse<PageData <ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
if(response!=null && response.getData()!=null && response.getData().getRecords()!=null){
list.addAll(response.getData().getRecords());
- if(100*pageSize < response.getData().getTotal() ){
+ if(pageSize*page < response.getData().getTotal() ){
hasLast =true;//杩樻湁涓嬩竴椤�
}
page++;
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 ff1ba29..5675fc4 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
@@ -307,7 +307,6 @@
}else{
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾ERP鏁版嵁涓虹┖锛�");
}
-
}
public void dealRoleEmpower(Member member,Date startTime , Date endTime){
diff --git a/server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 4ea66a1..a89d730 100644
--- a/server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -38,6 +38,7 @@
com\doumee\dao\system\vo\SystemMenuListVO.class
com\doumee\core\annotation\trace\TraceInterceptorConfig.class
com\doumee\core\haikang\model\param\request\event\acs\EventDeviceDataRequest.class
+com\doumee\dao\web\reqeust\VisitMemberDTO.class
com\doumee\biz\system\SystemRoleBiz.class
com\doumee\core\haikang\service\HKService$21.class
com\doumee\core\haikang\service\HKService$9.class
@@ -131,6 +132,7 @@
com\doumee\core\annotation\pr\PreventRepeatAdapter$MassiveUnit.class
com\doumee\dao\system\vo\SystemDictDataListVO.class
com\doumee\core\utils\FtpUtil.class
+com\doumee\dao\system\vo\ApproveParamDataVO.class
com\doumee\dao\system\SystemTraceLogMapper.class
com\doumee\config\mybatis\JSONObjectHandler.class
com\doumee\core\model\PageWrap.class
@@ -214,6 +216,7 @@
com\doumee\core\utils\Constants$Status.class
com\doumee\core\constants\OperaType.class
com\doumee\dao\business\model\UserAction.class
+com\doumee\core\utils\Constants$approveStatus.class
com\doumee\service\business\impl\ProblemsServiceImpl.class
com\doumee\core\erp\model\openapi\response\DoorEventListResponse.class
com\doumee\core\utils\Location.class
@@ -309,6 +312,7 @@
com\doumee\dao\system\model\SystemDataPermission.class
com\doumee\service\business\impl\ApproveParamServiceImpl.class
com\doumee\core\haikang\HKUtil$4.class
+com\doumee\dao\web\reqeust\AuditApproveDTO.class
com\doumee\service\system\SystemPermissionService.class
com\doumee\core\annotation\excel\ExcelColumn.class
com\doumee\dao\system\model\SystemUser.class
@@ -339,6 +343,7 @@
com\doumee\core\erp\model\openapi\request\erp\UserListRequest.class
com\doumee\core\servlet\ServletDuplicateResponseWrapper.class
com\doumee\dao\admin\response\DevWgDataResponseParam.class
+com\doumee\dao\system\vo\ApproveParamVO.class
com\doumee\core\aware\DataPermissionAware.class
com\doumee\core\haikang\model\HKConstants$ReturnCode.class
com\doumee\service\system\impl\SystemRoleMenuServiceImpl.class
@@ -347,7 +352,6 @@
com\doumee\dao\business\join\MemberCardJoinMapper.class
com\doumee\service\business\impl\CategoryServiceImpl.class
com\doumee\dao\web\reqeust\CheckVisitedDTO.class
-com\doumee\core\haikang\model\param\request\event\parks\EventParkParamRequest$EventParkRlsRequest.class
com\doumee\core\haikang\model\param\respose\DoorsInfoResponse.class
com\doumee\core\utils\Secure.class
com\doumee\core\utils\kuaidi100\DeliveryInfoDTO.class
@@ -420,6 +424,8 @@
com\doumee\core\haikang\model\param\request\TaskProgressRequest.class
com\doumee\core\utils\GeneratePicUtil.class
com\doumee\core\utils\Constants$memberType.class
+com\doumee\dao\web\response\InternalHomeVO.class
+com\doumee\dao\web\response\VisitRecordVO.class
com\doumee\service\business\impl\hksync\HkSyncImgServiceImpl.class
com\doumee\core\haikang\model\param\BaseResponse.class
com\doumee\dao\business\model\DeviceRole.class
@@ -535,6 +541,7 @@
com\doumee\core\erp\model\openapi\request\erp\ApproveAddRequest.class
com\doumee\core\haikang\model\param\request\ParkListRequest.class
com\doumee\service\business\ApproveService.class
+com\doumee\core\haikang\model\param\request\event\parks\EventParkRlsRequest.class
com\doumee\dao\business\DeviceRoleMapper.class
com\doumee\service\system\SystemDepartmentUserService.class
com\doumee\core\constants\OperaType$UpdateStatus.class
@@ -564,6 +571,7 @@
com\doumee\core\annotation\excel\ExcelDataHandlerAdapter.class
com\doumee\dao\system\model\SystemPermission.class
com\doumee\core\utils\monitor\Memory.class
+com\doumee\dao\web\reqeust\VisitRecordDTO.class
com\doumee\service\business\MemberRoleService.class
com\doumee\core\haikang\model\param\request\event\parks\EventParkInfoRequest.class
com\doumee\core\haikang\model\param\respose\OrgOrUserAddFailureResponse.class
@@ -585,6 +593,7 @@
com\doumee\dao\business\VisitEventMapper.class
com\doumee\core\erp\model\openapi\request\UserUpdateRequest.class
com\doumee\core\haikang\model\param\request\TaskDataAdditionFaceRequest.class
+com\doumee\dao\web\reqeust\AccountLoginDTO.class
com\doumee\dao\business\model\Parks.class
com\doumee\service\business\CarsService.class
com\doumee\core\erp\model\openapi\request\CarEventListRequest.class
diff --git a/server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 915c85b..2de7bb3 100644
--- a/server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/server/dmvisit_service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -11,12 +11,14 @@
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\admin\response\CarsDTO.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\business\InterfaceLogService.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\system\vo\SystemUserListVO.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\event\parks\EventParkRlsRequest.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\model\InterfaceLog.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\model\Visits.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\utils\monitor\CPU.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\business\ProblemLogService.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\constants\OperaType.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\erp\model\openapi\request\OrgUpdateRequest.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\system\vo\ApproveParamDataVO.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\model\UserAction.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\system\SystemUserService.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\event\parks\EventParkParamRequest.java
@@ -30,6 +32,7 @@
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\utils\IdCardTool.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\system\model\SystemDepartment.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\constants\ResponseStatus.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\web\reqeust\VisitRecordDTO.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\CompanyMapper.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\TrainTimeMapper.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\business\impl\hksync\HkSyncPrivilegeServiceImpl.java
@@ -173,6 +176,7 @@
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\exception\UnSafeSessionException.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\event\acs\EventAcsRequest.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\OrgEditRequest.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\web\reqeust\AuditApproveDTO.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\model\Problems.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\ParkListRequest.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\biz\system\SystemDictBiz.java
@@ -249,6 +253,7 @@
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\UserActionMapper.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\ParkReservationDelRequest.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\system\vo\SystemMenuNodeVO.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\web\reqeust\AccountLoginDTO.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\erp\model\openapi\response\ParkListResponse.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\system\model\SystemPosition.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\AcsDeviceListRequest.java
@@ -297,6 +302,8 @@
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\business\impl\hksync\HkSyncVisitServiceImpl.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\business\UserActionService.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\utils\QrCodeUtils.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\web\response\InternalHomeVO.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\system\vo\ApproveParamVO.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\respose\OrgListResponse.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\wx\AccessToken.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\system\impl\SystemDictDataServiceImpl.java
@@ -354,6 +361,7 @@
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\model\MemberRole.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\UserAddRequest.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\respose\ParkReservationAddResponse.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\web\reqeust\VisitMemberDTO.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\request\OrgAddRequest.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\respose\FaceAddOrEditesponse.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\utils\aliyun\ALiYunSmSUtil.java
@@ -376,6 +384,7 @@
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\core\haikang\model\param\respose\TaskProgressResponse.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\biz\system\SystemDepartmentBiz.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\business\join\MemberCardJoinMapper.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\dao\web\response\VisitRecordVO.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\business\DeviceService.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\business\ApproveParamService.java
D:\code\idea2023\git\dmvisit\server\dmvisit_service\src\main\java\com\doumee\service\system\impl\SystemPositionUserServiceImpl.java
diff --git a/server/dmvisit_web/dmvisit_web.iml b/server/dmvisit_web/dmvisit_web.iml
deleted file mode 100644
index c035f0b..0000000
--- a/server/dmvisit_web/dmvisit_web.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/server/dmvisit_web/target/maven-archiver/pom.properties b/server/dmvisit_web/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..1e5490c
--- /dev/null
+++ b/server/dmvisit_web/target/maven-archiver/pom.properties
@@ -0,0 +1,3 @@
+version=1.0.0-SNAPSHOT
+groupId=com.doumee
+artifactId=dmvisit_web
diff --git a/server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..5d91582
--- /dev/null
+++ b/server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,22 @@
+com\doumee\api\web\ApiController.class
+com\doumee\config\shiro\ShiroRealm.class
+com\doumee\api\web\InternalController.class
+com\doumee\api\ScheduleTool.class
+com\doumee\api\BaseController.class
+com\doumee\config\shiro\ShiroSessionDAO.class
+com\doumee\config\shiro\ShiroCacheManager.class
+com\doumee\config\swagger\SwaggerInterceptor.class
+com\doumee\config\swagger\SwaggerInterceptorConfig.class
+com\doumee\api\web\UnitController.class
+com\doumee\api\web\ProblemController.class
+com\doumee\api\common\CaptchaController.class
+com\doumee\config\shiro\ShiroConfig.class
+com\doumee\config\shiro\ShiroCache.class
+com\doumee\config\shiro\ShiroCredentialsMatcher.class
+com\doumee\InterfaceApplication.class
+com\doumee\api\web\PublicController.class
+com\doumee\api\web\VisitorController.class
+com\doumee\config\shiro\ShiroSessionManager.class
+com\doumee\config\shiro\ShiroTokenManager.class
+com\doumee\config\shiro\ShiroAuthFilter.class
+com\doumee\config\swagger\SwaggerConfig.class
diff --git a/server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..0c46929
--- /dev/null
+++ b/server/dmvisit_web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,22 @@
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\web\InternalController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\web\ApiController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\web\UnitController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\web\VisitorController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroConfig.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroCredentialsMatcher.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroTokenManager.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\InterfaceApplication.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\common\CaptchaController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\web\PublicController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroSessionDAO.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroRealm.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroSessionManager.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\swagger\SwaggerInterceptorConfig.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroCacheManager.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\BaseController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\swagger\SwaggerConfig.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\web\ProblemController.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroAuthFilter.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\shiro\ShiroCache.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\config\swagger\SwaggerInterceptor.java
+D:\code\idea2023\git\dmvisit\server\dmvisit_web\src\main\java\com\doumee\api\ScheduleTool.java
diff --git a/server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
diff --git a/server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/server/dmvisit_web/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
diff --git a/server/dmvisit_web/target/visit_web.jar.original b/server/dmvisit_web/target/visit_web.jar.original
new file mode 100644
index 0000000..13d0063
--- /dev/null
+++ b/server/dmvisit_web/target/visit_web.jar.original
Binary files differ
diff --git a/server/openapi/openapi.iml b/server/openapi/openapi.iml
deleted file mode 100644
index c035f0b..0000000
--- a/server/openapi/openapi.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/server/openapi/src/main/java/com/doumee/api/BaseController.java b/server/openapi/src/main/java/com/doumee/api/BaseController.java
index bcff305..8e09236 100644
--- a/server/openapi/src/main/java/com/doumee/api/BaseController.java
+++ b/server/openapi/src/main/java/com/doumee/api/BaseController.java
@@ -20,5 +20,4 @@
protected LoginUserInfo getLoginUser () {
return (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
}
-
}
diff --git a/server/openapi/target/openapi.jar.original b/server/openapi/target/openapi.jar.original
index bbd7a83..adca516 100644
--- a/server/openapi/target/openapi.jar.original
+++ b/server/openapi/target/openapi.jar.original
Binary files differ
--
Gitblit v1.9.3