From a8a5c4f0dcf32a85c584d78ccfa5c98cdc078119 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 30 十一月 2023 15:37:44 +0800
Subject: [PATCH] 数据结构整理
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 2
server/db/business.member_card.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/RetentionMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java | 37
server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/EmpowerMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 2
server/db/business.visit_event.permissions.sql | 6
server/openapi/src/main/java/com/doumee/model/request/UserUpdateRequest.java | 8
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java | 10
server/db/business.visits.permissions.sql | 6
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java | 2
server/openapi/src/main/java/com/doumee/model/request/erp/UserInfoRequest.java | 1
server/openapi/src/main/resources/application.yml | 4
server/README.md | 3
server/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 2
server/openapi/src/main/java/com/doumee/model/response/erp/ApproveInfoResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 29
server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/ParkBookMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java | 86 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 2
server/openapi/src/main/java/com/doumee/model/response/erp/UserListRespone.java | 7
server/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberCardMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 253 +++++
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java | 2
server/db/business.member.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/TrainTimeMapper.java | 2
server/db/business.category.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 154 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 5
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java | 237 +++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 17
server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java | 90 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 15
server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceEventMapper.java | 2
server/db/business.interface_log.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java | 97 ++
server/openapi/src/main/java/com/doumee/model/request/erp/ApproveAddRequest.java | 6
server/db/business.approve.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/CarsMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 14
server/db/business.problem_log.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemLogMapper.java | 2
server/db/business.device_event.permissions.sql | 6
server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java | 90 ++
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java | 2
server/openapi/src/main/java/com/doumee/model/request/ApproveNoticeRequest.java | 2
server/db/business.member_role.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 5
server/db/business.train_time.permissions.sql | 6
server/db/business.parks.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitsMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java | 97 ++
server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java | 2
server/db/business.car_event.permissions.sql | 6
server/db/business.problems.permissions.sql | 6
server/db/business.device.permissions.sql | 6
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberRoleMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 6
server/openapi/pom.xml | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java | 2
server/db/business.park_book.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java | 2
server/db/business.empower.permissions.sql | 6
server/db/business.retention.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 14
server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java | 97 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 214 ++++
server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemsMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitEventMapper.java | 12
server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java | 176 +++
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java | 34
server/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/InterfaceLogController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 162 ++
server/openapi/src/main/java/com/doumee/model/request/CarAuthorRequest.java | 7
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 3
server/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 2
server/db/business.cars.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceRoleMapper.java | 12
server/dmvisit_service/src/main/java/com/doumee/dao/business/InterfaceLogMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 2
server/db/business.device_role.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 9
server/dmvisit_service/src/main/java/com/doumee/dao/business/CategoryMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 250 ++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/CarEventMapper.java | 12
server/db/business.company.permissions.sql | 6
server/openapi/src/main/java/com/doumee/model/request/UserAuthorRequest.java | 7
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java | 90 ++
server/dmvisit_service/src/main/java/com/doumee/dao/business/ParksMapper.java | 2
138 files changed, 2,443 insertions(+), 211 deletions(-)
diff --git a/server/README.md b/server/README.md
index ae06d7b..15ddd87 100644
--- a/server/README.md
+++ b/server/README.md
@@ -3,5 +3,4 @@
鎶�鏈敮鎸丵Q缇わ細877957236
-nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10016 -jar /home/meeting/smartmeeting_web.jar >/home/meeting/web.log 2>/home/meeting/web_err.log &
-nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10016 -jar /home/meeting/smartmeeting_admin.jar >/home/meeting/admin.log 2>/home/meeting/admin_err.log &
+nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10018 -jar /usr/local/jars/dmvisit/openapi.jar >/usr/local/jars/dmvisit/web.log 2>/usr/local/jars/dmvisit/err.log &
diff --git a/server/db/business.approve.permissions.sql b/server/db/business.approve.permissions.sql
new file mode 100644
index 0000000..65eb0f1
--- /dev/null
+++ b/server/db/business.approve.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approve:create', '鏂板缓瀹℃壒淇℃伅璁板綍琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approve:delete', '鍒犻櫎瀹℃壒淇℃伅璁板綍琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approve:update', '淇敼瀹℃壒淇℃伅璁板綍琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approve:query', '鏌ヨ瀹℃壒淇℃伅璁板綍琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approve:exportExcel', '瀵煎嚭瀹℃壒淇℃伅璁板綍琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.car_event.permissions.sql b/server/db/business.car_event.permissions.sql
new file mode 100644
index 0000000..fc5f67b
--- /dev/null
+++ b/server/db/business.car_event.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:carevent:create', '鏂板缓鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:carevent:delete', '鍒犻櫎鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:carevent:update', '淇敼鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:carevent:query', '鏌ヨ鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:carevent:exportExcel', '瀵煎嚭鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.cars.permissions.sql b/server/db/business.cars.permissions.sql
new file mode 100644
index 0000000..75d8bbe
--- /dev/null
+++ b/server/db/business.cars.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:cars:create', '鏂板缓杞﹁締淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:cars:delete', '鍒犻櫎杞﹁締淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:cars:update', '淇敼杞﹁締淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:cars:query', '鏌ヨ杞﹁締淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:cars:exportExcel', '瀵煎嚭杞﹁締淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.category.permissions.sql b/server/db/business.category.permissions.sql
new file mode 100644
index 0000000..906b384
--- /dev/null
+++ b/server/db/business.category.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:category:create', '鏂板缓鍒嗙被淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:category:delete', '鍒犻櫎鍒嗙被淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:category:update', '淇敼鍒嗙被淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:category:query', '鏌ヨ鍒嗙被淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:category:exportExcel', '瀵煎嚭鍒嗙被淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.company.permissions.sql b/server/db/business.company.permissions.sql
new file mode 100644
index 0000000..a7469e1
--- /dev/null
+++ b/server/db/business.company.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:company:create', '鏂板缓浼佷笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:company:delete', '鍒犻櫎浼佷笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:company:update', '淇敼浼佷笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:company:query', '鏌ヨ浼佷笟淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:company:exportExcel', '瀵煎嚭浼佷笟淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.device.permissions.sql b/server/db/business.device.permissions.sql
new file mode 100644
index 0000000..1ff2fca
--- /dev/null
+++ b/server/db/business.device.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:device:create', '鏂板缓璁惧淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:device:delete', '鍒犻櫎璁惧淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:device:update', '淇敼璁惧淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:device:query', '鏌ヨ璁惧淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:device:exportExcel', '瀵煎嚭璁惧淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.device_event.permissions.sql b/server/db/business.device_event.permissions.sql
new file mode 100644
index 0000000..3a0f26d
--- /dev/null
+++ b/server/db/business.device_event.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:deviceevent:create', '鏂板缓闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:deviceevent:delete', '鍒犻櫎闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:deviceevent:update', '淇敼闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:deviceevent:query', '鏌ヨ闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:deviceevent:exportExcel', '瀵煎嚭闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.device_role.permissions.sql b/server/db/business.device_role.permissions.sql
new file mode 100644
index 0000000..2299283
--- /dev/null
+++ b/server/db/business.device_role.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:devicerole:create', '鏂板缓闂ㄧ瑙掕壊淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:devicerole:delete', '鍒犻櫎闂ㄧ瑙掕壊淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:devicerole:update', '淇敼闂ㄧ瑙掕壊淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:devicerole:query', '鏌ヨ闂ㄧ瑙掕壊淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:devicerole:exportExcel', '瀵煎嚭闂ㄧ瑙掕壊淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.empower.permissions.sql b/server/db/business.empower.permissions.sql
new file mode 100644
index 0000000..0cfc7b4
--- /dev/null
+++ b/server/db/business.empower.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:empower:create', '鏂板缓浜哄憳鎺堟潈瀵煎叆璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:empower:delete', '鍒犻櫎浜哄憳鎺堟潈瀵煎叆璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:empower:update', '淇敼浜哄憳鎺堟潈瀵煎叆璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:empower:query', '鏌ヨ浜哄憳鎺堟潈瀵煎叆璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:empower:exportExcel', '瀵煎嚭浜哄憳鎺堟潈瀵煎叆璁板綍(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.interface_log.permissions.sql b/server/db/business.interface_log.permissions.sql
new file mode 100644
index 0000000..18316c8
--- /dev/null
+++ b/server/db/business.interface_log.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:interfacelog:create', '鏂板缓涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:interfacelog:delete', '鍒犻櫎涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:interfacelog:update', '淇敼涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:interfacelog:query', '鏌ヨ涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:interfacelog:exportExcel', '瀵煎嚭涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.member.permissions.sql b/server/db/business.member.permissions.sql
new file mode 100644
index 0000000..5bc752c
--- /dev/null
+++ b/server/db/business.member.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:member:create', '鏂板缓浜哄憳淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:member:delete', '鍒犻櫎浜哄憳淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:member:update', '淇敼浜哄憳淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:member:query', '鏌ヨ浜哄憳淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:member:exportExcel', '瀵煎嚭浜哄憳淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.member_card.permissions.sql b/server/db/business.member_card.permissions.sql
new file mode 100644
index 0000000..9855bd4
--- /dev/null
+++ b/server/db/business.member_card.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:membercard:create', '鏂板缓鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:membercard:delete', '鍒犻櫎鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:membercard:update', '淇敼鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:membercard:query', '鏌ヨ鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:membercard:exportExcel', '瀵煎嚭鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.member_role.permissions.sql b/server/db/business.member_role.permissions.sql
new file mode 100644
index 0000000..a563a8c
--- /dev/null
+++ b/server/db/business.member_role.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:memberrole:create', '鏂板缓浜哄憳瑙掕壊鍏宠仈淇℃伅', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:memberrole:delete', '鍒犻櫎浜哄憳瑙掕壊鍏宠仈淇℃伅', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:memberrole:update', '淇敼浜哄憳瑙掕壊鍏宠仈淇℃伅', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:memberrole:query', '鏌ヨ浜哄憳瑙掕壊鍏宠仈淇℃伅', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:memberrole:exportExcel', '瀵煎嚭浜哄憳瑙掕壊鍏宠仈淇℃伅(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.park_book.permissions.sql b/server/db/business.park_book.permissions.sql
new file mode 100644
index 0000000..9f7a7de
--- /dev/null
+++ b/server/db/business.park_book.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parkbook:create', '鏂板缓杞﹁締棰勭害璁板綍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parkbook:delete', '鍒犻櫎杞﹁締棰勭害璁板綍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parkbook:update', '淇敼杞﹁締棰勭害璁板綍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parkbook:query', '鏌ヨ杞﹁締棰勭害璁板綍淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parkbook:exportExcel', '瀵煎嚭杞﹁締棰勭害璁板綍淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.parks.permissions.sql b/server/db/business.parks.permissions.sql
new file mode 100644
index 0000000..3be2f3f
--- /dev/null
+++ b/server/db/business.parks.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parks:create', '鏂板缓鍋滆溅搴撲俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parks:delete', '鍒犻櫎鍋滆溅搴撲俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parks:update', '淇敼鍋滆溅搴撲俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parks:query', '鏌ヨ鍋滆溅搴撲俊鎭〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:parks:exportExcel', '瀵煎嚭鍋滆溅搴撲俊鎭〃(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.problem_log.permissions.sql b/server/db/business.problem_log.permissions.sql
new file mode 100644
index 0000000..97893c4
--- /dev/null
+++ b/server/db/business.problem_log.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problemlog:create', '鏂板缓璁垮绛旈璁板綍琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problemlog:delete', '鍒犻櫎璁垮绛旈璁板綍琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problemlog:update', '淇敼璁垮绛旈璁板綍琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problemlog:query', '鏌ヨ璁垮绛旈璁板綍琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problemlog:exportExcel', '瀵煎嚭璁垮绛旈璁板綍琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.problems.permissions.sql b/server/db/business.problems.permissions.sql
new file mode 100644
index 0000000..3b79212
--- /dev/null
+++ b/server/db/business.problems.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problems:create', '鏂板缓璇曢淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problems:delete', '鍒犻櫎璇曢淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problems:update', '淇敼璇曢淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problems:query', '鏌ヨ璇曢淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:problems:exportExcel', '瀵煎嚭璇曢淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.retention.permissions.sql b/server/db/business.retention.permissions.sql
new file mode 100644
index 0000000..22de20f
--- /dev/null
+++ b/server/db/business.retention.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:retention:create', '鏂板缓鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:retention:delete', '鍒犻櫎鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:retention:update', '淇敼鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:retention:query', '鏌ヨ鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:retention:exportExcel', '瀵煎嚭鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.train_time.permissions.sql b/server/db/business.train_time.permissions.sql
new file mode 100644
index 0000000..f84386b
--- /dev/null
+++ b/server/db/business.train_time.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:traintime:create', '鏂板缓浜哄憳鍩硅鏈夋晥鏈熻褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:traintime:delete', '鍒犻櫎浜哄憳鍩硅鏈夋晥鏈熻褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:traintime:update', '淇敼浜哄憳鍩硅鏈夋晥鏈熻褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:traintime:query', '鏌ヨ浜哄憳鍩硅鏈夋晥鏈熻褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:traintime:exportExcel', '瀵煎嚭浜哄憳鍩硅鏈夋晥鏈熻褰�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.visit_event.permissions.sql b/server/db/business.visit_event.permissions.sql
new file mode 100644
index 0000000..d0fe605
--- /dev/null
+++ b/server/db/business.visit_event.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visitevent:create', '鏂板缓璁垮浜嬩欢鎺ㄩ�佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visitevent:delete', '鍒犻櫎璁垮浜嬩欢鎺ㄩ�佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visitevent:update', '淇敼璁垮浜嬩欢鎺ㄩ�佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visitevent:query', '鏌ヨ璁垮浜嬩欢鎺ㄩ�佽褰曡〃', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visitevent:exportExcel', '瀵煎嚭璁垮浜嬩欢鎺ㄩ�佽褰曡〃(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/db/business.visits.permissions.sql b/server/db/business.visits.permissions.sql
new file mode 100644
index 0000000..2be3776
--- /dev/null
+++ b/server/db/business.visits.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visits:create', '鏂板缓璁垮鐢宠淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visits:delete', '鍒犻櫎璁垮鐢宠淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visits:update', '淇敼璁垮鐢宠淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visits:query', '鏌ヨ璁垮鐢宠淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:visits:exportExcel', '瀵煎嚭璁垮鐢宠淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
index 4abd1bd..3517c4e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "瀹℃壒淇℃伅璁板綍琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
new file mode 100644
index 0000000..0b18437
--- /dev/null
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
@@ -0,0 +1,90 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.PageData;
+import com.doumee.dao.business.model.CarEvent;
+import com.doumee.service.business.CarEventService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Api(tags = "鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃")
+@RestController
+@RequestMapping("/business/carEvent")
+public class CarEventController extends BaseController {
+
+ @Autowired
+ private CarEventService carEventService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:carevent:create")
+ public ApiResponse create(@RequestBody CarEvent carEvent) {
+ return ApiResponse.success(carEventService.create(carEvent));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:carevent:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ carEventService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:carevent:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ carEventService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:carevent:update")
+ public ApiResponse updateById(@RequestBody CarEvent carEvent) {
+ carEventService.updateById(carEvent);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:carevent:query")
+ public ApiResponse<PageData<CarEvent>> findPage (@RequestBody PageWrap<CarEvent> pageWrap) {
+ return ApiResponse.success(carEventService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:carevent:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<CarEvent> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(CarEvent.class).export(carEventService.findPage(pageWrap).getRecords(), "鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:carevent:query")
+ public ApiResponse findById(@PathVariable Integer id) {
+ return ApiResponse.success(carEventService.findById(id));
+ }
+}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
index 2c609af..3ea4554 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "杞﹁締淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
index b55d756..d243715 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "鍒嗙被淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index ed8f9ac..1f69ec9 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "浼佷笟淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
index 3b4975a..ff7f611 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "璁惧淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
index a6653c3..19cc1f1 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
new file mode 100644
index 0000000..2a2f474
--- /dev/null
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
@@ -0,0 +1,90 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.PageData;
+import com.doumee.dao.business.model.DeviceRole;
+import com.doumee.service.business.DeviceRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Api(tags = "闂ㄧ瑙掕壊淇℃伅琛�")
+@RestController
+@RequestMapping("/business/deviceRole")
+public class DeviceRoleController extends BaseController {
+
+ @Autowired
+ private DeviceRoleService deviceRoleService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:devicerole:create")
+ public ApiResponse create(@RequestBody DeviceRole deviceRole) {
+ return ApiResponse.success(deviceRoleService.create(deviceRole));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:devicerole:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ deviceRoleService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:devicerole:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ deviceRoleService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:devicerole:update")
+ public ApiResponse updateById(@RequestBody DeviceRole deviceRole) {
+ deviceRoleService.updateById(deviceRole);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:devicerole:query")
+ public ApiResponse<PageData<DeviceRole>> findPage (@RequestBody PageWrap<DeviceRole> pageWrap) {
+ return ApiResponse.success(deviceRoleService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:devicerole:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(DeviceRole.class).export(deviceRoleService.findPage(pageWrap).getRecords(), "闂ㄧ瑙掕壊淇℃伅琛�", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:devicerole:query")
+ public ApiResponse findById(@PathVariable Integer id) {
+ return ApiResponse.success(deviceRoleService.findById(id));
+ }
+}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
index fb07997..5da9575 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "浜哄憳鎺堟潈瀵煎叆璁板綍")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/InterfaceLogController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/InterfaceLogController.java
index d8b8351..54e2f96 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/InterfaceLogController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/InterfaceLogController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
index b330362..b3cea45 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index d1ae433..181333b 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "浜哄憳淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java
index e72835e..56b342d 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "浜哄憳瑙掕壊鍏宠仈淇℃伅")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
index 4a8ae14..28b9742 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "杞﹁締棰勭害璁板綍淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java
index fa0baa4..ebd49c7 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "鍋滆溅搴撲俊鎭〃")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
index f1097bd..539af9e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "璁垮绛旈璁板綍琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
index 3eee2dc..1cfe53c 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "璇曢淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
index 44cd442..644ef3b 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java
index bc6e8db..d18bdbe 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "浜哄憳鍩硅鏈夋晥鏈熻褰�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
new file mode 100644
index 0000000..e4f2e72
--- /dev/null
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
@@ -0,0 +1,90 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.PageData;
+import com.doumee.dao.business.model.VisitEvent;
+import com.doumee.service.business.VisitEventService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Api(tags = "璁垮浜嬩欢鎺ㄩ�佽褰曡〃")
+@RestController
+@RequestMapping("/business/visitEvent")
+public class VisitEventController extends BaseController {
+
+ @Autowired
+ private VisitEventService visitEventService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:visitevent:create")
+ public ApiResponse create(@RequestBody VisitEvent visitEvent) {
+ return ApiResponse.success(visitEventService.create(visitEvent));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:visitevent:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ visitEventService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:visitevent:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ visitEventService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:visitevent:update")
+ public ApiResponse updateById(@RequestBody VisitEvent visitEvent) {
+ visitEventService.updateById(visitEvent);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:visitevent:query")
+ public ApiResponse<PageData<VisitEvent>> findPage (@RequestBody PageWrap<VisitEvent> pageWrap) {
+ return ApiResponse.success(visitEventService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:visitevent:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<VisitEvent> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(VisitEvent.class).export(visitEventService.findPage(pageWrap).getRecords(), "璁垮浜嬩欢鎺ㄩ�佽褰曡〃", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:visitevent:query")
+ public ApiResponse findById(@PathVariable Integer id) {
+ return ApiResponse.success(visitEventService.findById(id));
+ }
+}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java
index 51e5c5b..890a6af 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Api(tags = "璁垮鐢宠淇℃伅琛�")
@RestController
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
index eafef2c..7dc711c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ApproveMapper extends BaseMapper<Approve> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CarEventMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CarEventMapper.java
new file mode 100644
index 0000000..f3f07e0
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CarEventMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.CarEvent;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface CarEventMapper extends BaseMapper<CarEvent> {
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CarsMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CarsMapper.java
index 06906ed..472c9ee 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CarsMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CarsMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface CarsMapper extends BaseMapper<Cars> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CategoryMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CategoryMapper.java
index ac563c6..420b930 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CategoryMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CategoryMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface CategoryMapper extends BaseMapper<Category> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
index d900055..edc21fa 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface CompanyMapper extends BaseMapper<Company> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceEventMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceEventMapper.java
index 7644d56..4eb9aa4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceEventMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceEventMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface DeviceEventMapper extends BaseMapper<DeviceEvent> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceMapper.java
index 403b8d1..02a419c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface DeviceMapper extends BaseMapper<Device> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceRoleMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceRoleMapper.java
new file mode 100644
index 0000000..1c2f59b
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/DeviceRoleMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.DeviceRole;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface DeviceRoleMapper extends BaseMapper<DeviceRole> {
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/EmpowerMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/EmpowerMapper.java
index 0874f4f..b169bd3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/EmpowerMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/EmpowerMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface EmpowerMapper extends BaseMapper<Empower> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/InterfaceLogMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/InterfaceLogMapper.java
index deed35d..5626f4b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/InterfaceLogMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/InterfaceLogMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface InterfaceLogMapper extends BaseMapper<InterfaceLog> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberCardMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberCardMapper.java
index c0b70ef..4d14eed 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberCardMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberCardMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface MemberCardMapper extends BaseMapper<MemberCard> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
index 846d258..ebb6e19 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface MemberMapper extends BaseMapper<Member> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberRoleMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberRoleMapper.java
index b7c1f26..96b1eb9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberRoleMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/MemberRoleMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface MemberRoleMapper extends BaseMapper<MemberRole> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ParkBookMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ParkBookMapper.java
index cedff24..7551e1e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ParkBookMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ParkBookMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ParkBookMapper extends BaseMapper<ParkBook> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ParksMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ParksMapper.java
index 0a8cd7c..74f98f5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ParksMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ParksMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ParksMapper extends BaseMapper<Parks> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemLogMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemLogMapper.java
index 8a42fba..09265b5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemLogMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemLogMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ProblemLogMapper extends BaseMapper<ProblemLog> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemsMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemsMapper.java
index 66d5099..ad8b8d7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemsMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ProblemsMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ProblemsMapper extends BaseMapper<Problems> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/RetentionMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/RetentionMapper.java
index 62c6e01..016e22a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/RetentionMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/RetentionMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface RetentionMapper extends BaseMapper<Retention> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/TrainTimeMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/TrainTimeMapper.java
index c86c541..e40946b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/TrainTimeMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/TrainTimeMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface TrainTimeMapper extends BaseMapper<TrainTime> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitEventMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitEventMapper.java
new file mode 100644
index 0000000..02d252d
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitEventMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.VisitEvent;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface VisitEventMapper extends BaseMapper<VisitEvent> {
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitsMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitsMapper.java
index ae01c26..28d77b8 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitsMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/VisitsMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface VisitsMapper extends BaseMapper<Visits> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index 68ab9ab..d9416fe 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
@@ -13,7 +13,7 @@
/**
* 瀹℃壒淇℃伅璁板綍琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("瀹℃壒淇℃伅璁板綍琛�")
@@ -91,8 +91,8 @@
@ExcelColumn(name="鏄惁缁堝")
private Integer isEndCheck;
- @ApiModelProperty(value = "璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�")
+ @ApiModelProperty(value = "璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�", example = "1")
@ExcelColumn(name="璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�")
- private String visitId;
+ private Integer visitId;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
new file mode 100644
index 0000000..d6aedd1
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
@@ -0,0 +1,237 @@
+package com.doumee.dao.business.model;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Data
+@ApiModel("鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃")
+@TableName("`car_event`")
+public class CarEvent {
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name="涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ @ExcelColumn(name="浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ private String eventId;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
+ @ExcelColumn(name="浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
+ private String srcIndex;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
+ @ExcelColumn(name="浜嬩欢婧愮被鍨�")
+ private String srcType;
+
+ @ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
+ @ExcelColumn(name="浜嬩欢婧愬悕绉�")
+ private String srcName;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ @ExcelColumn(name="浜嬩欢绫诲瀷")
+ private String eventType;
+
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
+ 1-寮�濮�
+ 2-鍋滄
+ 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
+ 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
+ 1-寮�濮�
+ 2-鍋滄
+ 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
+ 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ private Integer status;
+
+ @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
+ @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
+ private String timeout;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ private String happenTime;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
+ @ExcelColumn(name="浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
+ private String srcParentIndex;
+
+ @ApiModelProperty(value = "鏄惁榛戝悕鍗曟爣璇嗭紙1-榛戝悕鍗� 0-闈為粦鍚嶅崟锛�")
+ @ExcelColumn(name="鏄惁榛戝悕鍗曟爣璇嗭紙1-榛戝悕鍗� 0-闈為粦鍚嶅崟锛�")
+ private String alarmCar;
+
+ @ApiModelProperty(value = "杞﹁締灞炴�у悕绉�")
+ @ExcelColumn(name="杞﹁締灞炴�у悕绉�")
+ private String carAttributeName;
+
+ @ApiModelProperty(value = "鍗″彿")
+ @ExcelColumn(name="鍗″彿")
+ private String cardNo;
+
+ @ApiModelProperty(value = "浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢
+ 2:涓婁紶鍥剧墖
+ 3:鍏ュ満
+ 4:鍑哄満
+ 5:杞︾墝鐭
+ 6:鍥剧墖閲嶄紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鍙�,1:鍘嬬嚎浜嬩欢
+ 2:涓婁紶鍥剧墖
+ 3:鍏ュ満
+ 4:鍑哄満
+ 5:杞︾墝鐭
+ 6:鍥剧墖閲嶄紶")
+ private Integer eventCmd;
+
+ @ApiModelProperty(value = "浜嬩欢缂栧彿")
+ @ExcelColumn(name="浜嬩欢缂栧彿")
+ private String eventIndex;
+
+ @ApiModelProperty(value = "鍑哄叆鍙ｇ紪鍙�")
+ @ExcelColumn(name="鍑哄叆鍙ｇ紪鍙�")
+ private String gateIndex;
+
+ @ApiModelProperty(value = "鍑哄叆鍙ｅ悕绉�")
+ @ExcelColumn(name="鍑哄叆鍙ｅ悕绉�")
+ private String gateName;
+
+ @ApiModelProperty(value = "鏀捐鏉冮檺", example = "1")
+ @ExcelColumn(name="鏀捐鏉冮檺")
+ private Integer releaseAuth;
+
+ @ApiModelProperty(value = "鏀捐鍘熷洜", example = "1")
+ @ExcelColumn(name="鏀捐鍘熷洜")
+ private Integer releaseReason;
+
+ @ApiModelProperty(value = "鏀捐缁撴灉", example = "1")
+ @ExcelColumn(name="鏀捐缁撴灉")
+ private Integer releaseResult;
+
+ @ApiModelProperty(value = "鏂颁綋绯绘斁琛岀粨鏋�", example = "1")
+ @ExcelColumn(name="鏂颁綋绯绘斁琛岀粨鏋�")
+ private Integer releaseResultEx;
+
+ @ApiModelProperty(value = "鏀捐鏂瑰紡", example = "1")
+ @ExcelColumn(name="鏀捐鏂瑰紡")
+ private Integer releaseWay;
+
+ @ApiModelProperty(value = "杩涘嚭鍦虹被鍨嬶紝0锛氳繘鍦猴紝1锛氬嚭鍦� ", example = "1")
+ @ExcelColumn(name="杩涘嚭鍦虹被鍨嬶紝0锛氳繘鍦猴紝1锛氬嚭鍦� ")
+ private Integer inoutType;
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�")
+ private String plateNos;
+
+ @ApiModelProperty(value = "杞﹁締涓诲搧鐗�", example = "1")
+ @ExcelColumn(name="杞﹁締涓诲搧鐗�")
+ private Integer mainLogo;
+
+ @ApiModelProperty(value = "鍋滆溅搴撶紪鍙�")
+ @ExcelColumn(name="鍋滆溅搴撶紪鍙�")
+ private String parkIndex;
+
+ @ApiModelProperty(value = "鍋滆溅搴撳悕绉� ")
+ @ExcelColumn(name="鍋滆溅搴撳悕绉� ")
+ private String parkName;
+
+ @ApiModelProperty(value = "杞︾墝棰滆壊")
+ @ExcelColumn(name="杞︾墝棰滆壊")
+ private String plateColor;
+
+ @ApiModelProperty(value = "杞︾墝缃俊搴�", example = "1")
+ @ExcelColumn(name="杞︾墝缃俊搴�")
+ private BigDecimal plateBelieve;
+
+ @ApiModelProperty(value = "杞︾墝绫诲瀷 ", example = "1")
+ @ExcelColumn(name="杞︾墝绫诲瀷 ")
+ private Integer plateType;
+
+ @ApiModelProperty(value = "杞﹂亾缂栧彿 ")
+ @ExcelColumn(name="杞﹂亾缂栧彿 ")
+ private String roadwayIndex;
+
+ @ApiModelProperty(value = "杞﹂亾鍚嶇О")
+ @ExcelColumn(name="杞﹂亾鍚嶇О")
+ private String roadwayName;
+
+ @ApiModelProperty(value = "杞﹂亾绫诲瀷 1锛氬叆鍦鸿溅閬� 2锛氬嚭鍦轰笉鏀惰垂杞﹂亾 3锛氬嚭鍦虹即璐硅溅閬� 4锛氫腑澶即璐硅溅閬� ", example = "1")
+ @ExcelColumn(name="杞﹂亾绫诲瀷 1锛氬叆鍦鸿溅閬� 2锛氬嚭鍦轰笉鏀惰垂杞﹂亾 3锛氬嚭鍦虹即璐硅溅閬� 4锛氫腑澶即璐硅溅閬� ")
+ private Integer roadwayType;
+
+ @ApiModelProperty(value = "杞﹁締瀛愬搧鐗�", example = "1")
+ @ExcelColumn(name="杞﹁締瀛愬搧鐗�")
+ private Integer subLogo;
+
+ @ApiModelProperty(value = "瀛愬搧鐗屽勾娆� ", example = "1")
+ @ExcelColumn(name="瀛愬搧鐗屽勾娆� ")
+ private Integer subModel;
+
+ @ApiModelProperty(value = "鏃堕棿 ISO鏍煎紡")
+ @ExcelColumn(name="鏃堕棿 ISO鏍煎紡")
+ private String timestr;
+
+ @ApiModelProperty(value = "杞﹁締灞炴�� ", example = "1")
+ @ExcelColumn(name="杞﹁締灞炴�� ")
+ private Integer vehicleClass;
+
+ @ApiModelProperty(value = "杞﹁締棰滆壊", example = "1")
+ @ExcelColumn(name="杞﹁締棰滆壊")
+ private Integer vehicleColor;
+
+ @ApiModelProperty(value = "杞﹁締绫诲瀷", example = "1")
+ @ExcelColumn(name="杞﹁締绫诲瀷")
+ private Integer vehicleType;
+
+ @ApiModelProperty(value = "杞﹁締鍥剧墖")
+ @ExcelColumn(name="杞﹁締鍥剧墖")
+ private String vehiclePicUrl;
+
+ @ApiModelProperty(value = "杞︾墝鍥剧墖")
+ @ExcelColumn(name="杞︾墝鍥剧墖")
+ private String platePicUrl;
+
+ @ApiModelProperty(value = "鍥剧墖鏈嶅姟鍣ㄧ紪鍙� ")
+ @ExcelColumn(name="鍥剧墖鏈嶅姟鍣ㄧ紪鍙� ")
+ private String svrIndex;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index 77a010c..4704f20 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -13,7 +13,7 @@
/**
* 杞﹁締淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("杞﹁締淇℃伅琛�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index f603aca..7bb056e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -13,7 +13,7 @@
/**
* 鍒嗙被淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("鍒嗙被淇℃伅琛�")
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 cf87f9f..c991acf 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
@@ -13,7 +13,7 @@
/**
* 浼佷笟淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浼佷笟淇℃伅琛�")
@@ -104,9 +104,9 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
- @ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "ERP鏍囪瘑")
@ExcelColumn(name="ERP鏍囪瘑")
- private Integer erpId;
+ private String erpId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -117,9 +117,9 @@
@ExcelColumn(name="ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer erpStatus;
- @ApiModelProperty(value = "閽夐拤鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "閽夐拤鏍囪瘑")
@ExcelColumn(name="閽夐拤鏍囪瘑")
- private Integer ddId;
+ private String ddId;
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
@ExcelColumn(name="閽夐拤鍚屾鏃堕棿")
@@ -130,6 +130,10 @@
@ExcelColumn(name="閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer ddStatus;
+ @ApiModelProperty(value = "椋炰功鏍囪瘑")
+ @ExcelColumn(name="椋炰功鏍囪瘑")
+ private String fsId;
+
@ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@ExcelColumn(name="椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer fsStatus;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index 2a76f72..0e8cd14 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -14,7 +14,7 @@
/**
* 璁惧淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("璁惧淇℃伅琛�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 5af3dcd..1ebe053 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -13,7 +13,7 @@
/**
* 闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃")
@@ -51,66 +51,216 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)", example = "1")
- @ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
- private Integer companyId;
+ @ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ @ExcelColumn(name="浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ private String eventId;
- @ApiModelProperty(value = "浜鸿劯鐓х墖")
- @ExcelColumn(name="浜鸿劯鐓х墖")
- private String faceImg;
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ @ExcelColumn(name="浜嬩欢绫诲瀷")
+ private String eventType;
- @ApiModelProperty(value = "鍋ュ悍鐮�")
- @ExcelColumn(name="鍋ュ悍鐮�")
- private String imgurl;
+ @ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
+ @ExcelColumn(name="浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
+ private String srcType;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
- private Integer type;
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ private String happenTime;
- @ApiModelProperty(value = "璁垮鍚嶇О")
- @ExcelColumn(name="璁垮鍚嶇О")
+ @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜
+ ")
+ @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜
+ ")
+ private String srcIndex;
+
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ @ExcelColumn(name="闂ㄧ鍚嶇О")
+ private String srcName;
+
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
+ 1-寮�濮�
+ 2-鍋滄
+ 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
+ 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
+ 1-寮�濮�
+ 2-鍋滄
+ 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
+ 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ private Integer status;
+
+ @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿锛屽崟浣嶏細绉掞紝鐬椂浜嬩欢姝ゅ瓧娈靛～0", example = "1")
+ @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿锛屽崟浣嶏細绉掞紝鐬椂浜嬩欢姝ゅ瓧娈靛～0")
+ private Integer timeout;
+
+ @ApiModelProperty(value = "浜哄憳閫氶亾鍙�", example = "1")
+ @ExcelColumn(name="浜哄憳閫氶亾鍙�")
+ private Integer extAccessChannel;
+
+ @ApiModelProperty(value = "鎶ヨ杈撳叆/闃插尯閫氶亾", example = "1")
+ @ExcelColumn(name="鎶ヨ杈撳叆/闃插尯閫氶亾")
+ private Integer extEventAlarmInID;
+
+ @ApiModelProperty(value = "鎶ヨ杈撳嚭閫氶亾", example = "1")
+ @ExcelColumn(name="鎶ヨ杈撳嚭閫氶亾")
+ private Integer extEventAlarmOutID;
+
+ @ApiModelProperty(value = "鍗″彿")
+ @ExcelColumn(name="鍗″彿")
+ private String extEventCardNo;
+
+ @ApiModelProperty(value = "浜嬩欢杈撳叆閫氶亾", example = "1")
+ @ExcelColumn(name="浜嬩欢杈撳叆閫氶亾")
+ private Integer extEventCaseID;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷浠ｇ爜", example = "1")
+ @ExcelColumn(name="浜嬩欢绫诲瀷浠ｇ爜")
+ private Integer extEventCode;
+
+ @ApiModelProperty(value = "闂ㄧ紪鍙�", example = "1")
+ @ExcelColumn(name="闂ㄧ紪鍙�")
+ private Integer extEventDoorID;
+
+ @ApiModelProperty(value = "韬唤璇佸浘鐗嘦RL")
+ @ExcelColumn(name="韬唤璇佸浘鐗嘦RL")
+ private String extEventIDCardPictureURL;
+
+ @ApiModelProperty(value = "杩涘嚭鏂瑰悜 1-杩� 0-鍑� -1:鏈煡 瑕佹眰锛氳繘闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�1锛屽嚭闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�2", example = "1")
+ @ExcelColumn(name="杩涘嚭鏂瑰悜 1-杩� 0-鍑� -1:鏈煡 瑕佹眰锛氳繘闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�1锛屽嚭闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�2")
+ private Integer extEventInOut;
+
+ @ApiModelProperty(value = "灏卞湴鎺у埗鍣╥d", example = "1")
+ @ExcelColumn(name="灏卞湴鎺у埗鍣╥d")
+ private Integer extEventLocalControllerID;
+
+ @ApiModelProperty(value = "涓昏澶囨嫧鐮�", example = "1")
+ @ExcelColumn(name="涓昏澶囨嫧鐮�")
+ private Integer extEventMainDevID;
+
+ @ApiModelProperty(value = "浜哄憳缂栧彿")
+ @ExcelColumn(name="浜哄憳缂栧彿")
+ private String extEventPersonNo;
+
+ @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥
+ 1-IC璇诲崱鍣�
+ 2-韬唤璇佽鍗″櫒
+ 3-浜岀淮鐮佽鍗″櫒
+ 4-鎸囩汗澶�", example = "1")
+ @ExcelColumn(name="璇诲崱鍣ㄧ被鍒�0-鏃犳晥
+ 1-IC璇诲崱鍣�
+ 2-韬唤璇佽鍗″櫒
+ 3-浜岀淮鐮佽鍗″櫒
+ 4-鎸囩汗澶�")
+ private Integer extEventReaderKind;
+
+ @ApiModelProperty(value = "璇诲崱鍣╥d", example = "1")
+ @ExcelColumn(name="璇诲崱鍣╥d")
+ private Integer extEventReaderID;
+
+ @ApiModelProperty(value = "鍥剧墖鐨剈rl")
+ @ExcelColumn(name="鍥剧墖鐨剈rl")
+ private String extEventPictureURL;
+
+ @ApiModelProperty(value = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
+ @ExcelColumn(name="鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
+ private String svrIndexCode;
+
+ @ApiModelProperty(value = "鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶
+ 2-涓績缁�1涓婁紶
+ 3-涓績缁�2涓婁紶
+ 0-鏃犳晥", example = "1")
+ @ExcelColumn(name="鎶ュ憡涓婁紶閫氶亾,1-甯冮槻int涓婁紶
+ 2-涓績缁�1涓婁紶
+ 3-涓績缁�2涓婁紶
+ 0-鏃犳晥")
+ private Integer extEventReportChannel;
+
+ @ApiModelProperty(value = "缇ょ粍缂栧彿", example = "1")
+ @ExcelColumn(name="缇ょ粍缂栧彿")
+ private Integer extEventRoleID;
+
+ @ApiModelProperty(value = "鍒嗘帶鍒跺櫒纭欢ID", example = "1")
+ @ExcelColumn(name="鍒嗘帶鍒跺櫒纭欢ID")
+ private Integer extEventSubDevID;
+
+ @ApiModelProperty(value = "鍒峰崱娆℃暟", example = "1")
+ @ExcelColumn(name="鍒峰崱娆℃暟")
+ private Integer extEventSwipNum;
+
+ @ApiModelProperty(value = "闂ㄧ浜嬩欢绫诲瀷", example = "1")
+ @ExcelColumn(name="闂ㄧ浜嬩欢绫诲瀷")
+ private Integer extEventType;
+
+ @ApiModelProperty(value = "澶氶噸璁よ瘉搴忓彿", example = "1")
+ @ExcelColumn(name="澶氶噸璁よ瘉搴忓彿")
+ private Long extEventVerifyID;
+
+ @ApiModelProperty(value = "鐧藉悕鍗曞崟鍙�")
+ @ExcelColumn(name="鐧藉悕鍗曞崟鍙�")
+ private String extEventWhiteListNo;
+
+ @ApiModelProperty(value = "浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
+ @ExcelColumn(name="浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
+ private String extReceiveTime;
+
+ @ApiModelProperty(value = "浜嬩欢娴佹按鍙凤紝涓�0鏃犳晥", example = "1")
+ @ExcelColumn(name="浜嬩欢娴佹按鍙凤紝涓�0鏃犳晥")
+ private Integer seq;
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛屼汉鍛樼被鍨嬶細0 鏈煡锛�1 鏅�氾紝2 鏉ュ锛�3 榛戝悕鍗曪紝4 绠＄悊鍛�", example = "1")
+ @ExcelColumn(name="鐢ㄦ埛绫诲瀷锛屼汉鍛樼被鍨嬶細0 鏈煡锛�1 鏅�氾紝2 鏉ュ锛�3 榛戝悕鍗曪紝4 绠＄悊鍛�")
+ private Integer userType;
+
+ @ApiModelProperty(value = "韬唤璇佷綇鍧�")
+ @ExcelColumn(name="韬唤璇佷綇鍧�")
+ private String address;
+
+ @ApiModelProperty(value = "韬唤璇佸嚭鐢熸棩鏈�")
+ @ExcelColumn(name="韬唤璇佸嚭鐢熸棩鏈�")
+ private String birth;
+
+ @ApiModelProperty(value = "韬唤璇佹湁鏁堟棩鏈熺粨鏉熸椂闂�")
+ @ExcelColumn(name="韬唤璇佹湁鏁堟棩鏈熺粨鏉熸椂闂�")
+ private String endDate;
+
+ @ApiModelProperty(value = "韬唤璇乮d")
+ @ExcelColumn(name="韬唤璇乮d")
+ private String idNum;
+
+ @ApiModelProperty(value = "韬唤璇佺鍙戞満鍏�")
+ @ExcelColumn(name="韬唤璇佺鍙戞満鍏�")
+ private String issuingAuthority;
+
+ @ApiModelProperty(value = "韬唤璇佸鍚�")
+ @ExcelColumn(name="韬唤璇佸鍚�")
private String name;
- @ApiModelProperty(value = "璁垮骞撮緞")
- @ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date birthday;
+ @ApiModelProperty(value = "韬唤璇佹�у埆 0-鏈煡1-鐢� 2-濂�", example = "1")
+ @ExcelColumn(name="韬唤璇佹�у埆 0-鏈煡1-鐢� 2-濂�")
+ private Integer sex;
- @ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�")
- private String phone;
+ @ApiModelProperty(value = "韬唤璇佹湁鏁堟棩鏈熷紑濮嬫椂闂�")
+ @ExcelColumn(name="韬唤璇佹湁鏁堟棩鏈熷紑濮嬫椂闂�")
+ private String startDate;
- @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- @ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- private String idcardNo;
+ @ApiModelProperty(value = "鏄惁闀挎湡鏈夋晥,0-鍚︼紙鏈夋晥鎴鏃ユ湡鏈夋晥锛�1-鏄紙鏈夋晥鎴鏃ユ湡鏃犳晥锛�", example = "1")
+ @ExcelColumn(name="鏄惁闀挎湡鏈夋晥,0-鍚︼紙鏈夋晥鎴鏃ユ湡鏈夋晥锛�1-鏄紙鏈夋晥鎴鏃ユ湡鏃犳晥锛�")
+ private Integer termOfValidity;
- @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
- private String idcardDecode;
+ @ApiModelProperty(value = "閫氶亾鍙�", example = "1")
+ @ExcelColumn(name="閫氶亾鍙�")
+ private Integer accessChannel;
- @ApiModelProperty(value = "宸ュ彿")
- @ExcelColumn(name="宸ュ彿")
- private String code;
+ @ApiModelProperty(value = "閫氶亾杩涗汉鏁�", example = "1")
+ @ExcelColumn(name="閫氶亾杩涗汉鏁�")
+ private Integer entryTimes;
- @ApiModelProperty(value = "鐝")
- @ExcelColumn(name="鐝")
- private String classes;
+ @ApiModelProperty(value = "閫氶亾鍑轰汉鏁�", example = "1")
+ @ExcelColumn(name="閫氶亾鍑轰汉鏁�")
+ private Integer exitTimes;
- @ApiModelProperty(value = "鍙戠敓鏃堕棿")
- @ExcelColumn(name="鍙戠敓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date eventDate;
-
- @ApiModelProperty(value = "璁垮ID(鍏宠仈member)", example = "1")
- @ExcelColumn(name="璁垮ID(鍏宠仈member)")
- private Integer memberId;
-
- @ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�")
- @ExcelColumn(name="浜嬩欢绫诲瀷鐮�")
- private String eventCode;
-
- @ApiModelProperty(value = "鍔ㄤ綔绫诲瀷 0鍑� 1杩�", example = "1")
- @ExcelColumn(name="鍔ㄤ綔绫诲瀷 0鍑� 1杩�")
- private Integer inoutType;
+ @ApiModelProperty(value = "閫氶亾鎬婚�氳浜烘暟", example = "1")
+ @ExcelColumn(name="閫氶亾鎬婚�氳浜烘暟")
+ private Integer totalTimes;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
new file mode 100644
index 0000000..5eff5cf
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -0,0 +1,86 @@
+package com.doumee.dao.business.model;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 闂ㄧ瑙掕壊淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Data
+@ApiModel("闂ㄧ瑙掕壊淇℃伅琛�")
+@TableName("`door_role`")
+public class DeviceRole {
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name="涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private String creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private String edirot;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "鍚嶇О")
+ @ExcelColumn(name="鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "鏄惁榛樿 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁榛樿 0鍚� 1鏄�")
+ private Integer isDefault;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ private String type;
+
+ @ApiModelProperty(value = "鍙娇鐢ㄩ棬绂佺紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ @ExcelColumn(name="鍙娇鐢ㄩ棬绂佺紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ private String doorIds;
+
+ @ApiModelProperty(value = "鍙娇鐢ㄩ棬绂佸悕绉帮紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ @ExcelColumn(name="鍙娇鐢ㄩ棬绂佸悕绉帮紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ private String doorNames;
+
+ @ApiModelProperty(value = "鍏宠仈杞﹀簱缂栫爜闆嗗悎")
+ @ExcelColumn(name="鍏宠仈杞﹀簱缂栫爜闆嗗悎")
+ private String parkIds;
+
+ @ApiModelProperty(value = "鍏宠仈杞﹀簱鍚嶇О闆嗗悎")
+ @ExcelColumn(name="鍏宠仈杞﹀簱鍚嶇О闆嗗悎")
+ private String parkNames;
+
+ @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
+ @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
+ private Integer status;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index c2e2136..40dbea2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -13,7 +13,7 @@
/**
* 浜哄憳鎺堟潈瀵煎叆璁板綍
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳鎺堟潈瀵煎叆璁板綍")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
index 5759d35..76925a7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
@@ -13,7 +13,7 @@
/**
* 涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍")
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 47773d3..f20de51 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
@@ -13,7 +13,7 @@
/**
* 浜哄憳淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳淇℃伅琛�")
@@ -125,8 +125,8 @@
@ExcelColumn(name="娴峰悍鏍囪瘑")
private Integer hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@@ -176,4 +176,13 @@
@ExcelColumn(name="闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄oor_role)")
private Integer roleId;
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
+ @ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date roleDate;
+
+ @ApiModelProperty(value = "ERP缁勭粐缂栫爜")
+ @ExcelColumn(name="ERP缁勭粐缂栫爜")
+ private String erpOrgId;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index faf9078..e52aa6d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
@@ -13,7 +13,7 @@
/**
* 鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
index 4ad7b3e..9b97e1d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
@@ -13,7 +13,7 @@
/**
* 浜哄憳瑙掕壊鍏宠仈淇℃伅
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳瑙掕壊鍏宠仈淇℃伅")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
index 11dbc56..6d3f956 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
@@ -13,7 +13,7 @@
/**
* 杞﹁締棰勭害璁板綍淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("杞﹁締棰勭害璁板綍淇℃伅琛�")
@@ -71,4 +71,39 @@
@ExcelColumn(name="杞﹀簱缂栫爜锛堝叧鑱攑arks)")
private Integer parkId;
+ @ApiModelProperty(value = "绫诲瀷 0鍐呴儴浜哄憳鍥哄畾杞﹁締 1鍔冲姟璁垮鐢宠闅忕▼杞﹁締 2璁垮鐢宠闅忕▼杞﹁締", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鍐呴儴浜哄憳鍥哄畾杞﹁締 1鍔冲姟璁垮鐢宠闅忕▼杞﹁締 2璁垮鐢宠闅忕▼杞﹁締")
+ private Integer origin;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @ExcelColumn(name="寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @ExcelColumn(name="缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+
+ @ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
+ @ExcelColumn(name="浜哄憳缂栫爜")
+ private Integer memberId;
+
+ @ApiModelProperty(value = "鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鏃堕棿娈�", example = "1")
+ @ExcelColumn(name="鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鏃堕棿娈�")
+ private Integer timeType;
+
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+ @ExcelColumn(name="娴峰悍鏍囪瘑")
+ private Integer hkId2;
+
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0寰呬笅鍙� 1涓嬪彂鎴愬姛 2涓嬪彂澶辫触 3鍙栨秷涓嬪彂", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0寰呬笅鍙� 1涓嬪彂鎴愬姛 2涓嬪彂澶辫触 3鍙栨秷涓嬪彂")
+ private Integer hkStatus;
+
+ @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
+ @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date hkDate;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
index 796436c..20858cc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
@@ -13,7 +13,7 @@
/**
* 鍋滆溅搴撲俊鎭〃
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("鍋滆溅搴撲俊鎭〃")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
index 0c0237e..d7740aa 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
@@ -14,7 +14,7 @@
/**
* 璁垮绛旈璁板綍琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("璁垮绛旈璁板綍琛�")
@@ -26,18 +26,18 @@
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
- private String creator;
+ private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
- private String editor;
+ private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
@@ -52,9 +52,9 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "璁垮缂栫爜")
+ @ApiModelProperty(value = "璁垮缂栫爜", example = "1")
@ExcelColumn(name="璁垮缂栫爜")
- private String userId;
+ private Integer userId;
@ApiModelProperty(value = "鏄惁宸插畬鎴愮敵璇� 0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁宸插畬鎴愮敵璇� 0鍚� 1鏄�")
@@ -72,4 +72,24 @@
@ExcelColumn(name="绛旈鏄庣粏锛宩son瀛樺偍")
private String content;
+ @ApiModelProperty(value = "绛旈浜哄鍚�")
+ @ExcelColumn(name="绛旈浜哄鍚�")
+ private String name;
+
+ @ApiModelProperty(value = "绛旈浜烘墜鏈哄悗")
+ @ExcelColumn(name="绛旈浜烘墜鏈哄悗")
+ private String phone;
+
+ @ApiModelProperty(value = "绛旈浜烘墍灞炵粍缁囩紪鐮�", example = "1")
+ @ExcelColumn(name="绛旈浜烘墍灞炵粍缁囩紪鐮�")
+ private Integer companyId;
+
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @ExcelColumn(name="缁勭粐鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty(value = "openid")
+ @ExcelColumn(name="openid")
+ private String openid;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
index 0ec5836..07d5852 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -14,7 +14,7 @@
/**
* 璇曢淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("璇曢淇℃伅琛�")
@@ -26,18 +26,18 @@
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
- private String creator;
+ private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
- private String editor;
+ private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 3543fe6..8ec02d3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -13,7 +13,7 @@
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index 222329d..bcc63f7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
@@ -13,7 +13,7 @@
/**
* 浜哄憳鍩硅鏈夋晥鏈熻褰�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("浜哄憳鍩硅鏈夋晥鏈熻褰�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
new file mode 100644
index 0000000..728ff44
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -0,0 +1,176 @@
+package com.doumee.dao.business.model;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 璁垮浜嬩欢鎺ㄩ�佽褰曡〃
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Data
+@ApiModel("璁垮浜嬩欢鎺ㄩ�佽褰曡〃")
+@TableName("`visit_event`")
+public class VisitEvent {
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name="涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ @ExcelColumn(name="浜嬩欢鍞竴鏍囪瘑锛屽悓涓�浜嬩欢鑻ヤ笂鎶ュ娆★紝鍒欎笂鎶ヤ簨浠剁殑eventId鐩稿悓")
+ private String eventId;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
+ @ExcelColumn(name="浜嬩欢婧愮紪鍙凤紝鐗╃悊璁惧鏄祫婧愮紪鍙�")
+ private String srcIndex;
+
+ @ApiModelProperty(value = "浜嬩欢婧愮被鍨�")
+ @ExcelColumn(name="浜嬩欢婧愮被鍨�")
+ private String srcType;
+
+ @ApiModelProperty(value = "浜嬩欢婧愬悕绉�")
+ @ExcelColumn(name="浜嬩欢婧愬悕绉�")
+ private String srcName;
+
+ @ApiModelProperty(value = "浜嬩欢绫诲瀷")
+ @ExcelColumn(name="浜嬩欢绫诲瀷")
+ private String eventType;
+
+ @ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂
+ 1-寮�濮�
+ 2-鍋滄
+ 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
+ 5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
+ @ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂
+ 1-寮�濮�
+ 2-鍋滄
+ 4-浜嬩欢鑱斿姩缁撴灉鏇存柊
+ 5-浜嬩欢鍥剧墖寮傛涓婁紶")
+ private Integer status;
+
+ @ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
+ @ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
+ private String timeout;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ @ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ private String happenTime;
+
+ @ApiModelProperty(value = "浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
+ @ExcelColumn(name="浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶�")
+ private String srcParentIndex;
+
+ @ApiModelProperty(value = "璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁
+ ")
+ @ExcelColumn(name="璁垮Is锛�,瀵瑰簲璁垮鏉ヨ璁板綍涓殑orderId瀛楁
+ ")
+ private String visitorId;
+
+ @ApiModelProperty(value = "濮撳悕")
+ @ExcelColumn(name="濮撳悕")
+ private String personName;
+
+ @ApiModelProperty(value = "鎬у埆 1-鐢�2-濂�", example = "1")
+ @ExcelColumn(name="鎬у埆 1-鐢�2-濂�")
+ private Integer sex;
+
+ @ApiModelProperty(value = "璇佷欢绫诲瀷 111韬唤璇�")
+ @ExcelColumn(name="璇佷欢绫诲瀷 111韬唤璇�")
+ private String idType;
+
+ @ApiModelProperty(value = "璇佷欢鍙� ")
+ @ExcelColumn(name="璇佷欢鍙� ")
+ private String idNo;
+
+ @ApiModelProperty(value = "琚闂汉濮撳悕")
+ @ExcelColumn(name="琚闂汉濮撳悕")
+ private String beVisitedPersonName;
+
+ @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁�")
+ @ExcelColumn(name="琚闂汉鎵�灞炵粍缁�")
+ private String beVisitedPersonOrg;
+
+ @ApiModelProperty(value = "鏉ヨ鍗曚綅")
+ @ExcelColumn(name="鏉ヨ鍗曚綅")
+ private String visitorWorkUint;
+
+ @ApiModelProperty(value = "璁垮楠岃瘉鐮�")
+ @ExcelColumn(name="璁垮楠岃瘉鐮�")
+ private String visitorCode;
+
+ @ApiModelProperty(value = "鏉ヨ浜嬬敱")
+ @ExcelColumn(name="鏉ヨ浜嬬敱")
+ private String purpose;
+
+ @ApiModelProperty(value = "璇佷欢绛惧彂鏈哄叧")
+ @ExcelColumn(name="璇佷欢绛惧彂鏈哄叧")
+ private String signOrg;
+
+ @ApiModelProperty(value = "绂诲紑鏃堕棿")
+ @ExcelColumn(name="绂诲紑鏃堕棿")
+ private String startTime;
+
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
+ @ExcelColumn(name="鎵嬫満鍙风爜")
+ private String endTime;
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�")
+ private String carNo;
+
+ @ApiModelProperty(value = "鐓х墖uri")
+ @ExcelColumn(name="鐓х墖uri")
+ private String photoUrl;
+
+ @ApiModelProperty(value = "鎶撴媿鍥緐ri")
+ @ExcelColumn(name="鎶撴媿鍥緐ri")
+ private String captureUrl;
+
+ @ApiModelProperty(value = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
+ @ExcelColumn(name="鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
+ private String svrIndexCode;
+
+ @ApiModelProperty(value = "琚闂汉id")
+ @ExcelColumn(name="琚闂汉id")
+ private String beVisitedPersonId;
+
+ @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁噄d")
+ @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
+ private String beVisitedPersonOrgId;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 552070d..ae625de 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -13,7 +13,7 @@
/**
* 璁垮鐢宠淇℃伅琛�
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Data
@ApiModel("璁垮鐢宠淇℃伅琛�")
@@ -130,8 +130,8 @@
@ExcelColumn(name="鎺ュ緟浜哄憳")
private Integer receptMemberId;
- @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃牳閫氳繃 2瀹℃牳涓嶉�氳繃", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃牳閫氳繃 2瀹℃牳涓嶉�氳繃")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷", example = "1")
+ @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷")
private Integer status;
@ApiModelProperty(value = "鍒濆浜虹紪鐮�", example = "1")
@@ -176,9 +176,9 @@
@ExcelColumn(name="绛旈璁板綍缂栫爜锛堝叧鑱攗ser_answer)")
private Integer userAnswerId;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑")
@ExcelColumn(name="娴峰悍鏍囪瘑")
- private Integer hkId;
+ private String hkId;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -189,4 +189,8 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
+ @ApiModelProperty(value = "ERP鐢宠璁板綍缂栫爜")
+ @ExcelColumn(name="ERP鐢宠璁板綍缂栫爜")
+ private String erpId;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
index 877def6..9479b04 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
@@ -8,7 +8,7 @@
/**
* 瀹℃壒淇℃伅璁板綍琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ApproveService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
new file mode 100644
index 0000000..1415373
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
@@ -0,0 +1,97 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.CarEvent;
+import java.util.List;
+
+/**
+ * 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface CarEventService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param carEvent 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(CarEvent carEvent);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param carEvent 瀹炰綋瀵硅薄
+ */
+ void delete(CarEvent carEvent);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param carEvent 瀹炰綋瀵硅薄
+ */
+ void updateById(CarEvent carEvent);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param carEvents 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<CarEvent> carEvents);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return CarEvent
+ */
+ CarEvent findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param carEvent 瀹炰綋瀵硅薄
+ * @return CarEvent
+ */
+ CarEvent findOne(CarEvent carEvent);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param carEvent 瀹炰綋瀵硅薄
+ * @return List<CarEvent>
+ */
+ List<CarEvent> findList(CarEvent carEvent);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<CarEvent>
+ */
+ PageData<CarEvent> findPage(PageWrap<CarEvent> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param carEvent 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(CarEvent carEvent);
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
index 1607b81..7aaeae9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
@@ -8,7 +8,7 @@
/**
* 杞﹁締淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface CarsService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
index fd26a2d..c5ee4d9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
@@ -8,7 +8,7 @@
/**
* 鍒嗙被淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface CategoryService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
index a3b82de..5ae3811 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -8,7 +8,7 @@
/**
* 浼佷笟淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface CompanyService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
index b8abc29..f81d0be 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
@@ -8,7 +8,7 @@
/**
* 闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃Service瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface DeviceEventService {
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
new file mode 100644
index 0000000..85bf7e9
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
@@ -0,0 +1,97 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.DeviceRole;
+import java.util.List;
+
+/**
+ * 闂ㄧ瑙掕壊淇℃伅琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface DeviceRoleService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param deviceRole 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(DeviceRole deviceRole);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param deviceRole 瀹炰綋瀵硅薄
+ */
+ void delete(DeviceRole deviceRole);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param deviceRole 瀹炰綋瀵硅薄
+ */
+ void updateById(DeviceRole deviceRole);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param deviceRoles 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<DeviceRole> deviceRoles);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return DeviceRole
+ */
+ DeviceRole findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param deviceRole 瀹炰綋瀵硅薄
+ * @return DeviceRole
+ */
+ DeviceRole findOne(DeviceRole deviceRole);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param deviceRole 瀹炰綋瀵硅薄
+ * @return List<DeviceRole>
+ */
+ List<DeviceRole> findList(DeviceRole deviceRole);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<DeviceRole>
+ */
+ PageData<DeviceRole> findPage(PageWrap<DeviceRole> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param deviceRole 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(DeviceRole deviceRole);
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
index 53a7e59..47d30bc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
@@ -8,7 +8,7 @@
/**
* 璁惧淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface DeviceService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java
index 3497e80..1b0ed8f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java
@@ -8,7 +8,7 @@
/**
* 浜哄憳鎺堟潈瀵煎叆璁板綍Service瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface EmpowerService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
index ecd3b6a..8ea103d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
@@ -8,7 +8,7 @@
/**
* 涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍Service瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface InterfaceLogService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
index 54e1ea8..cf650c4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
@@ -8,7 +8,7 @@
/**
* 鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface MemberCardService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java
index dea405d..cf3cddf 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java
@@ -8,7 +8,7 @@
/**
* 浜哄憳瑙掕壊鍏宠仈淇℃伅Service瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface MemberRoleService {
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 389dd45..c2b507b 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
@@ -8,7 +8,7 @@
/**
* 浜哄憳淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface MemberService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
index 13e972f..0db0d78 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
@@ -8,7 +8,7 @@
/**
* 杞﹁締棰勭害璁板綍淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ParkBookService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java
index b8ba8ce..5f648fc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java
@@ -8,7 +8,7 @@
/**
* 鍋滆溅搴撲俊鎭〃Service瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ParksService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
index 4736d8a..2f41635 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
@@ -8,7 +8,7 @@
/**
* 璁垮绛旈璁板綍琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ProblemLogService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
index 10f3187..6748d7b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
@@ -8,7 +8,7 @@
/**
* 璇曢淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface ProblemsService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
index 4c136e7..72aeb5c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
@@ -8,7 +8,7 @@
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛塖ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface RetentionService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
index c6211a0..ea8de9f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
@@ -8,7 +8,7 @@
/**
* 浜哄憳鍩硅鏈夋晥鏈熻褰昐ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface TrainTimeService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
new file mode 100644
index 0000000..9d7c56c
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
@@ -0,0 +1,97 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.VisitEvent;
+import java.util.List;
+
+/**
+ * 璁垮浜嬩欢鎺ㄩ�佽褰曡〃Service瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface VisitEventService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param visitEvent 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(VisitEvent visitEvent);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param visitEvent 瀹炰綋瀵硅薄
+ */
+ void delete(VisitEvent visitEvent);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param visitEvent 瀹炰綋瀵硅薄
+ */
+ void updateById(VisitEvent visitEvent);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param visitEvents 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<VisitEvent> visitEvents);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return VisitEvent
+ */
+ VisitEvent findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param visitEvent 瀹炰綋瀵硅薄
+ * @return VisitEvent
+ */
+ VisitEvent findOne(VisitEvent visitEvent);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param visitEvent 瀹炰綋瀵硅薄
+ * @return List<VisitEvent>
+ */
+ List<VisitEvent> findList(VisitEvent visitEvent);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<VisitEvent>
+ */
+ PageData<VisitEvent> findPage(PageWrap<VisitEvent> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param visitEvent 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(VisitEvent visitEvent);
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
index 71fd7e0..022820c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
@@ -8,7 +8,7 @@
/**
* 璁垮鐢宠淇℃伅琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
public interface VisitsService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 51a3c04..fab895f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 瀹℃壒淇℃伅璁板綍琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class ApproveServiceImpl implements ApproveService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
new file mode 100644
index 0000000..5121dd3
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -0,0 +1,253 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.CarEventMapper;
+import com.doumee.dao.business.model.CarEvent;
+import com.doumee.service.business.CarEventService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Service
+public class CarEventServiceImpl implements CarEventService {
+
+ @Autowired
+ private CarEventMapper carEventMapper;
+
+ @Override
+ public Integer create(CarEvent carEvent) {
+ carEventMapper.insert(carEvent);
+ return carEvent.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ carEventMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(CarEvent carEvent) {
+ UpdateWrapper<CarEvent> deleteWrapper = new UpdateWrapper<>(carEvent);
+ carEventMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ carEventMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(CarEvent carEvent) {
+ carEventMapper.updateById(carEvent);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<CarEvent> carEvents) {
+ if (CollectionUtils.isEmpty(carEvents)) {
+ return;
+ }
+ for (CarEvent carEvent: carEvents) {
+ this.updateById(carEvent);
+ }
+ }
+
+ @Override
+ public CarEvent findById(Integer id) {
+ return carEventMapper.selectById(id);
+ }
+
+ @Override
+ public CarEvent findOne(CarEvent carEvent) {
+ QueryWrapper<CarEvent> wrapper = new QueryWrapper<>(carEvent);
+ return carEventMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<CarEvent> findList(CarEvent carEvent) {
+ QueryWrapper<CarEvent> wrapper = new QueryWrapper<>(carEvent);
+ return carEventMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<CarEvent> findPage(PageWrap<CarEvent> pageWrap) {
+ IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<CarEvent> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(CarEvent::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(CarEvent::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(CarEvent::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(CarEvent::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(CarEvent::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(CarEvent::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(CarEvent::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(CarEvent::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.lambda().eq(CarEvent::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getEventId() != null) {
+ queryWrapper.lambda().eq(CarEvent::getEventId, pageWrap.getModel().getEventId());
+ }
+ if (pageWrap.getModel().getSrcIndex() != null) {
+ queryWrapper.lambda().eq(CarEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
+ }
+ if (pageWrap.getModel().getSrcType() != null) {
+ queryWrapper.lambda().eq(CarEvent::getSrcType, pageWrap.getModel().getSrcType());
+ }
+ if (pageWrap.getModel().getSrcName() != null) {
+ queryWrapper.lambda().eq(CarEvent::getSrcName, pageWrap.getModel().getSrcName());
+ }
+ if (pageWrap.getModel().getEventType() != null) {
+ queryWrapper.lambda().eq(CarEvent::getEventType, pageWrap.getModel().getEventType());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(CarEvent::getStatus, pageWrap.getModel().getStatus());
+ }
+ if (pageWrap.getModel().getTimeout() != null) {
+ queryWrapper.lambda().eq(CarEvent::getTimeout, pageWrap.getModel().getTimeout());
+ }
+ if (pageWrap.getModel().getHappenTime() != null) {
+ queryWrapper.lambda().eq(CarEvent::getHappenTime, pageWrap.getModel().getHappenTime());
+ }
+ if (pageWrap.getModel().getSrcParentIndex() != null) {
+ queryWrapper.lambda().eq(CarEvent::getSrcParentIndex, pageWrap.getModel().getSrcParentIndex());
+ }
+ if (pageWrap.getModel().getAlarmCar() != null) {
+ queryWrapper.lambda().eq(CarEvent::getAlarmCar, pageWrap.getModel().getAlarmCar());
+ }
+ if (pageWrap.getModel().getCarAttributeName() != null) {
+ queryWrapper.lambda().eq(CarEvent::getCarAttributeName, pageWrap.getModel().getCarAttributeName());
+ }
+ if (pageWrap.getModel().getCardNo() != null) {
+ queryWrapper.lambda().eq(CarEvent::getCardNo, pageWrap.getModel().getCardNo());
+ }
+ if (pageWrap.getModel().getEventCmd() != null) {
+ queryWrapper.lambda().eq(CarEvent::getEventCmd, pageWrap.getModel().getEventCmd());
+ }
+ if (pageWrap.getModel().getEventIndex() != null) {
+ queryWrapper.lambda().eq(CarEvent::getEventIndex, pageWrap.getModel().getEventIndex());
+ }
+ if (pageWrap.getModel().getGateIndex() != null) {
+ queryWrapper.lambda().eq(CarEvent::getGateIndex, pageWrap.getModel().getGateIndex());
+ }
+ if (pageWrap.getModel().getGateName() != null) {
+ queryWrapper.lambda().eq(CarEvent::getGateName, pageWrap.getModel().getGateName());
+ }
+ if (pageWrap.getModel().getReleaseAuth() != null) {
+ queryWrapper.lambda().eq(CarEvent::getReleaseAuth, pageWrap.getModel().getReleaseAuth());
+ }
+ if (pageWrap.getModel().getReleaseReason() != null) {
+ queryWrapper.lambda().eq(CarEvent::getReleaseReason, pageWrap.getModel().getReleaseReason());
+ }
+ if (pageWrap.getModel().getReleaseResult() != null) {
+ queryWrapper.lambda().eq(CarEvent::getReleaseResult, pageWrap.getModel().getReleaseResult());
+ }
+ if (pageWrap.getModel().getReleaseResultEx() != null) {
+ queryWrapper.lambda().eq(CarEvent::getReleaseResultEx, pageWrap.getModel().getReleaseResultEx());
+ }
+ if (pageWrap.getModel().getReleaseWay() != null) {
+ queryWrapper.lambda().eq(CarEvent::getReleaseWay, pageWrap.getModel().getReleaseWay());
+ }
+ if (pageWrap.getModel().getInoutType() != null) {
+ queryWrapper.lambda().eq(CarEvent::getInoutType, pageWrap.getModel().getInoutType());
+ }
+ if (pageWrap.getModel().getPlateNos() != null) {
+ queryWrapper.lambda().eq(CarEvent::getPlateNos, pageWrap.getModel().getPlateNos());
+ }
+ if (pageWrap.getModel().getMainLogo() != null) {
+ queryWrapper.lambda().eq(CarEvent::getMainLogo, pageWrap.getModel().getMainLogo());
+ }
+ if (pageWrap.getModel().getParkIndex() != null) {
+ queryWrapper.lambda().eq(CarEvent::getParkIndex, pageWrap.getModel().getParkIndex());
+ }
+ if (pageWrap.getModel().getParkName() != null) {
+ queryWrapper.lambda().eq(CarEvent::getParkName, pageWrap.getModel().getParkName());
+ }
+ if (pageWrap.getModel().getPlateColor() != null) {
+ queryWrapper.lambda().eq(CarEvent::getPlateColor, pageWrap.getModel().getPlateColor());
+ }
+ if (pageWrap.getModel().getPlateBelieve() != null) {
+ queryWrapper.lambda().eq(CarEvent::getPlateBelieve, pageWrap.getModel().getPlateBelieve());
+ }
+ if (pageWrap.getModel().getPlateType() != null) {
+ queryWrapper.lambda().eq(CarEvent::getPlateType, pageWrap.getModel().getPlateType());
+ }
+ if (pageWrap.getModel().getRoadwayIndex() != null) {
+ queryWrapper.lambda().eq(CarEvent::getRoadwayIndex, pageWrap.getModel().getRoadwayIndex());
+ }
+ if (pageWrap.getModel().getRoadwayName() != null) {
+ queryWrapper.lambda().eq(CarEvent::getRoadwayName, pageWrap.getModel().getRoadwayName());
+ }
+ if (pageWrap.getModel().getRoadwayType() != null) {
+ queryWrapper.lambda().eq(CarEvent::getRoadwayType, pageWrap.getModel().getRoadwayType());
+ }
+ if (pageWrap.getModel().getSubLogo() != null) {
+ queryWrapper.lambda().eq(CarEvent::getSubLogo, pageWrap.getModel().getSubLogo());
+ }
+ if (pageWrap.getModel().getSubModel() != null) {
+ queryWrapper.lambda().eq(CarEvent::getSubModel, pageWrap.getModel().getSubModel());
+ }
+ if (pageWrap.getModel().getTimestr() != null) {
+ queryWrapper.lambda().eq(CarEvent::getTimestr, pageWrap.getModel().getTimestr());
+ }
+ if (pageWrap.getModel().getVehicleClass() != null) {
+ queryWrapper.lambda().eq(CarEvent::getVehicleClass, pageWrap.getModel().getVehicleClass());
+ }
+ if (pageWrap.getModel().getVehicleColor() != null) {
+ queryWrapper.lambda().eq(CarEvent::getVehicleColor, pageWrap.getModel().getVehicleColor());
+ }
+ if (pageWrap.getModel().getVehicleType() != null) {
+ queryWrapper.lambda().eq(CarEvent::getVehicleType, pageWrap.getModel().getVehicleType());
+ }
+ if (pageWrap.getModel().getVehiclePicUrl() != null) {
+ queryWrapper.lambda().eq(CarEvent::getVehiclePicUrl, pageWrap.getModel().getVehiclePicUrl());
+ }
+ if (pageWrap.getModel().getPlatePicUrl() != null) {
+ queryWrapper.lambda().eq(CarEvent::getPlatePicUrl, pageWrap.getModel().getPlatePicUrl());
+ }
+ if (pageWrap.getModel().getSvrIndex() != null) {
+ queryWrapper.lambda().eq(CarEvent::getSvrIndex, pageWrap.getModel().getSvrIndex());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(carEventMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(CarEvent carEvent) {
+ QueryWrapper<CarEvent> wrapper = new QueryWrapper<>(carEvent);
+ return carEventMapper.selectCount(wrapper);
+ }
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index dcca24c..a14ea39 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 杞﹁締淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class CarsServiceImpl implements CarsService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 8c1d7c8..ff5ecee 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 鍒嗙被淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class CategoryServiceImpl implements CategoryService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 94dd2c2..3e7d92f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 浼佷笟淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class CompanyServiceImpl implements CompanyService {
@@ -172,6 +172,9 @@
if (pageWrap.getModel().getDdStatus() != null) {
queryWrapper.lambda().eq(Company::getDdStatus, pageWrap.getModel().getDdStatus());
}
+ if (pageWrap.getModel().getFsId() != null) {
+ queryWrapper.lambda().eq(Company::getFsId, pageWrap.getModel().getFsId());
+ }
if (pageWrap.getModel().getFsStatus() != null) {
queryWrapper.lambda().eq(Company::getFsStatus, pageWrap.getModel().getFsStatus());
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index ca36257..04dd51b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃Service瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class DeviceEventServiceImpl implements DeviceEventService {
@@ -112,52 +112,146 @@
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.lambda().eq(DeviceEvent::getRemark, pageWrap.getModel().getRemark());
}
- if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getCompanyId, pageWrap.getModel().getCompanyId());
+ if (pageWrap.getModel().getEventId() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getEventId, pageWrap.getModel().getEventId());
}
- if (pageWrap.getModel().getFaceImg() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getFaceImg, pageWrap.getModel().getFaceImg());
+ if (pageWrap.getModel().getEventType() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getEventType, pageWrap.getModel().getEventType());
}
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getImgurl, pageWrap.getModel().getImgurl());
+ if (pageWrap.getModel().getSrcType() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSrcType, pageWrap.getModel().getSrcType());
}
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getType, pageWrap.getModel().getType());
+ if (pageWrap.getModel().getHappenTime() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getHappenTime, pageWrap.getModel().getHappenTime());
+ }
+ if (pageWrap.getModel().getSrcIndex() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
+ }
+ if (pageWrap.getModel().getSrcName() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSrcName, pageWrap.getModel().getSrcName());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getStatus, pageWrap.getModel().getStatus());
+ }
+ if (pageWrap.getModel().getTimeout() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getTimeout, pageWrap.getModel().getTimeout());
+ }
+ if (pageWrap.getModel().getExtAccessChannel() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtAccessChannel, pageWrap.getModel().getExtAccessChannel());
+ }
+ if (pageWrap.getModel().getExtEventAlarmInID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventAlarmInID, pageWrap.getModel().getExtEventAlarmInID());
+ }
+ if (pageWrap.getModel().getExtEventAlarmOutID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventAlarmOutID, pageWrap.getModel().getExtEventAlarmOutID());
+ }
+ if (pageWrap.getModel().getExtEventCardNo() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventCardNo, pageWrap.getModel().getExtEventCardNo());
+ }
+ if (pageWrap.getModel().getExtEventCaseID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventCaseID, pageWrap.getModel().getExtEventCaseID());
+ }
+ if (pageWrap.getModel().getExtEventCode() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventCode, pageWrap.getModel().getExtEventCode());
+ }
+ if (pageWrap.getModel().getExtEventDoorID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventDoorID, pageWrap.getModel().getExtEventDoorID());
+ }
+ if (pageWrap.getModel().getExtEventIDCardPictureURL() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventIDCardPictureURL, pageWrap.getModel().getExtEventIDCardPictureURL());
+ }
+ if (pageWrap.getModel().getExtEventInOut() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventInOut, pageWrap.getModel().getExtEventInOut());
+ }
+ if (pageWrap.getModel().getExtEventLocalControllerID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventLocalControllerID, pageWrap.getModel().getExtEventLocalControllerID());
+ }
+ if (pageWrap.getModel().getExtEventMainDevID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventMainDevID, pageWrap.getModel().getExtEventMainDevID());
+ }
+ if (pageWrap.getModel().getExtEventPersonNo() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventPersonNo, pageWrap.getModel().getExtEventPersonNo());
+ }
+ if (pageWrap.getModel().getExtEventReaderKind() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventReaderKind, pageWrap.getModel().getExtEventReaderKind());
+ }
+ if (pageWrap.getModel().getExtEventReaderID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventReaderID, pageWrap.getModel().getExtEventReaderID());
+ }
+ if (pageWrap.getModel().getExtEventPictureURL() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventPictureURL, pageWrap.getModel().getExtEventPictureURL());
+ }
+ if (pageWrap.getModel().getSvrIndexCode() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSvrIndexCode, pageWrap.getModel().getSvrIndexCode());
+ }
+ if (pageWrap.getModel().getExtEventReportChannel() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventReportChannel, pageWrap.getModel().getExtEventReportChannel());
+ }
+ if (pageWrap.getModel().getExtEventRoleID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventRoleID, pageWrap.getModel().getExtEventRoleID());
+ }
+ if (pageWrap.getModel().getExtEventSubDevID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventSubDevID, pageWrap.getModel().getExtEventSubDevID());
+ }
+ if (pageWrap.getModel().getExtEventSwipNum() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventSwipNum, pageWrap.getModel().getExtEventSwipNum());
+ }
+ if (pageWrap.getModel().getExtEventType() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventType, pageWrap.getModel().getExtEventType());
+ }
+ if (pageWrap.getModel().getExtEventVerifyID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventVerifyID, pageWrap.getModel().getExtEventVerifyID());
+ }
+ if (pageWrap.getModel().getExtEventWhiteListNo() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventWhiteListNo, pageWrap.getModel().getExtEventWhiteListNo());
+ }
+ if (pageWrap.getModel().getExtReceiveTime() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtReceiveTime, pageWrap.getModel().getExtReceiveTime());
+ }
+ if (pageWrap.getModel().getSeq() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSeq, pageWrap.getModel().getSeq());
+ }
+ if (pageWrap.getModel().getUserType() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getUserType, pageWrap.getModel().getUserType());
+ }
+ if (pageWrap.getModel().getAddress() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getAddress, pageWrap.getModel().getAddress());
+ }
+ if (pageWrap.getModel().getBirth() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getBirth, pageWrap.getModel().getBirth());
+ }
+ if (pageWrap.getModel().getEndDate() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getEndDate, pageWrap.getModel().getEndDate());
+ }
+ if (pageWrap.getModel().getIdNum() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getIdNum, pageWrap.getModel().getIdNum());
+ }
+ if (pageWrap.getModel().getIssuingAuthority() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getIssuingAuthority, pageWrap.getModel().getIssuingAuthority());
}
if (pageWrap.getModel().getName() != null) {
queryWrapper.lambda().eq(DeviceEvent::getName, pageWrap.getModel().getName());
}
- if (pageWrap.getModel().getBirthday() != null) {
- queryWrapper.lambda().ge(DeviceEvent::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
- queryWrapper.lambda().le(DeviceEvent::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
+ if (pageWrap.getModel().getSex() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getSex, pageWrap.getModel().getSex());
}
- if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getPhone, pageWrap.getModel().getPhone());
+ if (pageWrap.getModel().getStartDate() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getStartDate, pageWrap.getModel().getStartDate());
}
- if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getIdcardNo, pageWrap.getModel().getIdcardNo());
+ if (pageWrap.getModel().getTermOfValidity() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getTermOfValidity, pageWrap.getModel().getTermOfValidity());
}
- if (pageWrap.getModel().getIdcardDecode() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getIdcardDecode, pageWrap.getModel().getIdcardDecode());
+ if (pageWrap.getModel().getAccessChannel() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getAccessChannel, pageWrap.getModel().getAccessChannel());
}
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getCode, pageWrap.getModel().getCode());
+ if (pageWrap.getModel().getEntryTimes() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getEntryTimes, pageWrap.getModel().getEntryTimes());
}
- if (pageWrap.getModel().getClasses() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getClasses, pageWrap.getModel().getClasses());
+ if (pageWrap.getModel().getExitTimes() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExitTimes, pageWrap.getModel().getExitTimes());
}
- if (pageWrap.getModel().getEventDate() != null) {
- queryWrapper.lambda().ge(DeviceEvent::getEventDate, Utils.Date.getStart(pageWrap.getModel().getEventDate()));
- queryWrapper.lambda().le(DeviceEvent::getEventDate, Utils.Date.getEnd(pageWrap.getModel().getEventDate()));
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getEventCode() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getEventCode, pageWrap.getModel().getEventCode());
- }
- if (pageWrap.getModel().getInoutType() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getInoutType, pageWrap.getModel().getInoutType());
+ if (pageWrap.getModel().getTotalTimes() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getTotalTimes, pageWrap.getModel().getTotalTimes());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
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
new file mode 100644
index 0000000..9409027
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -0,0 +1,154 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.DeviceRoleMapper;
+import com.doumee.dao.business.model.DeviceRole;
+import com.doumee.service.business.DeviceRoleService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * 闂ㄧ瑙掕壊淇℃伅琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Service
+public class DeviceRoleServiceImpl implements DeviceRoleService {
+
+ @Autowired
+ private DeviceRoleMapper deviceRoleMapper;
+
+ @Override
+ public Integer create(DeviceRole deviceRole) {
+ deviceRoleMapper.insert(deviceRole);
+ return deviceRole.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ deviceRoleMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(DeviceRole deviceRole) {
+ UpdateWrapper<DeviceRole> deleteWrapper = new UpdateWrapper<>(deviceRole);
+ deviceRoleMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ deviceRoleMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(DeviceRole deviceRole) {
+ deviceRoleMapper.updateById(deviceRole);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<DeviceRole> deviceRoles) {
+ if (CollectionUtils.isEmpty(deviceRoles)) {
+ return;
+ }
+ for (DeviceRole deviceRole: deviceRoles) {
+ this.updateById(deviceRole);
+ }
+ }
+
+ @Override
+ public DeviceRole findById(Integer id) {
+ return deviceRoleMapper.selectById(id);
+ }
+
+ @Override
+ public DeviceRole findOne(DeviceRole deviceRole) {
+ QueryWrapper<DeviceRole> wrapper = new QueryWrapper<>(deviceRole);
+ return deviceRoleMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<DeviceRole> findList(DeviceRole deviceRole) {
+ QueryWrapper<DeviceRole> wrapper = new QueryWrapper<>(deviceRole);
+ return deviceRoleMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<DeviceRole> findPage(PageWrap<DeviceRole> pageWrap) {
+ IPage<DeviceRole> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<DeviceRole> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(DeviceRole::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(DeviceRole::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEdirot() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getEdirot, pageWrap.getModel().getEdirot());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(DeviceRole::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(DeviceRole::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getIsDefault() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getIsDefault, pageWrap.getModel().getIsDefault());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
+ }
+ if (pageWrap.getModel().getDoorIds() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getDoorIds, pageWrap.getModel().getDoorIds());
+ }
+ if (pageWrap.getModel().getDoorNames() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getDoorNames, pageWrap.getModel().getDoorNames());
+ }
+ if (pageWrap.getModel().getParkIds() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getParkIds, pageWrap.getModel().getParkIds());
+ }
+ if (pageWrap.getModel().getParkNames() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getParkNames, pageWrap.getModel().getParkNames());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(DeviceRole::getStatus, pageWrap.getModel().getStatus());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(deviceRoleMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(DeviceRole deviceRole) {
+ QueryWrapper<DeviceRole> wrapper = new QueryWrapper<>(deviceRole);
+ return deviceRoleMapper.selectCount(wrapper);
+ }
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index c4a4943..6d46aff 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 璁惧淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class DeviceServiceImpl implements DeviceService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index 6e38489..a5bceb9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 浜哄憳鎺堟潈瀵煎叆璁板綍Service瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class EmpowerServiceImpl implements EmpowerService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
index 323fc3d..91667f8 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍Service瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class InterfaceLogServiceImpl implements InterfaceLogService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 35e7cad..6ab53c2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class MemberCardServiceImpl implements MemberCardService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java
index b391b3a..6e6fd07 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 浜哄憳瑙掕壊鍏宠仈淇℃伅Service瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class MemberRoleServiceImpl implements MemberRoleService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index cf8d0fe..0c7a0ef 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 浜哄憳淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class MemberServiceImpl implements MemberService {
@@ -207,6 +207,13 @@
if (pageWrap.getModel().getRoleId() != null) {
queryWrapper.lambda().eq(Member::getRoleId, pageWrap.getModel().getRoleId());
}
+ if (pageWrap.getModel().getRoleDate() != null) {
+ queryWrapper.lambda().ge(Member::getRoleDate, Utils.Date.getStart(pageWrap.getModel().getRoleDate()));
+ queryWrapper.lambda().le(Member::getRoleDate, Utils.Date.getEnd(pageWrap.getModel().getRoleDate()));
+ }
+ if (pageWrap.getModel().getErpOrgId() != null) {
+ queryWrapper.lambda().eq(Member::getErpOrgId, pageWrap.getModel().getErpOrgId());
+ }
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index 68da0bc..691c146 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 杞﹁締棰勭害璁板綍淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class ParkBookServiceImpl implements ParkBookService {
@@ -127,6 +127,33 @@
if (pageWrap.getModel().getParkId() != null) {
queryWrapper.lambda().eq(ParkBook::getParkId, pageWrap.getModel().getParkId());
}
+ if (pageWrap.getModel().getOrigin() != null) {
+ queryWrapper.lambda().eq(ParkBook::getOrigin, pageWrap.getModel().getOrigin());
+ }
+ if (pageWrap.getModel().getStartTime() != null) {
+ queryWrapper.lambda().ge(ParkBook::getStartTime, Utils.Date.getStart(pageWrap.getModel().getStartTime()));
+ queryWrapper.lambda().le(ParkBook::getStartTime, Utils.Date.getEnd(pageWrap.getModel().getStartTime()));
+ }
+ if (pageWrap.getModel().getEndTime() != null) {
+ queryWrapper.lambda().ge(ParkBook::getEndTime, Utils.Date.getStart(pageWrap.getModel().getEndTime()));
+ queryWrapper.lambda().le(ParkBook::getEndTime, Utils.Date.getEnd(pageWrap.getModel().getEndTime()));
+ }
+ if (pageWrap.getModel().getMemberId() != null) {
+ queryWrapper.lambda().eq(ParkBook::getMemberId, pageWrap.getModel().getMemberId());
+ }
+ if (pageWrap.getModel().getTimeType() != null) {
+ queryWrapper.lambda().eq(ParkBook::getTimeType, pageWrap.getModel().getTimeType());
+ }
+ if (pageWrap.getModel().getHkId2() != null) {
+ queryWrapper.lambda().eq(ParkBook::getHkId2, pageWrap.getModel().getHkId2());
+ }
+ if (pageWrap.getModel().getHkStatus() != null) {
+ queryWrapper.lambda().eq(ParkBook::getHkStatus, pageWrap.getModel().getHkStatus());
+ }
+ if (pageWrap.getModel().getHkDate() != null) {
+ queryWrapper.lambda().ge(ParkBook::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
+ queryWrapper.lambda().le(ParkBook::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
+ }
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
index 1de64eb..21be1cc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 鍋滆溅搴撲俊鎭〃Service瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class ParksServiceImpl implements ParksService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index f8397d5..e5a37f1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 璁垮绛旈璁板綍琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class ProblemLogServiceImpl implements ProblemLogService {
@@ -127,6 +127,21 @@
if (pageWrap.getModel().getContent() != null) {
queryWrapper.lambda().eq(ProblemLog::getContent, pageWrap.getModel().getContent());
}
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getPhone() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getPhone, pageWrap.getModel().getPhone());
+ }
+ if (pageWrap.getModel().getCompanyId() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
+ if (pageWrap.getModel().getCompanyName() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName());
+ }
+ if (pageWrap.getModel().getOpenid() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getOpenid, pageWrap.getModel().getOpenid());
+ }
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index 8536d1d..f039e1e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 璇曢淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class ProblemsServiceImpl implements ProblemsService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index f9ae463..dec9e5e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛塖ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class RetentionServiceImpl implements RetentionService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index 2085013..8a4bb79 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 浜哄憳鍩硅鏈夋晥鏈熻褰昐ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class TrainTimeServiceImpl implements TrainTimeService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
new file mode 100644
index 0000000..b9fba31
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -0,0 +1,214 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.VisitEventMapper;
+import com.doumee.dao.business.model.VisitEvent;
+import com.doumee.service.business.VisitEventService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * 璁垮浜嬩欢鎺ㄩ�佽褰曡〃Service瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Service
+public class VisitEventServiceImpl implements VisitEventService {
+
+ @Autowired
+ private VisitEventMapper visitEventMapper;
+
+ @Override
+ public Integer create(VisitEvent visitEvent) {
+ visitEventMapper.insert(visitEvent);
+ return visitEvent.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ visitEventMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(VisitEvent visitEvent) {
+ UpdateWrapper<VisitEvent> deleteWrapper = new UpdateWrapper<>(visitEvent);
+ visitEventMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ visitEventMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(VisitEvent visitEvent) {
+ visitEventMapper.updateById(visitEvent);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<VisitEvent> visitEvents) {
+ if (CollectionUtils.isEmpty(visitEvents)) {
+ return;
+ }
+ for (VisitEvent visitEvent: visitEvents) {
+ this.updateById(visitEvent);
+ }
+ }
+
+ @Override
+ public VisitEvent findById(Integer id) {
+ return visitEventMapper.selectById(id);
+ }
+
+ @Override
+ public VisitEvent findOne(VisitEvent visitEvent) {
+ QueryWrapper<VisitEvent> wrapper = new QueryWrapper<>(visitEvent);
+ return visitEventMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<VisitEvent> findList(VisitEvent visitEvent) {
+ QueryWrapper<VisitEvent> wrapper = new QueryWrapper<>(visitEvent);
+ return visitEventMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<VisitEvent> findPage(PageWrap<VisitEvent> pageWrap) {
+ IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<VisitEvent> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(VisitEvent::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(VisitEvent::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(VisitEvent::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(VisitEvent::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getEventId() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getEventId, pageWrap.getModel().getEventId());
+ }
+ if (pageWrap.getModel().getSrcIndex() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
+ }
+ if (pageWrap.getModel().getSrcType() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getSrcType, pageWrap.getModel().getSrcType());
+ }
+ if (pageWrap.getModel().getSrcName() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getSrcName, pageWrap.getModel().getSrcName());
+ }
+ if (pageWrap.getModel().getEventType() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getEventType, pageWrap.getModel().getEventType());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getStatus, pageWrap.getModel().getStatus());
+ }
+ if (pageWrap.getModel().getTimeout() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getTimeout, pageWrap.getModel().getTimeout());
+ }
+ if (pageWrap.getModel().getHappenTime() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getHappenTime, pageWrap.getModel().getHappenTime());
+ }
+ if (pageWrap.getModel().getSrcParentIndex() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getSrcParentIndex, pageWrap.getModel().getSrcParentIndex());
+ }
+ if (pageWrap.getModel().getVisitorId() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getVisitorId, pageWrap.getModel().getVisitorId());
+ }
+ if (pageWrap.getModel().getPersonName() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getPersonName, pageWrap.getModel().getPersonName());
+ }
+ if (pageWrap.getModel().getSex() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getSex, pageWrap.getModel().getSex());
+ }
+ if (pageWrap.getModel().getIdType() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getIdType, pageWrap.getModel().getIdType());
+ }
+ if (pageWrap.getModel().getIdNo() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getIdNo, pageWrap.getModel().getIdNo());
+ }
+ if (pageWrap.getModel().getBeVisitedPersonName() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getBeVisitedPersonName, pageWrap.getModel().getBeVisitedPersonName());
+ }
+ if (pageWrap.getModel().getBeVisitedPersonOrg() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getBeVisitedPersonOrg, pageWrap.getModel().getBeVisitedPersonOrg());
+ }
+ if (pageWrap.getModel().getVisitorWorkUint() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getVisitorWorkUint, pageWrap.getModel().getVisitorWorkUint());
+ }
+ if (pageWrap.getModel().getVisitorCode() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getVisitorCode, pageWrap.getModel().getVisitorCode());
+ }
+ if (pageWrap.getModel().getPurpose() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getPurpose, pageWrap.getModel().getPurpose());
+ }
+ if (pageWrap.getModel().getSignOrg() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getSignOrg, pageWrap.getModel().getSignOrg());
+ }
+ if (pageWrap.getModel().getStartTime() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getStartTime, pageWrap.getModel().getStartTime());
+ }
+ if (pageWrap.getModel().getEndTime() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getEndTime, pageWrap.getModel().getEndTime());
+ }
+ if (pageWrap.getModel().getCarNo() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getCarNo, pageWrap.getModel().getCarNo());
+ }
+ if (pageWrap.getModel().getPhotoUrl() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getPhotoUrl, pageWrap.getModel().getPhotoUrl());
+ }
+ if (pageWrap.getModel().getCaptureUrl() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getCaptureUrl, pageWrap.getModel().getCaptureUrl());
+ }
+ if (pageWrap.getModel().getSvrIndexCode() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getSvrIndexCode, pageWrap.getModel().getSvrIndexCode());
+ }
+ if (pageWrap.getModel().getBeVisitedPersonId() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getBeVisitedPersonId, pageWrap.getModel().getBeVisitedPersonId());
+ }
+ if (pageWrap.getModel().getBeVisitedPersonOrgId() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getBeVisitedPersonOrgId, pageWrap.getModel().getBeVisitedPersonOrgId());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(visitEventMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(VisitEvent visitEvent) {
+ QueryWrapper<VisitEvent> wrapper = new QueryWrapper<>(visitEvent);
+ return visitEventMapper.selectCount(wrapper);
+ }
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 3a1460e..8a2db93 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 璁垮鐢宠淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class VisitsServiceImpl implements VisitsService {
@@ -217,6 +217,9 @@
queryWrapper.lambda().ge(Visits::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
queryWrapper.lambda().le(Visits::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
}
+ if (pageWrap.getModel().getErpId() != null) {
+ queryWrapper.lambda().eq(Visits::getErpId, pageWrap.getModel().getErpId());
+ }
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
diff --git a/server/openapi/pom.xml b/server/openapi/pom.xml
index f6a76bc..218a68a 100644
--- a/server/openapi/pom.xml
+++ b/server/openapi/pom.xml
@@ -37,7 +37,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork>
- <mainClass>com.doumee.InterfaceApplication</mainClass>
+ <mainClass>com.doumee.OpenapiApplication</mainClass>
<layout>ZIP</layout>
</configuration>
<executions>
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 e35b20c..42ab067 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
@@ -3,6 +3,7 @@
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;
@@ -42,7 +43,7 @@
}
@ApiOperation(value = "璁垮鐢宠鎻愪氦瀹℃壒鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇蜂俊鎭�,鎺ュ彛鎻愪氦鎴愬姛锛孍RP绔繑鍥炲鎵硅褰曠紪鐮�")
@PostMapping("/event/approve/apply")
- public ApiResponse<String> approveApply(@RequestBody Object account ) {
+ public ApiResponse<String> approveApply(@RequestBody ApproveAddRequest account ) {
return ApiResponse.success(UUID.randomUUID().toString());
}
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉鏌ヨ鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾煡璇㈣瀹㈢敵璇峰鎵圭粨鏋�")
diff --git a/server/openapi/src/main/java/com/doumee/model/request/ApproveNoticeRequest.java b/server/openapi/src/main/java/com/doumee/model/request/ApproveNoticeRequest.java
index fee8ab0..c761944 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/ApproveNoticeRequest.java
+++ b/server/openapi/src/main/java/com/doumee/model/request/ApproveNoticeRequest.java
@@ -14,7 +14,7 @@
public class ApproveNoticeRequest {
@ApiModelProperty(value = "瀹℃壒璁板綍鍞竴鏍囪瘑锛圗RP绔疘D锛�" ,example = "1")
private Integer id;
- @ApiModelProperty(value = "瀹℃壒缁撴灉 0-閫氳繃 1涓嶉�氳繃" ,example = "1")
+ @ApiModelProperty(value = "瀹℃壒缁撴灉 0-涓嶉�氳繃 1-閫氳繃,榛樿 0" ,example = "1")
private Integer status;
@ApiModelProperty(value = "瀹℃牳鏃堕棿" )
private String approveDate ;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/CarAuthorRequest.java b/server/openapi/src/main/java/com/doumee/model/request/CarAuthorRequest.java
index 8472e59..a1f6295 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/CarAuthorRequest.java
+++ b/server/openapi/src/main/java/com/doumee/model/request/CarAuthorRequest.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
import java.util.List;
/**
@@ -11,12 +12,16 @@
* @date 2023/11/23 14:03
*/
@Data
-@ApiModel(value = "浜哄憳鎺堟潈鏇存柊璇锋眰淇℃伅" )
+@ApiModel(value = "杞﹁締鎺堟潈鍋滆溅鍦鸿姹備俊鎭�" )
public class CarAuthorRequest {
@ApiModelProperty(value = "浜哄憳鍞竴鏍囪瘑锛圗RP绔疘D锛夛紝濡傛灉涓虹┖锛屽垯娓呯┖杞﹁締褰掑睘浜轰俊鎭�")
private String userId;
@ApiModelProperty(value = "杞︾墝鍙�" , required = true)
private String carCode;
+ @ApiModelProperty(value = "鎺堟潈鏈夋晥鏈燂紙寮�濮嬫椂闂达級锛屼负绌烘椂榛樿闀挎湡鏈夋晥锛屽2023-11-24 11:39:23" )
+ private Date validStartTime;
+ @ApiModelProperty(value = "鎺堟潈鏈夋晥鏈燂紙鎴鏃堕棿锛夛紝涓虹┖鏃堕粯璁ら暱鏈熸湁鏁堬紝濡�2023-11-24 11:39:23" )
+ private Date validEndTime;
@ApiModelProperty(value = "鍋滆溅鍦虹粍鍞竴鏍囪瘑闆嗗悎锛堣瀹㈢ID锛�,濡傛灉涓簄ull锛屽垯娓呯┖杞﹁締鎺堟潈淇℃伅" )
private List<Integer> partIdList;
diff --git a/server/openapi/src/main/java/com/doumee/model/request/UserAuthorRequest.java b/server/openapi/src/main/java/com/doumee/model/request/UserAuthorRequest.java
index a36b6b5..bbe1fdf 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/UserAuthorRequest.java
+++ b/server/openapi/src/main/java/com/doumee/model/request/UserAuthorRequest.java
@@ -11,11 +11,14 @@
* @date 2023/11/23 14:03
*/
@Data
-@ApiModel("浜哄憳鎺堟潈鏇存柊璇锋眰淇℃伅")
+@ApiModel("浜哄憳闂ㄧ缁勬巿鏉冩洿鏂拌姹備俊鎭�")
public class UserAuthorRequest {
@ApiModelProperty(value = "浜哄憳鍞竴鏍囪瘑锛圗RP绔疘D锛�" , required = true)
private String userId;
@ApiModelProperty(value = "闂ㄧ缁勫敮涓�鏍囪瘑锛堣瀹㈢ID锛�,濡傛灉涓簄ull锛屽垯娓呯┖浜哄憳鎺堟潈淇℃伅" )
private Integer roleId;
-
+ @ApiModelProperty(value = "鎺堟潈鏈夋晥鏈燂紙寮�濮嬫椂闂达級锛屼负绌烘椂榛樿闀挎湡鏈夋晥锛屽2023-11-24 11:39:23" )
+ private Date validStartTime;
+ @ApiModelProperty(value = "鎺堟潈鏈夋晥鏈燂紙鎴鏃堕棿锛夛紝涓虹┖鏃堕粯璁ら暱鏈熸湁鏁堬紝濡�2023-11-24 11:39:23" )
+ private Date validEndTime;
}
diff --git a/server/openapi/src/main/java/com/doumee/model/request/UserUpdateRequest.java b/server/openapi/src/main/java/com/doumee/model/request/UserUpdateRequest.java
index 9a8e5c9..d27484e 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/UserUpdateRequest.java
+++ b/server/openapi/src/main/java/com/doumee/model/request/UserUpdateRequest.java
@@ -20,7 +20,7 @@
private Integer id;
@ApiModelProperty(value = "濮撳悕" )
private String name;
- @ApiModelProperty(value = "韬唤璇佸彿" )
+ @ApiModelProperty(value = "璇佷欢鍙�" )
private String idNo;
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境閫氳璇� 2鎶ょ収 ,榛樿涓�0" ,example = "0")
private int idType;
@@ -38,5 +38,11 @@
private String faceImg;
@ApiModelProperty(value = "宸ュ彿")
private String code;
+ @ApiModelProperty(value = "鎵嬫満鍙�" , required = true)
+ private String phone;
+ @ApiModelProperty(value = "鍗″彿闆嗗悎" )
+ private List<String> cardList;
+ @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�" )
+ private Integer roleId;
}
diff --git a/server/openapi/src/main/java/com/doumee/model/request/erp/ApproveAddRequest.java b/server/openapi/src/main/java/com/doumee/model/request/erp/ApproveAddRequest.java
index 375c8d2..85ded17 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/erp/ApproveAddRequest.java
+++ b/server/openapi/src/main/java/com/doumee/model/request/erp/ApproveAddRequest.java
@@ -35,9 +35,7 @@
private List<Integer> roleIds ;
@ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�" )
private List<String> roleNames ;
- @ApiModelProperty(value = "琚闂汉Id锛坋rp绔敤鎴风紪鐮侊級" )
- private String beVisitedPersonId ;
- @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁嘔d(erp绔粍缁囩紪鐮�)" )
- private String beVisitedPersonOrgId ;
+ @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁嘔d(ERP绔疘D)" )
+ private String beVisitedOrgId;
}
diff --git a/server/openapi/src/main/java/com/doumee/model/request/erp/UserInfoRequest.java b/server/openapi/src/main/java/com/doumee/model/request/erp/UserInfoRequest.java
index 9b18e1f..5e278b8 100644
--- a/server/openapi/src/main/java/com/doumee/model/request/erp/UserInfoRequest.java
+++ b/server/openapi/src/main/java/com/doumee/model/request/erp/UserInfoRequest.java
@@ -25,5 +25,4 @@
private String faceImg;
@ApiModelProperty(value = "鍋ュ悍璇�" )
private String healthImg;
-
}
diff --git a/server/openapi/src/main/java/com/doumee/model/response/erp/ApproveInfoResponse.java b/server/openapi/src/main/java/com/doumee/model/response/erp/ApproveInfoResponse.java
index ddf137c..2f730c3 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/erp/ApproveInfoResponse.java
+++ b/server/openapi/src/main/java/com/doumee/model/response/erp/ApproveInfoResponse.java
@@ -14,7 +14,7 @@
public class ApproveInfoResponse {
@ApiModelProperty(value = "瀹℃壒璁板綍鍞竴鏍囪瘑锛圗RP绔疘D锛�" ,example = "1")
private Integer id;
- @ApiModelProperty(value = "瀹℃壒缁撴灉 0-閫氳繃 1涓嶉�氳繃" ,example = "1")
+ @ApiModelProperty(value = "瀹℃壒缁撴灉 0-涓嶉�氳繃 1-閫氳繃,榛樿 0" ,example = "1")
private Integer status;
@ApiModelProperty(value = "瀹℃牳鏃堕棿" )
private String approveDate ;
diff --git a/server/openapi/src/main/java/com/doumee/model/response/erp/UserListRespone.java b/server/openapi/src/main/java/com/doumee/model/response/erp/UserListRespone.java
index ed3bc11..d7ed6f1 100644
--- a/server/openapi/src/main/java/com/doumee/model/response/erp/UserListRespone.java
+++ b/server/openapi/src/main/java/com/doumee/model/response/erp/UserListRespone.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* @author 姹熻箘韫�
@@ -38,4 +39,10 @@
@ApiModelProperty(value = "宸ュ彿")
private String code;
+ @ApiModelProperty(value = "鎵嬫満鍙�" , required = true)
+ private String phone;
+ @ApiModelProperty(value = "鍗″彿闆嗗悎" )
+ private List<String> cardList;
+ @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�" )
+ private Integer roleId;
}
diff --git a/server/openapi/src/main/resources/application.yml b/server/openapi/src/main/resources/application.yml
index 3af5437..a81464d 100644
--- a/server/openapi/src/main/resources/application.yml
+++ b/server/openapi/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# 椤圭洰淇℃伅閰嶇疆
project:
- name: 鏅鸿兘浼氳瀹ゅ皬绋嬪簭绔�
+ name: 鍗庢櫉璁垮绯荤粺浜や簰鎺ュ彛
version: 1.0.0
env: development
# env: production
@@ -70,7 +70,7 @@
enabled: true
mime-types: application/json
- port: 10016
+ port: 10018
tomcat:
max-swallow-size: -1
servlet:
--
Gitblit v1.9.3