From 46a174dd4b2d3208460411ed5d94a5726a5a2f72 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 06 一月 2025 18:15:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDepartmentBizImpl.java | 3
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/FormParamCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/LastSevenDaysOrderVo.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java | 5
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java | 8
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java | 6
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskProductDetailsResponse.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomRecordController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsGisListRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemsServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 180 +-
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectRelController.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/UserRelServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsBaseResponse.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveParamCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java | 4
server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutDayCountServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsConfigServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformQueueService.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java | 6
server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderListParamRequest.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsLockStatusQueryRequest.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java | 4
server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java | 46
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PositionService.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java | 7
server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 5
server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java | 2
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 4
server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarDriverService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBooksService.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderNoFinishListResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroToken.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/ProblemWebController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/api/system/SystemMonitorController.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarEventCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WxNoticeConfigServiceImpl.java | 5
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisStartEndInfoResponse.java | 2
server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateResponseWrapper.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerLogService.java | 4
server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java | 16
server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java | 13
server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformShowParamCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InterfaceLogCloudController.java | 6
server/visits/dmvisit_screen/src/main/java/com/doumee/api/BaseController.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsLockStatusQueryResponse.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisListResponse.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsConfigCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java | 6
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 8
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 14
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 7
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java | 6
server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskPalletDetailsResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWarnEventService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 5
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskListResponse.java | 2
server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java | 16
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroCache.java | 2
server/system_service/src/main/java/com/doumee/dao/business/model/Member.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/UserRelController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutboundCapabilityInfoResponse.java | 2
server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateRequestWrapper.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java | 6
server/system_service/src/main/java/com/doumee/biz/system/SystemDepartmentBiz.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 9
server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java | 6
server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformReasonService.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java | 11
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WxNoticeConfigController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java | 6
server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java | 6
server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java | 7
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java | 6
server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java | 18
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsEmployeeListRequest.java | 18
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java | 4
server/system_service/src/main/java/com/doumee/service/system/SystemLoginLogService.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java | 7
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsTotalAndReportVehicleQtyResponse.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java | 8
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformDeviceService.java | 4
server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsInterfaceLogService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarParksServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 15
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java | 6
server/system_service/src/main/java/com/doumee/api/system/SystemController.java | 26
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java | 2
server/system_service/src/main/java/com/doumee/dao/servlet/ServletRewriteFilter.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 6
server/system_service/src/main/java/com/doumee/api/system/SystemTraceLogController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarParksService.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java | 8
server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomRecordService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsJobService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java | 6
server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateOutputStream.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsCircleStatusListResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java | 4
server/system_service/src/main/java/com/doumee/api/system/SystemLoginLogController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TasksCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisStatusInfoResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderInfoRequest.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java | 6
server/system_service/src/main/java/com/doumee/service/system/SystemDataPermissionService.java | 4
server/system_service/src/main/java/com/doumee/service/system/SystemUserRoleService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemLogCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java | 20
server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java | 4
server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java | 3
server/visits/openapi/src/main/java/com/doumee/api/common/CaptchaController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/UserActionService.java | 4
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 335 +++--
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java | 5
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PositionServiceImpl.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsEmployeeListResponse.java | 25
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ConfirmTaskDTO.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderListRequest.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformDeviceCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformInterfaceLogCloudController.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParksCloudController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/LoginUserInfo.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsConfigService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java | 7
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java | 7
server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 3
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java | 6
admin/.env.development | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformLogService.java | 4
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 2
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java | 6
server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java | 2
server/system_service/src/main/java/com/doumee/service/system/SystemPermissionService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsDetailServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 68
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformReasonCloudController.java | 7
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformDeviceServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 8
server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java | 2
server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformQueueCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformEventCloudController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/ApiResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java | 4
server/system_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java | 5
server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarDriverCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 17
server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java | 2
server/visits/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsDetailService.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java | 3
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverStartAndArrivalRequest.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutboundCapabilityResponse.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java | 10
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitParkCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsBasePageResponse.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java | 6
server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TasksService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformLogCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java | 6
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/WgListenerController.java | 4
server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java | 2
server/system_service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 6
server/system_service/src/main/java/com/doumee/dao/system/dto/LoginH5DTO.java | 37
server/system_service/src/main/java/com/doumee/dao/business/WmsInterfaceLogMapper.java | 0
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 26
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java | 4
server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WmsInterfaceLogServiceImpl.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomTimeService.java | 4
server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java | 7
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemLogServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/service/system/SystemRoleService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsSevenArrivalStatusAndDetailsResponse.java | 2
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 7
server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java | 3
server/system_service/src/main/java/com/doumee/api/BaseController.java | 5
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceEventCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java | 4
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 6
server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java | 6
server/system_service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitReasonService.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 11
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java | 4
server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java | 4
server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutDayCountService.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsInventoryListResponse.java | 2
server/visits/openapi/src/main/java/com/doumee/api/web/BizResourceController.java | 20
server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 6
server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemLogService.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformInterfaceLogService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveTemplService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 6
server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/service/business/DevicesService.java | 4
server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsSevenArrivalDetailsRequest.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderNoFinishListParamRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsBaseRequest.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskListRequest.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingTimeServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsJobCloudController.java | 6
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemsCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java | 4
server/system_service/src/main/java/com/doumee/service/system/SystemDictService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWarnEventCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MultifileController.java | 6
server/system_service/src/main/java/com/doumee/core/aware/DefaultDataPermissionAware.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/UnitWebController.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java | 9
server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java | 12
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/UserActionCloudController.java | 6
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java | 5
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemsCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java | 5
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskInfoRequest.java | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/systembiz/impl/SystemDictDataBizServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java | 2
server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java | 7
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderNoFinishListRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitorService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java | 7
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java | 6
server/system_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java | 2
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java | 7
server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 2
server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java | 6
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java | 9
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemsService.java | 4
server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskParameterRequest.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskInfoResponse.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java | 6
server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsCircleStatusListRequest.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WxNoticeConfigService.java | 4
server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java | 6
server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberRoleCloudController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsCircleStatusResultListResponse.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/PageWrap.java | 2
server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java | 6
server/system_service/src/main/java/com/doumee/dao/system/dto/UpdatePwdDto.java | 3
server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectRelService.java | 4
server/system_service/src/main/java/com/doumee/service/system/SystemDictDataService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java | 6
server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java | 7
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java | 16
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 15
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDistributionOfDeliveryLocResponse.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java | 2
server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java | 4
server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java | 3
server/system_service/src/main/java/com/doumee/service/business/third/model/LoginUserModel.java | 3
server/system_service/src/main/java/com/doumee/service/system/impl/MultifileServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java | 6
server/system_service/src/main/java/com/doumee/service/system/SystemRolePermissionService.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingTimeService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitParkService.java | 4
server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java | 6
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobDetailDTO.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 6
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 9
server/visits/openapi/src/main/java/com/doumee/api/BaseController.java | 2
server/system_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/dao/system/dto/VisitConfigDTO.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java | 4
server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformQueueServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarParksCloudController.java | 6
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 10
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitEventCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCardCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java | 6
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsPagerRequest.java | 2
server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateInputStream.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/FormParamService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TrainTimeCloudController.java | 6
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 11
server/system_service/src/main/java/com/doumee/api/system/NoticesController.java | 6
server/system_service/src/main/java/com/doumee/service/system/SystemRoleMenuService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 12
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java | 2
server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/CaptchaController.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformEventService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 6
server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java | 5
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsDetailCloudController.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitorServiceImpl.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/DevicesServiceImpl.java | 4
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/PageData.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java | 8
server/system_service/src/main/java/com/doumee/service/system/SystemTraceLogService.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOutQtyAndVehicleQtyRequest.java | 2
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java | 6
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java | 6
server/system_timer/src/main/java/com/doumee/api/timer/QuartzCloudController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBroadcastLogService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/SignInDTO.java | 5
server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectsService.java | 4
server/system_service/src/main/java/com/doumee/service/system/MultifileService.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java | 5
server/meeting/meeting_service/src/main/java/com/doumee/service/business/UserRelService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 3
server/system_service/src/main/java/com/doumee/core/annotation/trace/TraceInterceptor.java | 8
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskTransportStopsResponse.java | 2
server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsFacrotyCodeListRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TasksServiceImpl.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/FormParamServiceImpl.java | 4
server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java | 8
server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java | 6
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/PlatformDataDTO.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectRelServiceImpl.java | 4
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderListResponse.java | 2
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 62
server/system_service/src/main/java/com/doumee/service/system/NoticesService.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemLogCloudController.java | 6
558 files changed, 1,718 insertions(+), 1,745 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index affed23..84d1c32 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,7 +2,7 @@
NODE_ENV = 'development'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
- VUE_APP_API_URL = 'http://localhost:10010'
+ #VUE_APP_API_URL = 'http://localhost:10010'
# VUE_APP_API_URL = 'http://192.168.0.173/gateway_interface'
- #VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
+VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java
index ef28f0c..84699f6 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.BookingTime;
import com.doumee.service.business.BookingTimeService;
import io.swagger.annotations.Api;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
index b4fcbb8..ae1402f 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
@@ -6,10 +6,10 @@
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.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Bookings;
@@ -17,13 +17,11 @@
import com.doumee.dao.system.dto.UserStatisticsDTO;
import com.doumee.dao.system.vo.UserStatisticsVo;
import com.doumee.dao.web.response.DateTimeResourceDate;
-import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.service.business.BookingsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
index ba0e027..e7b1e34 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Devices;
import com.doumee.service.business.DevicesService;
import io.swagger.annotations.Api;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
index 2153eb1..6ff48b5 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
@@ -2,16 +2,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.web.request.BookingsRequest;
import com.doumee.dao.web.request.MeetingPageRequest;
-import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
import com.doumee.dao.web.response.MonthDataResponse;
import com.doumee.service.business.BookingsService;
@@ -19,7 +18,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MultifileController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MultifileController.java
index 35db9e8..c6e4f91 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MultifileController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MultifileController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.system.model.Multifile;
import com.doumee.service.system.MultifileService;
import io.swagger.annotations.Api;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectRelController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectRelController.java
index fae3293..44e3743 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectRelController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectRelController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.ProjectRel;
import com.doumee.service.business.ProjectRelService;
import io.swagger.annotations.Api;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java
index 3a76710..16fcc01 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Projects;
import com.doumee.dao.web.response.ProjectsResponse;
import com.doumee.service.business.ProjectsService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomRecordController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomRecordController.java
index e03588a..fe23cdf 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomRecordController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomRecordController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.RoomRecord;
import com.doumee.service.business.RoomRecordService;
import io.swagger.annotations.Api;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java
index ae8a7f4..05fbe52 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.service.business.RoomTimeService;
import io.swagger.annotations.Api;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
index f9f6949..e706aab 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
@@ -5,10 +5,10 @@
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.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.business.model.RoomTime;
@@ -22,7 +22,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/UserRelController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/UserRelController.java
index b073e43..33d3cae 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/UserRelController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/UserRelController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.UserRel;
import com.doumee.service.business.UserRelService;
import io.swagger.annotations.Api;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/WgListenerController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/WgListenerController.java
index a279905..2b13aac 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/WgListenerController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/WgListenerController.java
@@ -3,7 +3,7 @@
import cn.hutool.core.io.IoUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.admin.request.InDeviceEntranceParam;
import com.doumee.dao.admin.response.DevWgDataResponseParam;
@@ -24,8 +24,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
/**
* 寰厜浜岀淮鐮佽姹傚叆鍙�
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
index 209d40f..529e559 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
@@ -2,7 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.common.CaptchaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
index 5555a88..b399317 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
@@ -2,9 +2,8 @@
import com.alibaba.fastjson.JSONObject;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.join.BookingsJoinMapper;
import com.doumee.dao.business.join.RoomsJoinMapper;
@@ -15,7 +14,6 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +21,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java
index 91360d3..cb4235d 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.BookingTime;
import com.doumee.service.business.BookingTimeService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
index 124eb08..26a3e56 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
@@ -7,10 +7,10 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Bookings;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
index f4c09b9..d979131 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.QrCodeUtils;
@@ -15,7 +15,6 @@
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
import com.doumee.dao.web.response.MonthDataResponse;
-import com.doumee.dao.web.response.RoomDetailResponse;
import com.doumee.service.business.BookingsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
index 71ed297..f873522 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.Multifile;
import com.doumee.service.system.MultifileService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
index e0bbda8..317f58a 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.ProjectRel;
import com.doumee.service.business.ProjectRelService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
index 65809ef..f33b0af 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Projects;
import com.doumee.dao.web.response.ProjectsResponse;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java
index 6131135..a7d4316 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomRecordCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.RoomRecord;
import com.doumee.service.business.RoomRecordService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java
index 8a4491e..baf5fef 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomTimeCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.service.business.RoomTimeService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
index 42eb024..accec22 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
@@ -6,10 +6,10 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.business.model.RoomTime;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
index 3fe1216..1dafb58 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.UserRel;
import com.doumee.service.business.UserRelService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java
index cbed8c3..3fe4e16 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/WgListenerCloudController.java
@@ -3,7 +3,7 @@
import cn.hutool.core.io.IoUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.admin.request.InDeviceEntranceParam;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
index 3fd87ff..ea1bcb6 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
@@ -4,9 +4,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.admin.request.BusinessOverDTO;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
index c32250a..cdd50a4 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/NoticeApi.java
@@ -2,10 +2,10 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.Notices;
import com.doumee.service.system.NoticesService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
index b4b243e..523fe8a 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
@@ -3,11 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.dao.web.request.RoomTimeRequest;
import com.doumee.dao.web.request.RoomsRequest;
@@ -22,7 +21,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
index cde100f..334193b 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/UtilApi.java
@@ -3,7 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.UtilService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java b/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java
index f978edf..8566472 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java
@@ -1,7 +1,7 @@
package com.doumee.config.shiro;
import com.alibaba.fastjson.JSON;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
import org.springframework.http.HttpStatus;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 690addf..41fcd31 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -1,6 +1,6 @@
package com.doumee.config.shiro;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java b/server/meeting/meeting_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java
index 20ddfd6..c7866a7 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java
@@ -2,7 +2,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.UnauthorizedException;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
index 6fe3f53..aab3c16 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index dc66574..084191f 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java
index 31bdf95..42c2b66 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java
@@ -2,15 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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 javax.validation.constraints.NotBlank;
import java.util.Date;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java
index 6396f09..987d7f7 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java
index 6327a09..0face5e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java
index 113531e..d5f9895 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java
@@ -2,15 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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 io.swagger.models.auth.In;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
/**
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
index eb6c94e..9e8829a 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
index 75b5aee..16dc743 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
@@ -1,18 +1,15 @@
package com.doumee.dao.business.model;
-import cn.hutool.core.img.Img;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.system.model.Multifile;
-import com.doumee.dao.system.model.SystemUser;
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.math.BigDecimal;
import java.util.Date;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java
index 53570c3..c15cd50 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java
@@ -2,16 +2,15 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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.util.List;
/**
* 浼氳瀹ょ鐞嗗憳鍜屽弬浼氫汉鍛樺叧鑱旇〃
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
index 59df5ed..111510c 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
@@ -1,6 +1,6 @@
package com.doumee.dao.web.request;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.business.model.BookingTime;
import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.business.model.ProjectRel;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingTimeService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingTimeService.java
index 4fb593a..8bb39db 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingTimeService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingTimeService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.BookingTime;
import java.util.List;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
index 4f92c34..b04b551 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
@@ -1,9 +1,9 @@
package com.doumee.service.business;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.model.Bookings;
@@ -18,10 +18,8 @@
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
import com.doumee.dao.web.response.RoomDetailResponse;
-import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
-import java.util.Date;
import java.util.List;
/**
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/DevicesService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/DevicesService.java
index 5207ae9..abf9279 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/DevicesService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/DevicesService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Devices;
import java.util.List;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectRelService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectRelService.java
index d846fc7..1f806b7 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectRelService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectRelService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.ProjectRel;
import java.util.List;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectsService.java
index d1e4381..8c50406 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/ProjectsService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Projects;
import com.doumee.dao.web.response.ProjectsResponse;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomRecordService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomRecordService.java
index b67f4e8..5cc6f68 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomRecordService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomRecordService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.RoomRecord;
import java.util.List;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomTimeService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomTimeService.java
index 2fe7bf3..c9954a2 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomTimeService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomTimeService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.dao.web.request.RoomTimeRequest;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java
index 23a1f1d..389b9c4 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java
@@ -1,9 +1,9 @@
package com.doumee.service.business;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Rooms;
import com.doumee.dao.web.request.RoomsRequest;
import com.doumee.dao.web.response.RoomsResponse;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/UserRelService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/UserRelService.java
index 221a782..52e7636 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/UserRelService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/UserRelService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.UserRel;
import java.util.List;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingTimeServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingTimeServiceImpl.java
index 43ae4a2..047b1b4 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingTimeServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingTimeServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BookingTimeMapper;
import com.doumee.dao.business.join.BookingTimeJoinMapper;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 91afe23..68c6d79 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -7,9 +7,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.wx.MeetConstants;
import com.doumee.core.wx.SendWxMessage;
@@ -49,7 +49,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.awt.print.Book;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/DevicesServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/DevicesServiceImpl.java
index 08a2c0d..60036a0 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/DevicesServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/DevicesServiceImpl.java
@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DevicesMapper;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectRelServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectRelServiceImpl.java
index 556f0f1..4c14802 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectRelServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectRelServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ProjectRelMapper;
import com.doumee.dao.business.model.ProjectRel;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
index dd087e4..8b6988b 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
@@ -1,8 +1,8 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.MeetConstants;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java
index 0b4c8c5..e3e0b66 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomRecordServiceImpl.java
@@ -1,12 +1,11 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.RoomRecordMapper;
import com.doumee.dao.business.join.RoomRecordJoinMapper;
import com.doumee.dao.business.model.Bookings;
-import com.doumee.dao.business.model.Devices;
import com.doumee.dao.business.model.RoomRecord;
import com.doumee.dao.business.model.Rooms;
import com.doumee.dao.system.model.SystemUser;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
index bf35220..4591ccc 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
@@ -1,14 +1,12 @@
package com.doumee.service.business.impl;
-import cn.hutool.core.io.unit.DataUnit;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.BookingTimeMapper;
import com.doumee.dao.business.RoomTimeMapper;
import com.doumee.dao.business.join.BookingTimeJoinMapper;
import com.doumee.dao.business.join.BookingsJoinMapper;
@@ -16,7 +14,6 @@
import com.doumee.dao.business.model.BookingTime;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.business.model.RoomTime;
-import com.doumee.dao.business.model.Rooms;
import com.doumee.dao.web.request.RoomTimeRequest;
import com.doumee.service.business.RoomTimeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
index 5a28dcf..015b024 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
@@ -4,9 +4,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
@@ -18,10 +18,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
-import com.doumee.dao.web.request.MeetingPageRequest;
import com.doumee.dao.web.request.RoomsRequest;
-import com.doumee.dao.web.response.MeetingListResponse;
-import com.doumee.dao.web.response.ProjectsResponse;
import com.doumee.dao.web.response.RoomsResponse;
import com.doumee.service.business.RoomsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -37,8 +34,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/UserRelServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/UserRelServiceImpl.java
index ccb604b..0fe86f3 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/UserRelServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/UserRelServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.UserRelMapper;
import com.doumee.dao.business.model.UserRel;
diff --git a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index be5add3..b47e8d0 100644
--- a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
+++ b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -6,8 +6,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.dao.system.dto.LoginH5DTO;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.dto.LoginPhoneDTO;
@@ -23,7 +24,6 @@
import org.springframework.web.server.ServerWebExchange;
import javax.annotation.Resource;
-import java.util.Objects;
/**
* JWT鑾峰彇浠ょ墝鍜屽埛鏂颁护鐗屾帴鍙�
@@ -98,11 +98,28 @@
@ApiOperation("H5涓氬姟鐧诲綍")
@PostMapping("/loginH5")
@LoginNoRequired
- public ApiResponse<String> loginH5 (@Validated @RequestBody LoginDTO dto, ServerWebExchange serverWebExchange) {
+ public ApiResponse<String> loginH5 (@Validated @RequestBody LoginH5DTO dto, ServerWebExchange serverWebExchange) {
try {
ServerHttpRequest request = serverWebExchange.getRequest();
dto.setCheckCode(false);
- LoginUserInfo user = systemLoginService.loginByPasswordNew(dto,request);
+ LoginUserInfo user = systemLoginService.loginH5(dto,request);
+ String token = jwtTokenUtil.generateToken(user);
+ return ApiResponse.success(token);
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("H5涓氬姟鐧诲綍(鎵嬫満鍙烽獙璇佺爜鐧诲綍锛�")
+ @PostMapping("/loginH5ByPhone")
+ @LoginNoRequired
+ public ApiResponse<String> loginH5ByPhone (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ LoginUserInfo user = systemLoginService.loginH5ByPhone(dto,request);
String token = jwtTokenUtil.generateToken(user);
return ApiResponse.success(token);
}catch (BusinessException e){
@@ -134,10 +151,27 @@
}
@PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("鍙告満鐧诲綍(鎵嬫満鍙烽獙璇佺爜鐧诲綍锛�")
+ @PostMapping("/loginDriverByPhone")
+ @LoginNoRequired
+ public ApiResponse<String> loginDriverByPhone (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ LoginUserInfo user = systemLoginService.loginDriverByPhone(dto,request);
+ String token = jwtTokenUtil.generateToken(user);
+ return ApiResponse.success(token);
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+ @PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("鍙告満鐧诲綍")
@PostMapping("/loginDriver")
@LoginNoRequired
- public ApiResponse<String> loginDriver (@Validated @RequestBody LoginDTO dto, ServerWebExchange serverWebExchange) {
+ public ApiResponse<String> loginDriver (@Validated @RequestBody LoginH5DTO dto, ServerWebExchange serverWebExchange) {
try {
ServerHttpRequest request = serverWebExchange.getRequest();
dto.setCheckCode(false);
@@ -167,6 +201,22 @@
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
}
+ @ApiOperation("绠℃帶浜哄憳楠岃瘉鐮佺櫥褰�")
+ @PostMapping("/loginGkUserWithCode")
+ @LoginNoRequired
+ public ApiResponse<String> loginGkUserWithCode (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ LoginUserInfo user = systemLoginService.loginGkUserWithCode(dto,request);
+ String token = jwtTokenUtil.generateToken(user);
+ return ApiResponse.success(token);
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
/**
* 鍒锋柊JWT浠ょ墝,鐢ㄦ棫鐨勪护鐗屾崲鏂扮殑浠ょ墝
diff --git a/server/system_service/src/main/java/com/doumee/api/BaseController.java b/server/system_service/src/main/java/com/doumee/api/BaseController.java
index 9e3ab4a..6386efc 100644
--- a/server/system_service/src/main/java/com/doumee/api/BaseController.java
+++ b/server/system_service/src/main/java/com/doumee/api/BaseController.java
@@ -1,10 +1,9 @@
package com.doumee.api;
import com.alibaba.fastjson.JSONObject;
-import com.doumee.config.jwt.JwtProperties;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -14,11 +13,9 @@
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.TimeUnit;
/**
* Controller鍩虹被
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java
index 26880b7..f44ae7a 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/NoticesCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.Notices;
import com.doumee.service.system.NoticesService;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java
index ef10c47..da7453b 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemCloudController.java
@@ -3,8 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemUserBiz;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.system.SystemLoginService;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java
index 6166fcb..778d723 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java
@@ -7,9 +7,9 @@
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.DataPermissionConstants;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.SystemDataPermission;
import com.doumee.dao.system.vo.SystemDataPermissionListVO;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
index 5f9f971..051279a 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
@@ -6,9 +6,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemDepartment;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
index 7d0dcbc..a22fdbd 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
@@ -5,9 +5,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemDictDTO;
import com.doumee.dao.system.model.SystemDict;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
index 5911a59..b5db014 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
@@ -5,9 +5,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.PlatformConfigDTO;
import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java
index 6a2a031..3b36c40 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemLoginLogCloudController.java
@@ -3,9 +3,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemLoginLogDTO;
import com.doumee.dao.system.model.SystemLoginLog;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
index d274b92..e8ae9da 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
@@ -5,7 +5,7 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.dao.system.model.SystemMenu;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java
index 303ada4..a585afc 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java
@@ -3,7 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Monitor;
import com.doumee.core.utils.Utils;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
index c99d039..3cd2f9a 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
@@ -5,9 +5,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
import com.doumee.dao.system.model.SystemPermission;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
index a60d8ba..cd51f4f 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
@@ -6,9 +6,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemPosition;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
index f5d0896..23bac9c 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
@@ -5,9 +5,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateRoleMenuDTO;
import com.doumee.dao.system.dto.CreateRolePermissionDTO;
@@ -18,7 +18,6 @@
import com.doumee.service.system.SystemRoleService;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java
index 2f4ce98..79703a8 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemTraceLogCloudController.java
@@ -3,8 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemTraceLogDTO;
import com.doumee.dao.system.model.SystemTraceLog;
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
index cb1b9bb..1e7c84e 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
@@ -6,9 +6,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/NoticesController.java b/server/system_service/src/main/java/com/doumee/api/system/NoticesController.java
index 7fa757f..470023a 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/NoticesController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/NoticesController.java
@@ -3,9 +3,9 @@
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.Notices;
import com.doumee.service.system.NoticesService;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
index 3d7543e..29ff6b2 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
@@ -1,45 +1,25 @@
package com.doumee.api.system;
import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.system.SystemUserBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.utils.Constants;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.system.SystemLoginService;
-import com.hikvision.artemis.sdk.ArtemisHttpUtil;
-import com.hikvision.artemis.sdk.util.HttpUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
+
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
/**
* @author Eva.Caesar Liu
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
index 3546357..c89569c 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
@@ -6,9 +6,9 @@
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.DataPermissionConstants;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.SystemDataPermission;
import com.doumee.dao.system.vo.SystemDataPermissionListVO;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
index 7d341f0..b79e196 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
@@ -5,9 +5,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemDepartment;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java
index 32345b7..df67e0a 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java
@@ -4,9 +4,9 @@
import com.doumee.biz.system.SystemDictBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemDictDTO;
import com.doumee.dao.system.model.SystemDict;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java
index 49de57a..b344195 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java
@@ -4,9 +4,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
import com.doumee.dao.system.dto.VisitConfigDTO;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemLoginLogController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemLoginLogController.java
index 3949e25..79aec56 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemLoginLogController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemLoginLogController.java
@@ -2,9 +2,9 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.QuerySystemLoginLogDTO;
import com.doumee.dao.system.model.SystemLoginLog;
import com.doumee.service.system.SystemLoginLogService;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
index 569b7c6..d9efe76 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -4,7 +4,7 @@
import com.doumee.biz.system.SystemMenuBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.dao.system.model.SystemMenu;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemMonitorController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemMonitorController.java
index b16d68b..9ef0bb9 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemMonitorController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemMonitorController.java
@@ -2,7 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Monitor;
import com.doumee.core.utils.Utils;
import io.swagger.annotations.Api;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
index c345e44..1d1fde3 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
@@ -4,9 +4,9 @@
import com.doumee.biz.system.SystemPermissionBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
import com.doumee.dao.system.model.SystemPermission;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
index 0c257b6..b96508e 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
@@ -6,9 +6,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemPosition;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
index 3b71d00..c646de8 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -4,9 +4,9 @@
import com.doumee.biz.system.SystemRoleBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateRoleMenuDTO;
import com.doumee.dao.system.dto.CreateRolePermissionDTO;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemTraceLogController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemTraceLogController.java
index e4745dc..5e1f8b5 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemTraceLogController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemTraceLogController.java
@@ -2,8 +2,8 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.QuerySystemTraceLogDTO;
import com.doumee.dao.system.model.SystemTraceLog;
import com.doumee.service.system.SystemTraceLogService;
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
index 2c3bf75..9bcaef0 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -5,9 +5,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/SystemDepartmentBiz.java b/server/system_service/src/main/java/com/doumee/biz/system/SystemDepartmentBiz.java
index 7a7ba8c..43eaa5d 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/SystemDepartmentBiz.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/SystemDepartmentBiz.java
@@ -1,6 +1,5 @@
package com.doumee.biz.system;
-import com.doumee.core.model.ApiResponse;
import com.doumee.dao.system.model.SystemDepartment;
import com.doumee.dao.system.vo.SystemDepartmentListVO;
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDepartmentBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDepartmentBizImpl.java
index 43bcae1..4c46ed5 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDepartmentBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDepartmentBizImpl.java
@@ -4,10 +4,7 @@
import com.doumee.biz.system.SystemDepartmentBiz;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.utils.ID;
import com.doumee.dao.system.SystemUserJoinMapper;
-import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDepartment;
import com.doumee.dao.system.model.SystemDepartmentUser;
import com.doumee.dao.system.model.SystemUser;
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 332639c..955b70d 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -3,7 +3,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.SystemDict;
import com.doumee.dao.system.model.SystemDictData;
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java
index 33b987b..5c268ec 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java
@@ -3,8 +3,7 @@
import com.doumee.biz.system.SystemRoleBiz;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.utils.Constants;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.system.dto.CreateRoleMenuDTO;
import com.doumee.dao.system.dto.CreateRolePermissionDTO;
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index ea90ca1..24784ff 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -9,11 +9,10 @@
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.PwdCheckUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.system.SystemDepartmentUserMapper;
import com.doumee.dao.system.dto.*;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.dao.system.model.*;
@@ -29,7 +28,6 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
index d9a6ada..6100bdc 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
@@ -5,15 +5,12 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.util.ContentCachingRequestWrapper;
import javax.servlet.ServletInputStream;
import javax.servlet.http.Cookie;
diff --git a/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java b/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
index fff1fdd..56d226e 100644
--- a/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
+++ b/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.system.SystemUserMapper;
diff --git a/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java b/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
index aca677e..8479135 100644
--- a/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
@@ -1,6 +1,6 @@
package com.doumee.config.mybatis;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.binding.MapperMethod;
import org.apache.ibatis.executor.Executor;
diff --git a/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java b/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
index 1a90df0..9ce69e1 100644
--- a/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
+++ b/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
@@ -1,14 +1,11 @@
package com.doumee.core.annotation.pr;
-import com.doumee.core.servlet.ServletDuplicateInputStream;
import com.doumee.core.utils.Utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.util.DigestUtils;
-import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
diff --git a/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java b/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java
index 34f8e8c..1e1ccad 100644
--- a/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java
@@ -1,7 +1,7 @@
package com.doumee.core.annotation.pr;
import com.alibaba.fastjson.JSON;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.constants.ResponseStatus;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
diff --git a/server/system_service/src/main/java/com/doumee/core/annotation/trace/TraceInterceptor.java b/server/system_service/src/main/java/com/doumee/core/annotation/trace/TraceInterceptor.java
index 6a94802..67d6784 100644
--- a/server/system_service/src/main/java/com/doumee/core/annotation/trace/TraceInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/core/annotation/trace/TraceInterceptor.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.doumee.core.constants.ExceptionLevel;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.servlet.ServletDuplicateInputStream;
-import com.doumee.core.servlet.ServletDuplicateOutputStream;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.dao.servlet.ServletDuplicateInputStream;
+import com.doumee.dao.servlet.ServletDuplicateOutputStream;
import com.doumee.core.utils.Utils;
import com.doumee.dao.system.model.SystemTraceLog;
import com.doumee.service.system.SystemTraceLogService;
diff --git a/server/system_service/src/main/java/com/doumee/core/aware/DefaultDataPermissionAware.java b/server/system_service/src/main/java/com/doumee/core/aware/DefaultDataPermissionAware.java
index 8bf4831..fbebd3a 100644
--- a/server/system_service/src/main/java/com/doumee/core/aware/DefaultDataPermissionAware.java
+++ b/server/system_service/src/main/java/com/doumee/core/aware/DefaultDataPermissionAware.java
@@ -1,7 +1,6 @@
package com.doumee.core.aware;
-import com.doumee.core.constants.DataPermissionConstants;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.system.model.SystemDataPermission;
import com.doumee.service.system.SystemDataPermissionService;
import lombok.extern.slf4j.Slf4j;
@@ -9,7 +8,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.AnnotationConfigurationException;
import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
import java.lang.reflect.Method;
import java.util.*;
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index f336a1e..9b6bc6d 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1,29 +1,19 @@
package com.doumee.core.utils;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.doumee.core.model.LoginUserInfo;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import io.swagger.models.auth.In;
-import org.apache.batik.util.Platform;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.CollectionUtils;
import java.io.IOException;
import java.math.BigDecimal;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Random;
-import java.util.*;
-import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -551,10 +541,15 @@
}
+ /**
+ * 杩愬崟浜嗗崟浣嶇被鍨� 0涓囨敮 1绠�
+ */
+ public static final int UNIT_TYPE =1;
public interface memberType{
int driver = 0;//鍙告満浜哄憳
int visitor = 1;//鏅�氳瀹�
int internal = 2;//鍐呴儴浜哄憳
+ int gkuser = 3;//绠℃帶浜哄憳锛堣繍鍗曟煡璇級
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WmsInterfaceLogMapper.java b/server/system_service/src/main/java/com/doumee/dao/business/WmsInterfaceLogMapper.java
similarity index 100%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/WmsInterfaceLogMapper.java
rename to server/system_service/src/main/java/com/doumee/dao/business/WmsInterfaceLogMapper.java
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index 03ae864..37b5bc6 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
index 0234167..5e2cd10 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
index 65570b2..f8ad0d2 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
@@ -100,4 +100,7 @@
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField(exist = false)
private Date endTime;
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍙告満 1璁垮 2鍐呴儴鍛樺伐 3")
+ @TableField(exist = false)
+ private Integer userType;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java b/server/system_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
similarity index 97%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
rename to server/system_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
index 29dc9f3..342f63b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateInputStream.java b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateInputStream.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateInputStream.java
rename to server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateInputStream.java
index 7fb06c6..ddc9a8a 100644
--- a/server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateInputStream.java
+++ b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateInputStream.java
@@ -1,4 +1,4 @@
-package com.doumee.core.servlet;
+package com.doumee.dao.servlet;
import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
diff --git a/server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateOutputStream.java b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateOutputStream.java
similarity index 97%
rename from server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateOutputStream.java
rename to server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateOutputStream.java
index e8353e4..abe7b94 100644
--- a/server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateOutputStream.java
+++ b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateOutputStream.java
@@ -1,4 +1,4 @@
-package com.doumee.core.servlet;
+package com.doumee.dao.servlet;
import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
diff --git a/server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateRequestWrapper.java b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateRequestWrapper.java
similarity index 96%
rename from server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateRequestWrapper.java
rename to server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateRequestWrapper.java
index 3c10d66..3b46964 100644
--- a/server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateRequestWrapper.java
+++ b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateRequestWrapper.java
@@ -1,4 +1,4 @@
-package com.doumee.core.servlet;
+package com.doumee.dao.servlet;
import lombok.Getter;
diff --git a/server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateResponseWrapper.java b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateResponseWrapper.java
similarity index 95%
rename from server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateResponseWrapper.java
rename to server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateResponseWrapper.java
index 0fc1e0c..14646ac 100644
--- a/server/system_service/src/main/java/com/doumee/core/servlet/ServletDuplicateResponseWrapper.java
+++ b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletDuplicateResponseWrapper.java
@@ -1,4 +1,4 @@
-package com.doumee.core.servlet;
+package com.doumee.dao.servlet;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
diff --git a/server/system_service/src/main/java/com/doumee/core/servlet/ServletRewriteFilter.java b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletRewriteFilter.java
similarity index 97%
rename from server/system_service/src/main/java/com/doumee/core/servlet/ServletRewriteFilter.java
rename to server/system_service/src/main/java/com/doumee/dao/servlet/ServletRewriteFilter.java
index 0a62b4c..9073926 100644
--- a/server/system_service/src/main/java/com/doumee/core/servlet/ServletRewriteFilter.java
+++ b/server/system_service/src/main/java/com/doumee/dao/servlet/ServletRewriteFilter.java
@@ -1,4 +1,4 @@
-package com.doumee.core.servlet;
+package com.doumee.dao.servlet;
import org.springframework.stereotype.Component;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginH5DTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginH5DTO.java
new file mode 100644
index 0000000..5cda109
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginH5DTO.java
@@ -0,0 +1,37 @@
+package com.doumee.dao.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author Eva.Caesar Liu
+ * @date 2023/05/04 18:21
+ */
+@Data
+@ApiModel("鐧诲綍鍙傛暟")
+public class LoginH5DTO implements Serializable {
+
+ @NotBlank(message = "鐢ㄦ埛鍚嶄笉鑳戒负绌�")
+ @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ private String username;
+
+ @ApiModelProperty(value = "寰俊openId")
+ private String openid;
+
+ @NotBlank(message = "瀵嗙爜涓嶈兘涓虹┖")
+ @ApiModelProperty(value = "瀵嗙爜")
+ private String password;
+
+ @ApiModelProperty(value = "楠岃瘉鐮�")
+ private String code;
+
+ @ApiModelProperty(value = "楠岃瘉鐮乁UID")
+ private String uuid;
+
+ @ApiModelProperty(value = "鏄惁楠岃瘉楠岃瘉鐮�" , hidden = true)
+ private Boolean checkCode;
+}
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java
index 6dc5f3e..4f8a018 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java
@@ -23,4 +23,6 @@
private String code;
@ApiModelProperty(value = "openid")
private String openid;
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鍙告満锛�1=璁垮锛�2=鍐呴儴鍛樺伐")
+ private Integer userType;
}
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java
index c328087..828f33f 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java
@@ -1,6 +1,6 @@
package com.doumee.dao.system.dto;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/UpdatePwdDto.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/UpdatePwdDto.java
index 9335e62..1498863 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/UpdatePwdDto.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/UpdatePwdDto.java
@@ -1,12 +1,11 @@
package com.doumee.dao.system.dto;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/VisitConfigDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/VisitConfigDTO.java
index 785a731..88f7479 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/VisitConfigDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/VisitConfigDTO.java
@@ -1,6 +1,6 @@
package com.doumee.dao.system.dto;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
index adfdfc3..ca29dc8 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
index a469a5c..219829c 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +10,7 @@
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;
/**
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java
index 028c6d1..8ed6612 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java
@@ -1,15 +1,14 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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 io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java
index 6887f64..695586d 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java
@@ -1,17 +1,15 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
-import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.util.Date;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
index 28343ea..45df0c1 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
@@ -2,11 +2,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.Date;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java
index c0a111a..5d644c0 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java
@@ -1,7 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java
index 6f3174e..de4c49a 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java
@@ -1,7 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java
index 4d536fe..afe63eb 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java
@@ -1,7 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
index 5f59869..ee8587f 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
index d972eda..f51df6b 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
@@ -1,7 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java
index 0d45205..10a6286 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java
index b75c99c..47f2131 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java
@@ -2,11 +2,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.Date;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java
index 7970e05..1bba771 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java
@@ -1,7 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java
index 84ba3a4..f63abea 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java
@@ -1,6 +1,6 @@
package com.doumee.dao.system.model;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java
index 718099d..70c0602 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java
@@ -1,6 +1,6 @@
package com.doumee.dao.system.model;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
index 8ed6e74..178b021 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
@@ -1,7 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 96c2bc7..98054d3 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -3,13 +3,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
@@ -99,8 +98,8 @@
@ApiModelProperty(value = "寰俊openid鎺ㄩ�佹捣搴锋椂闂�", example = "1", hidden = true)
private Date openidHkDate;
- //2024骞�12鏈�6鏃�11:00:30 绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳
- @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1璁垮", example = "0")
+ //2024骞�12鏈�6鏃�11:00:30 绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳 3tms绠℃帶浜哄憳
+ @ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳 3tms绠℃帶浜哄憳", example = "0")
private Integer type;
@ApiModelProperty(value = "寰俊鏄电О")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java
index 31cbaf4..bd92310 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java
@@ -1,6 +1,6 @@
package com.doumee.dao.system.model;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
similarity index 94%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
rename to server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
index 9132ddb..e1351b6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
@@ -1,21 +1,19 @@
-package com.doumee.service.business.impl.thrid;
+package com.doumee.service.business.impl.third;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.tms.model.TMSContants;
-import com.doumee.core.tms.model.request.*;
-import com.doumee.core.tms.model.response.*;
+import com.doumee.dao.business.WmsInterfaceLogMapper;
+import com.doumee.dao.business.model.WmsInterfaceLog;
+import com.doumee.service.business.third.model.TMSContants;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
-import com.doumee.dao.business.*;
-import com.doumee.dao.business.dao.MemberMapper;
-import com.doumee.dao.business.dao.SmsEmailMapper;
-import com.doumee.dao.business.model.*;
import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.request.*;
+import com.doumee.service.business.third.model.response.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,20 +31,6 @@
@Slf4j
public class TmsServiceImpl implements TmsService {
- @Autowired
- private SmsEmailMapper smsEmailMapper;
- @Autowired
- private PlatformWmsJobMapper platformWmsJobMapper;
- @Autowired
- private PlatformGroupMapper platformGroupMapper;
- @Autowired
- private CarsMapper carsMapper;
- @Autowired
- private MemberMapper memberMapper;
- @Autowired
- private PlatformJobMapper platformJobMapper;
- @Autowired
- private PlatformWmsDetailMapper platformWmsDetailMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
@@ -296,13 +280,29 @@
return true;
}
/**
+ * 钀ラ攢浜哄憳淇℃伅瀹炴椂鏌ヨ
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public TmsEmployeeListResponse getEmployeeList(TmsEmployeeListRequest param){
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getEmployeeList[0];
+ TmsBaseResponse<List<TmsEmployeeListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getEmployeeList[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<List<TmsEmployeeListResponse>>>(){});
+ if(response ==null || response.getData() == null || response.getData().size() ==0){
+ return new TmsEmployeeListResponse();
+ }
+ return response.getData().get(0);
+ }
+ /**
* 鍑哄簱鑳藉姏缁熻
* 鏌ヨ鏌愪釜鍘�/鍏ㄩ儴鍘傜殑浠婃棩璁″垝閲忋�佷粖鏃ュ嚭搴撻噺銆佷粖鏃ユ湭鍑哄簱閲忔暟鎹��
* @param param 鍙傛暟
* @return TmsBaseResponse
*/
@Override
- public TmsOutboundCapabilityResponse getOutboundCapability(TmsFacrotyCodeListRequest param){
+ public TmsOutboundCapabilityResponse getOutboundCapability(TmsFacrotyCodeListRequest param){
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getOutboundCapability[0];
TmsBaseResponse<TmsOutboundCapabilityResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getOutboundCapability[1],JSONObject.toJSONString(param)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java
similarity index 91%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java
index ed8210f..32b37d0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -1,12 +1,9 @@
package com.doumee.service.business.third;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.doumee.core.tms.model.TMSContants;
-import com.doumee.core.tms.model.request.*;
-import com.doumee.core.tms.model.response.*;
-import com.doumee.core.utils.Constants;
-import org.apache.commons.lang3.StringUtils;
+
+import com.doumee.service.business.third.model.*;
+import com.doumee.service.business.third.model.response.*;
+import com.doumee.service.business.third.model.request.*;
import java.util.List;
@@ -99,4 +96,6 @@
* @return TmsBaseResponse
*/
boolean driverArrival(TmsDriverStartAndArrivalRequest param);
+
+ TmsEmployeeListResponse getEmployeeList(TmsEmployeeListRequest param);
}
diff --git a/server/system_service/src/main/java/com/doumee/core/model/ApiResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/ApiResponse.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/core/model/ApiResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/ApiResponse.java
index 051cc84..aca75c3 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/ApiResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/ApiResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model;
+package com.doumee.service.business.third.model;
import com.doumee.core.constants.ResponseStatus;
import io.swagger.annotations.ApiModel;
diff --git a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/LoginUserInfo.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/LoginUserInfo.java
index b635d74..287b003 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/LoginUserInfo.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model;
+package com.doumee.service.business.third.model;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Company;
diff --git a/server/system_service/src/main/java/com/doumee/core/model/LoginUserModel.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/LoginUserModel.java
similarity index 82%
rename from server/system_service/src/main/java/com/doumee/core/model/LoginUserModel.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/LoginUserModel.java
index 3647a7c..a624b62 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/LoginUserModel.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/LoginUserModel.java
@@ -1,8 +1,7 @@
-package com.doumee.core.model;
+package com.doumee.service.business.third.model;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
import lombok.Data;
/**
diff --git a/server/system_service/src/main/java/com/doumee/core/model/PageData.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/PageData.java
similarity index 97%
rename from server/system_service/src/main/java/com/doumee/core/model/PageData.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/PageData.java
index ddfae7b..dbb2ce7 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/PageData.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/PageData.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model;
+package com.doumee.service.business.third.model;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.pagehelper.PageInfo;
diff --git a/server/system_service/src/main/java/com/doumee/core/model/PageWrap.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/PageWrap.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/core/model/PageWrap.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/PageWrap.java
index 912b978..431aa16 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/PageWrap.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/PageWrap.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model;
+package com.doumee.service.business.third.model;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
similarity index 97%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
index 287a693..6e55bb4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model;
+package com.doumee.service.business.third.model;
import com.doumee.core.utils.Constants;
import org.apache.commons.lang3.StringUtils;
@@ -28,6 +28,7 @@
String[] getDriverTaskDetail = new String[]{"/tms/zhyt/getDriverTaskDetail", "銆怲MS銆戝徃鏈哄緟鍔炰换鍔¤鎯呫��"};//3.16鍙告満寰呭姙浠诲姟璇︽儏銆�
String[] driverStart = new String[]{"/tms/zhyt/driverStartAndArrival", "銆怲MS銆戝徃鏈哄惎杩愩��"};//3.17鍙告満鍚繍
String[] driverArrival = new String[]{"/tms/zhyt/driverStartAndArrival", "銆怲MS銆戝徃鏈哄埌璐с��"};//3.18鍙告満鍒拌揣
+ String[] getEmployeeList = new String[]{"/tms/zhyt/getEmployeeList", "銆怲MS銆戣惀閿�浜哄憳淇℃伅瀹炴椂鏌ヨ銆�"};//3.19钀ラ攢浜哄憳淇℃伅瀹炴椂鏌ヨ
}
public enum TopStatusLevel {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsBaseRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsBaseRequest.java
similarity index 82%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsBaseRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsBaseRequest.java
index 7b1e66c..1105118 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsBaseRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsBaseRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsCircleStatusListRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsCircleStatusListRequest.java
similarity index 82%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsCircleStatusListRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsCircleStatusListRequest.java
index 30d7b03..5810410 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsCircleStatusListRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsCircleStatusListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverStartAndArrivalRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverStartAndArrivalRequest.java
similarity index 91%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverStartAndArrivalRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverStartAndArrivalRequest.java
index a48221d..49e6a1c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverStartAndArrivalRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverStartAndArrivalRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskInfoRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskInfoRequest.java
similarity index 86%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskInfoRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskInfoRequest.java
index eca5132..907487f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskInfoRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskInfoRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskListRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskListRequest.java
similarity index 88%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskListRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskListRequest.java
index a6680e6..fa2e7bc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskListRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskListRequest.java
@@ -1,10 +1,8 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* @author 姹熻箘韫�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskParameterRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskParameterRequest.java
similarity index 88%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskParameterRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskParameterRequest.java
index 3e20927..acec6de 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskParameterRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsDriverTaskParameterRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsEmployeeListRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsEmployeeListRequest.java
new file mode 100644
index 0000000..c07f515
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsEmployeeListRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.service.business.third.model.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms钀ラ攢浜哄憳淇℃伅瀹炴椂鏌ヨ璇锋眰鍙傛暟")
+public class TmsEmployeeListRequest {
+
+ private String tel;//鏄� 鎵嬫満鍙�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsFacrotyCodeListRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsFacrotyCodeListRequest.java
similarity index 83%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsFacrotyCodeListRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsFacrotyCodeListRequest.java
index 5abbe5f..1929b60 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsFacrotyCodeListRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsFacrotyCodeListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsGisListRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsGisListRequest.java
similarity index 83%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsGisListRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsGisListRequest.java
index fed48a9..c7e02aa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsGisListRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsGisListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsLockStatusQueryRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsLockStatusQueryRequest.java
similarity index 85%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsLockStatusQueryRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsLockStatusQueryRequest.java
index 1e13ae2..4303d17 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsLockStatusQueryRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsLockStatusQueryRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderInfoRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderInfoRequest.java
similarity index 82%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderInfoRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderInfoRequest.java
index eec06e5..f1c0ace 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderInfoRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderInfoRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderListParamRequest.java
similarity index 93%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderListParamRequest.java
index e2b6122..57dde38 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderListParamRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderListRequest.java
similarity index 85%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderListRequest.java
index 6f77c8d..9c174bc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListParamRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderNoFinishListParamRequest.java
similarity index 86%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListParamRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderNoFinishListParamRequest.java
index 3785935..335a64d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListParamRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderNoFinishListParamRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderNoFinishListRequest.java
similarity index 86%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderNoFinishListRequest.java
index 3c100e9..d9f70c9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOrderNoFinishListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOutQtyAndVehicleQtyRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOutQtyAndVehicleQtyRequest.java
similarity index 88%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOutQtyAndVehicleQtyRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOutQtyAndVehicleQtyRequest.java
index 2c52a7e..1a4028b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOutQtyAndVehicleQtyRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsOutQtyAndVehicleQtyRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsPagerRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsPagerRequest.java
similarity index 85%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsPagerRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsPagerRequest.java
index 8ddb8cc..098e075 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsPagerRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsPagerRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsSevenArrivalDetailsRequest.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsSevenArrivalDetailsRequest.java
similarity index 89%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsSevenArrivalDetailsRequest.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsSevenArrivalDetailsRequest.java
index cfe63c1..cbf94da 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsSevenArrivalDetailsRequest.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/request/TmsSevenArrivalDetailsRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.request;
+package com.doumee.service.business.third.model.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsBasePageResponse.java
similarity index 88%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsBasePageResponse.java
index 0c519f9..1ed2906 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsBasePageResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBaseResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsBaseResponse.java
similarity index 91%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBaseResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsBaseResponse.java
index 8001926..98d5891 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBaseResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsBaseResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsCircleStatusListResponse.java
similarity index 94%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsCircleStatusListResponse.java
index 0ff38e0..6c8769f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsCircleStatusListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsCircleStatusResultListResponse.java
similarity index 91%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsCircleStatusResultListResponse.java
index 91f44ba..ed7738f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsCircleStatusResultListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDistributionOfDeliveryLocResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDistributionOfDeliveryLocResponse.java
similarity index 94%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDistributionOfDeliveryLocResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDistributionOfDeliveryLocResponse.java
index 3f90c78..223a719 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDistributionOfDeliveryLocResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDistributionOfDeliveryLocResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskInfoResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskInfoResponse.java
similarity index 97%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskInfoResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskInfoResponse.java
index c7216bd..1b96ed8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskInfoResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskInfoResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskListResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskListResponse.java
similarity index 96%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskListResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskListResponse.java
index ddc471f..33c26f7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskListResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskPalletDetailsResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskPalletDetailsResponse.java
similarity index 90%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskPalletDetailsResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskPalletDetailsResponse.java
index 5a79b3a..7965d16 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskPalletDetailsResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskPalletDetailsResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskProductDetailsResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskProductDetailsResponse.java
similarity index 93%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskProductDetailsResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskProductDetailsResponse.java
index fff6748..13570f5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskProductDetailsResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskProductDetailsResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskTransportStopsResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskTransportStopsResponse.java
similarity index 92%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskTransportStopsResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskTransportStopsResponse.java
index 8bccd1c..855aa45 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskTransportStopsResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsDriveTaskTransportStopsResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsEmployeeListResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsEmployeeListResponse.java
new file mode 100644
index 0000000..38ba9b6
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsEmployeeListResponse.java
@@ -0,0 +1,25 @@
+package com.doumee.service.business.third.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms绠℃帶骞冲彴钀ラ攢浜哄憳瀹炴椂鏌ヨ杩斿洖鍙傛暟")
+public class TmsEmployeeListResponse {
+
+
+ @ApiModelProperty(value = "id" )
+ private String id;// id
+ @ApiModelProperty(value = "鎵嬫満鍙�" )
+ private String tel;// 鎵嬫満鍙�
+ @ApiModelProperty(value = "濮撳悕" )
+ private String name;// 濮撳悕
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisListResponse.java
similarity index 87%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisListResponse.java
index e59e4b6..57ff9e4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStartEndInfoResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisStartEndInfoResponse.java
similarity index 94%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStartEndInfoResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisStartEndInfoResponse.java
index 3d8efab..5739e07d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStartEndInfoResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisStartEndInfoResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisStatusInfoResponse.java
similarity index 92%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisStatusInfoResponse.java
index 292a8c1..70871c1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGisStatusInfoResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsInventoryListResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsInventoryListResponse.java
similarity index 96%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsInventoryListResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsInventoryListResponse.java
index 356b364..6ec4903 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsInventoryListResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsInventoryListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsLockStatusQueryResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsLockStatusQueryResponse.java
similarity index 92%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsLockStatusQueryResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsLockStatusQueryResponse.java
index c8fa5b2..9633455 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsLockStatusQueryResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsLockStatusQueryResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java
similarity index 97%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java
index a0e66fb..2973106 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderListResponse.java
similarity index 97%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderListResponse.java
index 1ba3038..2fcf334 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderNoFinishListResponse.java
similarity index 97%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderNoFinishListResponse.java
index cff2395..13fa45a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderNoFinishListResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderNoFinishListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutQtyAndVehicleQtyResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java
similarity index 93%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutQtyAndVehicleQtyResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java
index 4d5740f..37446df 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutQtyAndVehicleQtyResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutQtyAndVehicleQtyResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityInfoResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutboundCapabilityInfoResponse.java
similarity index 96%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityInfoResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutboundCapabilityInfoResponse.java
index 20c8a1c..ddaad8a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityInfoResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutboundCapabilityInfoResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutboundCapabilityResponse.java
similarity index 90%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutboundCapabilityResponse.java
index 76efa34..c2fb5ac 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOutboundCapabilityResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOutboundCapabilityResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsSevenArrivalStatusAndDetailsResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsSevenArrivalStatusAndDetailsResponse.java
similarity index 94%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsSevenArrivalStatusAndDetailsResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsSevenArrivalStatusAndDetailsResponse.java
index ad02453..094f39e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsSevenArrivalStatusAndDetailsResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsSevenArrivalStatusAndDetailsResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsTotalAndReportVehicleQtyResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsTotalAndReportVehicleQtyResponse.java
similarity index 92%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsTotalAndReportVehicleQtyResponse.java
rename to server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsTotalAndReportVehicleQtyResponse.java
index 87aa67c..6ea410e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsTotalAndReportVehicleQtyResponse.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsTotalAndReportVehicleQtyResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.tms.model.response;
+package com.doumee.service.business.third.model.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/MultifileService.java b/server/system_service/src/main/java/com/doumee/service/system/MultifileService.java
index 04648df..609bcc0 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/MultifileService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/MultifileService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.model.Multifile;
import java.util.List;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/NoticesService.java b/server/system_service/src/main/java/com/doumee/service/system/NoticesService.java
index 0c45a5a..ed03d12 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/NoticesService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/NoticesService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.model.Notices;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemDataPermissionService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemDataPermissionService.java
index 8dfd607..cfc7b8d 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemDataPermissionService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemDataPermissionService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.model.SystemDataPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemDictDataService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemDictDataService.java
index c8fbcf9..48b8baf 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemDictDataService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemDictDataService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.PlatformConfigDTO;
import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
import com.doumee.dao.system.dto.VisitConfigDTO;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemDictService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemDictService.java
index 074b1e1..ff75981 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemDictService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemDictService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.QuerySystemDictDTO;
import com.doumee.dao.system.model.SystemDict;
import com.doumee.dao.system.vo.SystemDictListVO;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginLogService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginLogService.java
index ca36e86..009b044 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginLogService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.QuerySystemLoginLogDTO;
import com.doumee.dao.system.model.SystemLoginLog;
import java.util.List;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
index 77bdddb..58bc41f 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.dao.system.dto.LoginByOpenidDTO;
+import com.doumee.dao.system.dto.LoginH5DTO;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.dto.LoginPhoneDTO;
import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -23,18 +23,24 @@
String loginByPassword (LoginDTO dto, HttpServletRequest request);
LoginUserInfo loginByPasswordNew (LoginDTO dto, ServerHttpRequest request);
+ LoginUserInfo loginH5 (LoginH5DTO dto, ServerHttpRequest request);
LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request);
LoginUserInfo loginByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
- LoginUserInfo driverLogin(LoginDTO dto, ServerHttpRequest request);
+ LoginUserInfo driverLogin(LoginH5DTO dto, ServerHttpRequest request);
LoginUserInfo loginDriverWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
+ LoginUserInfo loginGkUserWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
/**
* 鏍规嵁 openId鐧诲綍
* @param userId
* @return
*/
String loginByUserId(Integer userId);
+
+ LoginUserInfo loginH5ByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
+
+ LoginUserInfo loginDriverByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
}
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemPermissionService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemPermissionService.java
index 6b01389..1c7fcba 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemPermissionService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemPermissionService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.vo.SystemPermissionListVO;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemRoleMenuService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemRoleMenuService.java
index 09eb206..f5e14ce 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemRoleMenuService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemRoleMenuService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.model.SystemRoleMenu;
import java.util.List;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemRolePermissionService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemRolePermissionService.java
index b3fcb94..d0b2fad 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemRolePermissionService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemRolePermissionService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.model.SystemRolePermission;
import java.util.List;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemRoleService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemRoleService.java
index c408be0..94ddf13 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemRoleService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemRoleService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.vo.SystemRoleListVO;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemTraceLogService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemTraceLogService.java
index 95205be..110f30a 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemTraceLogService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemTraceLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.QuerySystemTraceLogDTO;
import com.doumee.dao.system.model.SystemTraceLog;
import java.util.List;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemUserRoleService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemUserRoleService.java
index 01dd9e4..05ee722 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemUserRoleService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemUserRoleService.java
@@ -1,7 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.model.SystemUserRole;
import java.util.List;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
index 3440f15..033e7f4 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
@@ -1,8 +1,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemUserListVO;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/MultifileServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/MultifileServiceImpl.java
index 212d2de..d10c2c9 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/MultifileServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/MultifileServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.system.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
index c71f2ca..cb2fa8b 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -6,9 +6,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.system.dto.NoticesDTO;
@@ -18,7 +17,6 @@
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
index c96a1a1..7310f72 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Company;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
index 7d005ce..51532ce 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.SystemDictMapper;
@@ -19,7 +19,6 @@
import com.doumee.service.system.SystemDictDataService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import lombok.extern.java.Log;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
index 4d6e880..da488f6 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
@@ -2,8 +2,8 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.dto.QuerySystemDictDTO;
import com.doumee.dao.system.model.SystemDict;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java
index 271fa25..1636c26 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.system.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.SystemLoginLogMapper;
import com.doumee.dao.system.dto.QuerySystemLoginLogDTO;
import com.doumee.dao.system.model.SystemLoginLog;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index b4b4f11..527883a 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -5,7 +5,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.dao.system.dto.LoginH5DTO;
+import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
@@ -16,13 +18,13 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.system.SystemUserMapper;
-import com.doumee.dao.system.dto.LoginByOpenidDTO;
import com.doumee.dao.system.dto.LoginDTO;
import com.doumee.dao.system.dto.LoginPhoneDTO;
import com.doumee.dao.system.model.*;
+import com.doumee.service.business.third.model.request.TmsEmployeeListRequest;
+import com.doumee.service.business.third.model.response.TmsEmployeeListResponse;
import com.doumee.service.common.CaptchaService;
import com.doumee.service.system.*;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
@@ -87,6 +89,8 @@
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private TmsService tmsService;
@Resource
private JwtTokenUtil jwtTokenUtil;
@@ -137,19 +141,9 @@
@Override
public LoginUserInfo loginByPasswordNew(LoginDTO dto, ServerHttpRequest request) {
- SystemLoginLog loginLog = new SystemLoginLog();
- loginLog.setLoginUsername(dto.getUsername());
- loginLog.setLoginTime(new Date());
- loginLog.setSystemVersion(systemVersion);
-// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
- if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
- loginLog.setIp(Utils.User_Client.getIP(request));
- loginLog.setPlatform(Utils.User_Client.getPlatform(request));
- loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
- loginLog.setOsInfo(Utils.User_Client.getOS(request));
- }
- loginLog.setServerIp(Utils.Server.getIP());
-// if(isDebug == null || !isDebug && dto.getCheckCode()){
+ SystemLoginLog loginLog = getInitLoginlog(dto.getUsername(),request);
+
+ if((isDebug == null || !isDebug) && (Objects.isNull(dto.getCheckCode()) || dto.getCheckCode()) ){
// 鏍￠獙楠岃瘉鐮�
try {
captchaService.check(dto.getUuid(), dto.getCode());
@@ -158,49 +152,37 @@
loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
loginLog.setSuccess(Boolean.FALSE);
systemLoginLogService.create(loginLog);
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佷笉姝ｇ‘锛�");
+ throw e;
}
-// }
- // 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
- SystemUser queryDto = new SystemUser();
- queryDto.setUsername(dto.getUsername());
- queryDto.setDeleted(Boolean.FALSE);
- SystemUser user = systemUserService.findOne(queryDto);
- if (user == null) {
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
- if(!Constants.equalsInteger(user.getSource(),Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
- }
- String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
- // 姣旇緝瀵嗙爜
- if( !StringUtils.equals(pwd, user.getPassword())){
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
- }
- dealOpenIdBiz(user,dto.getOpenid());
- Company company = new Company();
- if(Objects.nonNull(user.getCompanyId())){
- company = companyMapper.selectById(user.getCompanyId());
- }
- // 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
- List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
+ LoginUserInfo user = dealLoginByPwdNewBiz(dto.getUsername(),dto.getPassword(),null,dto.getOpenid(),request);
+ systemLoginLogService.create(loginLog);
+ return user;
+ }
+ @Override
+ public LoginUserInfo loginH5 (LoginH5DTO dto, ServerHttpRequest request) {
+ SystemLoginLog loginLog = getInitLoginlog(dto.getUsername(),request);
- SystemRole rt = new SystemRole();
- rt.setDeleted(Boolean.FALSE);
- //鏁版嵁閮ㄩ棬鏉冮檺闆嗗悎
- user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
-
- LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
- return userInfo;
+ if((isDebug == null || !isDebug) && (Objects.isNull(dto.getCheckCode()) || dto.getCheckCode()) ){
+ // 鏍￠獙楠岃瘉鐮�
+ try {
+ captchaService.check(dto.getUuid(), dto.getCode());
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
+ loginLog.setSuccess(Boolean.FALSE);
+ systemLoginLogService.create(loginLog);
+ throw e;
+ }
+ }
+ LoginUserInfo user = dealLoginByPwdNewBiz(dto.getUsername(),dto.getPassword(),null,dto.getOpenid(),request);
+ systemLoginLogService.create(loginLog);
+ return user;
}
-
-
- @Override
- public LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request) {
+ private SystemLoginLog getInitLoginlog(String username, ServerHttpRequest request) {
SystemLoginLog loginLog = new SystemLoginLog();
- loginLog.setLoginUsername(dto.getUsername());
+ loginLog.setLoginUsername( username);
loginLog.setLoginTime(new Date());
loginLog.setSystemVersion(systemVersion);
// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
@@ -211,6 +193,57 @@
loginLog.setOsInfo(Utils.User_Client.getOS(request));
}
loginLog.setServerIp(Utils.Server.getIP());
+ return loginLog;
+ }
+
+ @Override
+ public LoginUserInfo loginH5ByPhone(LoginPhoneDTO dto, ServerHttpRequest request) {
+ isCaptcheValide(dto.getPhone(),dto.getCode());//妫�鏌ラ獙璇佺爜
+ SystemLoginLog loginLog = getInitLoginlog(dto.getPhone(),request);
+ LoginUserInfo userInfo = dealLoginByPwdNewBiz(null,null,dto.getPhone(),dto.getOpenid(), request );
+ systemLoginLogService.create(loginLog);
+ return userInfo;
+ }
+ private LoginUserInfo dealLoginByPwdNewBiz(String username,String pwd, String phone, String openid, ServerHttpRequest request) {
+ // 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
+ SystemUser queryDto = new SystemUser();
+ queryDto.setMobile(phone);
+ queryDto.setUsername(username);
+ queryDto.setType(Constants.memberType.internal);
+ queryDto.setDeleted(Boolean.FALSE);
+ SystemUser user = systemUserService.findOne(queryDto);
+ if (user == null) {
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
+ }
+ if(!Constants.equalsInteger(user.getSource(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+ }
+ if(StringUtils.isNotBlank( pwd)){
+ String pppp = Utils.Secure.encryptPassword(new String(pwd), user.getSalt());
+ // 姣旇緝瀵嗙爜
+ if( !StringUtils.equals(pppp, user.getPassword())){
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
+ }
+ }
+ dealOpenIdBiz(user,openid);
+ Company company = new Company();
+ if(Objects.nonNull(user.getCompanyId())){
+ company = companyMapper.selectById(user.getCompanyId());
+ }
+ // 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
+ List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
+ SystemRole rt = new SystemRole();
+ rt.setDeleted(Boolean.FALSE);
+ //鏁版嵁閮ㄩ棬鏉冮檺闆嗗悎
+ user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
+ LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
+ return userInfo;
+ }
+
+ @Override
+ public LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request) {
+ SystemLoginLog loginLog =getInitLoginlog(dto.getUsername(),request);
// 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
SystemUser queryDto = new SystemUser();
queryDto.setUsername(dto.getUsername());
@@ -264,24 +297,30 @@
.eq(SystemUser::getId,user.getId()));
}
}
+ private void dealOpenIdBizForGk(SystemUser user, String openid) {
+ if(StringUtils.isNotBlank(openid)){
+ //濡傛灉openId涓嶄负绌�,缁戝畾璇ョ敤鎴穙penid
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .set(SystemUser::getOpenid,null)
+ .set(SystemUser::getOpenidHkDate,null)
+ .set(SystemUser::getOpenidHkInfo,null)
+ .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
+ .eq(SystemUser::getOpenid,openid)
+ .eq(SystemUser::getType,user.getType())
+ );
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .set(SystemUser::getOpenid,openid)
+ .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
+ .set(SystemUser::getOpenidHkDate,null)
+ .set(SystemUser::getOpenidHkInfo,null)
+ .eq(SystemUser::getId,user.getId()));
+ }
+ }
@Override
public LoginUserInfo loginByPhone(LoginPhoneDTO dto, ServerHttpRequest request) {
- SystemLoginLog loginLog = new SystemLoginLog();
- loginLog.setLoginUsername(dto.getPhone());
- loginLog.setLoginTime(new Date());
- loginLog.setSystemVersion(systemVersion);
-// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
- if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
- loginLog.setIp(Utils.User_Client.getIP(request));
- loginLog.setPlatform(Utils.User_Client.getPlatform(request));
- loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
- loginLog.setOsInfo(Utils.User_Client.getOS(request));
- }
- loginLog.setServerIp(Utils.Server.getIP());
-
-
+ SystemLoginLog loginLog =getInitLoginlog(dto.getPhone(),request);
// 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
SystemUser queryDto = new SystemUser();
queryDto.setMobile(dto.getPhone());
@@ -327,42 +366,46 @@
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
-
SystemRole rt = new SystemRole();
rt.setDeleted(Boolean.FALSE);
//鏁版嵁閮ㄩ棬鏉冮檺闆嗗悎
user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));
-
LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
+ systemLoginLogService.create(loginLog);
return userInfo;
}
@Override
- public LoginUserInfo driverLogin(LoginDTO dto, ServerHttpRequest request) {
- SystemLoginLog loginLog = new SystemLoginLog();
- loginLog.setLoginUsername(dto.getUsername());
- loginLog.setLoginTime(new Date());
- loginLog.setReason("銆愬叕浼楀彿銆戝徃鏈虹鐧婚檰锛歰penid="+dto.getOpenid());
- loginLog.setSystemVersion(systemVersion);
-// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
- if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
- loginLog.setIp(Utils.User_Client.getIP(request));
- loginLog.setPlatform(Utils.User_Client.getPlatform(request));
- loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
- loginLog.setOsInfo(Utils.User_Client.getOS(request));
- }
- loginLog.setServerIp(Utils.Server.getIP());
+ public LoginUserInfo driverLogin(LoginH5DTO dto, ServerHttpRequest request) {
+ SystemLoginLog loginLog =getInitLoginlog(dto.getUsername(),request);
+ LoginUserInfo userInfo = dealLoginDriverBiz(dto.getUsername(),dto.getPassword(),null,dto.getOpenid());
+ systemLoginLogService.create(loginLog);
+ return userInfo;
+ }
+ @Override
+ public LoginUserInfo loginDriverByPhone(LoginPhoneDTO dto, ServerHttpRequest request){
+ isCaptcheValide(dto.getPhone(),dto.getCode());//楠岃瘉鐮佹牎楠�
+ SystemLoginLog loginLog =getInitLoginlog(dto.getPhone(),request);
+ LoginUserInfo userInfo = dealLoginDriverBiz(null,null,dto.getPhone(),dto.getOpenid());
+ systemLoginLogService.create(loginLog);
+ return userInfo;
+ }
+
+ private LoginUserInfo dealLoginDriverBiz(String username,String password, String phone, String openid) {
// 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
SystemUser queryDto = new SystemUser();
- queryDto.setUsername(dto.getUsername());
+ queryDto.setUsername(username);
+ queryDto.setMobile(phone);
queryDto.setDeleted(Boolean.FALSE);
SystemUser user = systemUserService.findOne(queryDto);
if (user == null) {
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
- //娉ㄥ唽鍙告満/鍔冲姟浜哄憳
- if((Constants.equalsInteger(user.getType(),Constants.ZERO)||Constants.equalsInteger(user.getType(),Constants.TWO)) && Objects.nonNull(user.getMemberId())){
+ //娉ㄥ唽鍙告満
+ if((Constants.equalsInteger(user.getType(),Constants.ZERO)
+ ||Constants.equalsInteger(user.getType(),Constants.TWO))
+ && Objects.nonNull(user.getMemberId())){
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
if(Objects.isNull(user.getCompanyId())){
throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
@@ -375,19 +418,22 @@
}else{
throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
}
- String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
- // 姣旇緝瀵嗙爜
- if( !StringUtils.equals(pwd, user.getPassword())){
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
+ if(StringUtils.isNotBlank(password)){
+ String pwd = Utils.Secure.encryptPassword(new String(password), user.getSalt());
+ // 姣旇緝瀵嗙爜
+ if( !StringUtils.equals(pwd, user.getPassword())){
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
+ }
}
- dealOpenIdBiz(user,dto.getOpenid());
+ dealOpenIdBiz(user,openid);
Company company = new Company();
if(Objects.nonNull(user.getCompanyId())){
company = companyMapper.selectById(user.getCompanyId());
}
LoginUserInfo userInfo = LoginUserInfo.from(user, null, null,company,null);
- return userInfo;
+ return userInfo;
}
+
public void isCaptcheValide( String phone, String captche) {
SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
.eq(SmsEmail::getType, Constants.ZERO)
@@ -417,19 +463,7 @@
@Transactional
public LoginUserInfo loginDriverWithCode(LoginPhoneDTO param, ServerHttpRequest request) {
isCaptcheValide(param.getPhone(),param.getCode());//妫�鏌ラ獙璇佺爜
-
- SystemLoginLog loginLog = new SystemLoginLog();
- loginLog.setLoginUsername(param.getPhone());
- loginLog.setLoginTime(new Date());
- loginLog.setReason("銆愬叕浼楀彿銆戝徃鏈虹楠岃瘉鐮佺櫥闄嗭細openid="+param.getOpenid());
- loginLog.setSystemVersion(systemVersion);
-// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
- if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
- loginLog.setIp(Utils.User_Client.getIP(request));
- loginLog.setPlatform(Utils.User_Client.getPlatform(request));
- loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
- loginLog.setOsInfo(Utils.User_Client.getOS(request));
- }
+ SystemLoginLog loginLog =getInitLoginlog(param.getPhone(),request);
loginLog.setServerIp(Utils.Server.getIP());
// 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
SystemUser queryDto = new SystemUser();
@@ -437,32 +471,7 @@
queryDto.setDeleted(Boolean.FALSE);
SystemUser systemUser = systemUserService.findOne(queryDto);
if (systemUser == null) {
- String salt = RandomStringUtils.randomAlphabetic(6);
- Member member = new Member();
- member.setCreateDate(new Date());
- member.setIsdeleted(Constants.ZERO);
- member.setType(Constants.memberType.driver);
- member.setPhone(param.getPhone());
- member.setStatus(Constants.ZERO);
- member.setOpenid(param.getOpenid());
- member.setPassward(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
- memberMapper.insert(member);
-
- systemUser = new SystemUser();
- systemUser.setCreateTime(new Date());
- systemUser.setCreateUser(1);
- systemUser.setDeleted(Boolean.FALSE);
- systemUser.setUsername(param.getPhone());
- systemUser.setRealname(null);
- systemUser.setMemberId(member.getId());
- systemUser.setMobile(param.getPhone());
- systemUser.setSalt(salt);
- systemUser.setPassword(member.getPassward());
- systemUser.setStatus(Constants.ZERO);
- systemUser.setType(Constants.memberType.driver);
- systemUser.setSource(Constants.TWO);
- systemUser.setOpenid(param.getOpenid());
- systemUserMapper.insert(systemUser);
+ systemUser = autoRegisterUser(Constants.memberType.driver,param.getPhone(),param.getOpenid(),true);
}else{
if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇蜂娇鐢ㄦ纭殑鍙告満璐﹀彿鐧婚檰锛�");
@@ -474,6 +483,69 @@
company = companyMapper.selectById(systemUser.getCompanyId());
}
LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,company,null);
+ systemLoginLogService.create(loginLog);
+ return userInfo;
+ }
+
+ private SystemUser autoRegisterUser(int type, String phone,String openid,boolean needMember) {
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ String pwd =Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt);
+ Integer memberId = null;
+ if(needMember){
+ Member member = new Member();
+ member.setCreateDate(new Date());
+ member.setIsdeleted(Constants.ZERO);
+ member.setType(Constants.memberType.driver);
+ member.setPhone(phone);
+ member.setStatus(Constants.ZERO);
+ member.setOpenid(openid);
+ member.setPassward(pwd);
+ memberMapper.insert(member);
+ memberId = member.getId();
+ }
+
+ SystemUser systemUser = new SystemUser();
+ systemUser.setCreateTime(new Date());
+ systemUser.setCreateUser(1);
+ systemUser.setDeleted(Boolean.FALSE);
+ systemUser.setUsername(phone);
+ systemUser.setRealname(null);
+ systemUser.setMemberId(memberId);
+ systemUser.setMobile(phone);
+ systemUser.setSalt(salt);
+ systemUser.setPassword(pwd);
+ systemUser.setStatus(Constants.ZERO);
+ systemUser.setType(type);
+ systemUser.setSource(Constants.TWO);
+ systemUser.setOpenid(openid);
+ systemUserMapper.insert(systemUser);
+ return systemUser;
+ }
+
+ @Override
+ @Transactional
+ public LoginUserInfo loginGkUserWithCode(LoginPhoneDTO param, ServerHttpRequest request) {
+ isCaptcheValide(param.getPhone(),param.getCode());//妫�鏌ラ獙璇佺爜
+ TmsEmployeeListRequest tp = new TmsEmployeeListRequest();
+ tp.setTel(param.getPhone());
+ TmsEmployeeListResponse response = tmsService.getEmployeeList(tp);
+ if(response == null || response.getTel()==null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鎮ㄨ緭鍏ョ殑鎵嬫満鍙蜂笉姝ｇ‘锛�");
+ }
+ SystemLoginLog loginLog = getInitLoginlog(param.getPhone(),request);
+ // 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴峰璞�
+ SystemUser queryDto = new SystemUser();
+ queryDto.setUsername(param.getPhone());
+ queryDto.setType(Constants.memberType.gkuser);
+ queryDto.setDeleted(Boolean.FALSE);
+ SystemUser systemUser = systemUserService.findOne(queryDto);
+ if (systemUser == null) {
+ //鏂板绠℃帶浜哄憳鏁版嵁
+ systemUser = systemUser = autoRegisterUser(Constants.memberType.gkuser,param.getPhone(),param.getOpenid(),false);
+ }
+ dealOpenIdBizForGk(systemUser,param.getOpenid());
+ LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,null,null);
+ systemLoginLogService.create(loginLog);
return userInfo;
}
@@ -510,7 +582,6 @@
LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
String token = jwtTokenUtil.generateToken(userInfo);
-
return token;
}
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
index 1ccf31a..05215d4 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
@@ -2,8 +2,8 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.SystemPermissionMapper;
import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
import com.doumee.dao.system.model.SystemPermission;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java
index aca7f58..e5c0782 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java
@@ -1,8 +1,8 @@
package com.doumee.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.system.SystemRoleMenuMapper;
import com.doumee.dao.system.model.SystemRoleMenu;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
index da0131d..f26d8fa 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
@@ -1,8 +1,8 @@
package com.doumee.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.system.SystemRolePermissionMapper;
import com.doumee.dao.system.model.SystemRolePermission;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
index 6d6305a..016d9ef 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
@@ -2,8 +2,8 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.SystemRoleMapper;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
import com.doumee.dao.system.model.SystemRole;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
index 8dabb94..426cf8a 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.system.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.system.SystemTraceLogMapper;
import com.doumee.dao.system.dto.QuerySystemTraceLogDTO;
import com.doumee.dao.system.model.SystemTraceLog;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
index dbec9c6..31de6cd 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
@@ -1,8 +1,8 @@
package com.doumee.service.system.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.system.SystemUserRoleMapper;
import com.doumee.dao.system.model.SystemUserRole;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index fbdccaa..450f926 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -5,17 +5,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.SmsEmail;
-import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.SystemUserJoinMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
-import com.doumee.dao.system.model.SystemDepartment;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemDepartmentListVO;
import com.doumee.dao.system.vo.SystemUserListVO;
@@ -37,7 +34,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import java.util.stream.Collectors;
/**
* 绯荤粺鐢ㄦ埛Service瀹炵幇
diff --git a/server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java b/server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java
index bfe0442..c765b7f 100644
--- a/server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java
+++ b/server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java
@@ -1,24 +1,20 @@
package com.doumee.service.timer;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.timer.entity.JobState;
import com.doumee.dao.timer.entity.QuartzJob;
import com.doumee.dao.timer.mapper.QuartzJobMapper;
import com.doumee.dao.timer.scheduler.QuartzManage;
-import org.quartz.CronTrigger;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import java.util.List;
import java.util.Objects;
/**
diff --git a/server/system_timer/src/main/java/com/doumee/api/timer/QuartzCloudController.java b/server/system_timer/src/main/java/com/doumee/api/timer/QuartzCloudController.java
index 0eb5cfe..de06363 100644
--- a/server/system_timer/src/main/java/com/doumee/api/timer/QuartzCloudController.java
+++ b/server/system_timer/src/main/java/com/doumee/api/timer/QuartzCloudController.java
@@ -3,9 +3,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.timer.entity.QuartzJob;
import com.doumee.service.timer.QuartzJobService;
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
index cb818f9..1680ddc 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -1,6 +1,6 @@
package com.doumee.jobs.fegin;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
index eeb60bf..daa238d 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
@@ -1,7 +1,7 @@
package com.doumee.api;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Date;
import com.doumee.core.utils.DateUtil;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java
index a764581..f88f8dc 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java
@@ -1,9 +1,7 @@
package com.doumee.api;
-import com.doumee.api.BaseController;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
-import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java
index d607494..87ef93b 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java
@@ -1,26 +1,12 @@
package com.doumee.api;
-import com.doumee.api.BaseController;
-import com.doumee.config.annotation.LoginNoRequired;
-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.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.model.Cars;
-import com.doumee.service.business.CarsService;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
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.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
/**
* @author 姹熻箘韫�
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java
index b4d6de4..bfb80c2 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java
@@ -1,9 +1,7 @@
package com.doumee.api;
-import com.doumee.api.BaseController;
import com.doumee.config.DataSyncConfig;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.impl.hksync.HkSyncImgServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java
index 5059704..16bfa85 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java
@@ -1,7 +1,6 @@
package com.doumee.api;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.utils.Constants;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.VisitsService;
import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
@@ -11,8 +10,6 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
/**
* @author 姹熻箘韫�
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java
index e1ab224..b68f13f 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java
@@ -1,8 +1,6 @@
package com.doumee.api;
-import com.doumee.api.BaseController;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
import io.swagger.annotations.Api;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java
index dd7dfb6..5428eea 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java
@@ -1,8 +1,7 @@
package com.doumee.api;
import com.doumee.core.haikang.model.param.request.PlatformStatusRequest;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.impl.hksync.HkSyncPlatformsServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java
index 56271da..24b464d 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java
@@ -1,8 +1,7 @@
package com.doumee.api;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.SmsEmailService;
-import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
index 495a7e2..752d844 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
@@ -1,11 +1,9 @@
package com.doumee.api;
-import com.doumee.api.BaseController;
import com.doumee.config.DataSyncConfig;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.MemberService;
-import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
index d3f8a87..c89eeb4 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
@@ -1,10 +1,8 @@
package com.doumee.api;
-import com.doumee.api.BaseController;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.VisitsService;
-import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
import io.swagger.annotations.Api;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java
index e963898..31b64e6 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java
@@ -1,6 +1,6 @@
package com.doumee.api;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.PlatformInterfaceLogService;
import io.swagger.annotations.Api;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
index 228006e..1b2c060 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
@@ -1,27 +1,13 @@
package com.doumee.api;
-import com.alibaba.fastjson.JSONObject;
-import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.wx.WXConstant;
-import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.PlatformJobService;
-import com.doumee.service.business.VisitsService;
-import com.doumee.service.system.SystemDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.mgt.DefaultSecurityManager;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-import java.util.Objects;
/**
* @author 姹熻箘韫�
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
index d40d16b..de76a8b 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
@@ -5,7 +5,7 @@
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wx.WXConstant;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
index 7e24363..097c02a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Approve;
import com.doumee.service.business.ApproveService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java
index 1065317..301427c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.ApproveParam;
import com.doumee.dao.business.vo.ApproveParamDataVO;
import com.doumee.service.business.ApproveParamService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java
index cd76650..bc338c3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.ApproveTempl;
import com.doumee.service.business.ApproveTemplService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java
index 83108c2..5334b06 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.CarDriver;
import com.doumee.service.business.CarDriverService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
index 2c81369..3d2d36b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.admin.response.CarEventDTO;
import com.doumee.dao.business.model.CarEvent;
import com.doumee.service.business.CarEventService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java
index c114dcf..b0e8791 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.CarParks;
import com.doumee.service.business.CarParksService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java
index e3ce650..a0ade85 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.CarUseBook;
import com.doumee.service.business.CarUseBookService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
index 3847b84..95d66b4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Cars;
import com.doumee.service.business.CarsService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
index 614ee4a..d6ae078 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Category;
import com.doumee.service.business.CategoryService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index beec7ca..1bcbdc1 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -3,9 +3,9 @@
import com.doumee.config.DataSyncConfig;
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
index 9592c47..237c964 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Device;
import com.doumee.service.business.DeviceService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
index 928cb5e..6ccb84a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.service.business.DeviceEventService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
index b7c8fe2..bdef4d0 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.service.business.DeviceRoleService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
index 6d951cb..e0ea5ce 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
@@ -3,7 +3,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
import com.doumee.core.erp.model.openapi.request.erp.UserListRequest;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.ext.ERPSyncService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
index 8fdb392..4197ada 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Empower;
import com.doumee.service.business.EmpowerService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java
index f161033..7c09d4d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.FormParam;
import com.doumee.service.business.FormParamService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java
index 7c491ce..e8e9171 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.service.business.HiddenDangerService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java
index 6e20e04..942025c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.HiddenDangerLog;
import com.doumee.service.business.HiddenDangerLogService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java
index d0f1c31..0494801 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.HiddenDangerParam;
import com.doumee.service.business.HiddenDangerParamService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
index 582ed58..5b6aa85 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -7,7 +7,7 @@
import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformCarsRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.dao.business.model.Device;
import com.doumee.service.business.impl.hksync.*;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java
index 733e71c..b997b3d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.InoutDayCount;
import com.doumee.service.business.InoutDayCountService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
index 5ef9533..09ffd92 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.service.business.MemberCardService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 31466bd..b0fd533 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -3,9 +3,9 @@
import com.doumee.config.DataSyncConfig;
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java
index dd316c6..e6440f6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.service.business.MemberRoleService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
index 671dd01..3eeb3c7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.ParkBook;
import com.doumee.service.business.ParkBookService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java
index 8423731..bd6149f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Parks;
import com.doumee.service.business.ParksService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java
index 88c2471..b71e45d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Platform;
import com.doumee.service.business.PlatformService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java
index 8b2ef50..658a3b1 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformEvent;
import com.doumee.service.business.PlatformEventService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java
index b7cb56a..9b3b578 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.service.business.PlatformGroupService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java
index 01a31bb..df269f7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformInterfaceLog;
import com.doumee.service.business.PlatformInterfaceLogService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java
index 25e9229..4559be7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.service.business.PlatformJobService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java
index a11a2e1..4bad636 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformLog;
import com.doumee.service.business.PlatformLogService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java
index c528307..df78294 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformQueue;
import com.doumee.service.business.PlatformQueueService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java
index 3c71e48..a097f57 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformReason;
import com.doumee.service.business.PlatformReasonService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java
index 3637cbf..dde2b96 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformShowParam;
import com.doumee.service.business.PlatformShowParamService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java
index 4f5749f..9f7f81a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformWaterGas;
import com.doumee.service.business.PlatformWaterGasService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
index 9f7a68e..bf42fcf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.ProblemLog;
import com.doumee.dao.business.vo.ProblemLogVo;
import com.doumee.service.business.ProblemLogService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
index d0ad255..83e1cb0 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
@@ -2,9 +2,9 @@
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Problems;
import com.doumee.service.business.ProblemsService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
index e37cb74..7c77562 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Retention;
import com.doumee.service.business.RetentionService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java
index 355474c..d1c93f6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java
@@ -1,8 +1,8 @@
package com.doumee.api.business;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.model.Visits;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java
index 5717c57..c525966 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Tasks;
import com.doumee.service.business.TasksService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java
index fee2405..fae8b28 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.TrainTime;
import com.doumee.service.business.TrainTimeService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java
index a5697ef..d39654a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.UserAction;
import com.doumee.service.business.UserActionService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
index 87df0db..5164159 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.VisitEvent;
import com.doumee.service.business.VisitEventService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java
index 6b3cfa7..0347e68 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.VisitPark;
import com.doumee.service.business.VisitParkService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java
index 91adfc2..918b16f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.VisitProblemLog;
import com.doumee.service.business.VisitProblemLogService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java
index 56c65a9..7efa277 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.VisitProblems;
import com.doumee.service.business.VisitProblemsService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java
index cbb867e..1038d42 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.VisitReason;
import com.doumee.service.business.VisitReasonService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java
index 0c8bcca..a2fbac6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Visitor;
import com.doumee.service.business.VisitorService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java
index 532e499..58c48a3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java
@@ -2,9 +2,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Visits;
import com.doumee.service.business.VisitsService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java
index b3df154..880a139 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java
@@ -3,9 +3,9 @@
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.WmsInterfaceLog;
import com.doumee.service.business.WmsInterfaceLogService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/CaptchaController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/CaptchaController.java
index ffbbef5..05510a0 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/CaptchaController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/CaptchaController.java
@@ -1,7 +1,7 @@
package com.doumee.api.common;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.common.CaptchaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java
index 55dd20d..720fe6f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.model.Approve;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveParamCloudController.java
index 79bcaf1..f2da6cd 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveParamCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveParamCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.ApproveParam;
import com.doumee.dao.business.vo.ApproveParamDataVO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
index 2fc63a8..269bd23 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java
@@ -4,15 +4,14 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.ApproveTempl;
import com.doumee.service.business.ApproveTemplService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarDriverCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarDriverCloudController.java
index 7f31c24..a615ca9 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarDriverCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarDriverCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.CarDriver;
import com.doumee.service.business.CarDriverService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarEventCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarEventCloudController.java
index a5a227f..dbb9006 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarEventCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarEventCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.CarEventDTO;
import com.doumee.dao.business.model.CarEvent;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarParksCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarParksCloudController.java
index fd435b7..f3b9379 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarParksCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarParksCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.CarParks;
import com.doumee.service.business.CarParksService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
index 06a55e7..df7abf9 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
@@ -6,10 +6,10 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.CarUseBook;
import com.doumee.dao.business.vo.DateIntervalVO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
index f9cfc17..46e0d44 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Cars;
import com.doumee.service.business.CarsService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
index 24adbd2..34bcab0 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
@@ -4,13 +4,11 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.Category;
-import com.doumee.dao.business.model.Company;
import com.doumee.service.business.CategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
index b5a5677..5db61f1 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
@@ -1,14 +1,13 @@
package com.doumee.cloud.admin;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.api.BaseController;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java
index 43cf1d2..1930129 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Device;
import com.doumee.service.business.DeviceService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceEventCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceEventCloudController.java
index be1145f..036a9a6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceEventCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceEventCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java
index c9c5446..9d62b11 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceRoleCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.service.business.DeviceRoleService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java
index fbef94b..a2df3b5 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java
@@ -5,7 +5,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
import com.doumee.core.erp.model.openapi.request.erp.UserListRequest;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.ext.ERPSyncService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java
index d860b74..9c6ce91 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/EmpowerCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Empower;
import com.doumee.service.business.EmpowerService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/FormParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/FormParamCloudController.java
index a073d87..71c17dd 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/FormParamCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/FormParamCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.FormParam;
import com.doumee.service.business.FormParamService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
index 0d47aa8..4aabab3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
@@ -6,10 +6,10 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.service.business.HiddenDangerService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java
index c31a17c..c6f80ac 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.HiddenDangerLog;
import com.doumee.service.business.HiddenDangerLogService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
index b62c4c3..523140d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.HiddenDangerParam;
import com.doumee.dao.business.model.Member;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
index 9ce05c9..273ecdb 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -2,37 +2,22 @@
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
-import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformCarsRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DESUtil;
import com.doumee.dao.business.model.Device;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.impl.hksync.*;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index a8b19f2..9e85f70 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -16,8 +16,8 @@
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.dao.business.model.Device;
@@ -30,11 +30,9 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.Cacheable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InterfaceLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InterfaceLogCloudController.java
index a2959ea..07e9470 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InterfaceLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/InterfaceLogCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.service.business.InterfaceLogService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCardCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCardCloudController.java
index 2ad65eb..78060ba 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCardCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCardCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.service.business.MemberCardService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index d3556e0..ee19a81 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -8,9 +8,9 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberRoleCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberRoleCloudController.java
index d99a8f9..cf5e22e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberRoleCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberRoleCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.service.business.MemberRoleService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java
index dd401ae..bc99061 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java
@@ -4,16 +4,15 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.ParkBook;
import com.doumee.service.business.ParkBookService;
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.*;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParksCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParksCloudController.java
index 94fda47..93b4b6f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParksCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParksCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Parks;
import com.doumee.service.business.ParksService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java
index 6223da1..6fe59b6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java
@@ -6,16 +6,15 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformBooks;
import com.doumee.dao.business.model.PlatformReason;
import com.doumee.dao.web.reqeust.PlatformBooksApplyDTO;
import com.doumee.dao.web.reqeust.PlatformBooksCheckNumDTO;
-import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.service.business.PlatformBooksService;
import com.doumee.service.business.PlatformReasonService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java
index 1ac263d..01b88f2 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBroadcastLogCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformBroadcastLog;
import com.doumee.service.business.PlatformBroadcastLogService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
index 6fc1041..c81a174 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformGroup;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformDeviceCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformDeviceCloudController.java
index 986896f..1543b45 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformDeviceCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformDeviceCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformDevice;
import com.doumee.service.business.PlatformDeviceService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformEventCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformEventCloudController.java
index 90ad9d4..cbad0c8 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformEventCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformEventCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformEvent;
import com.doumee.service.business.PlatformEventService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
index 4f103d7..e169f5d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.web.reqeust.PlatformDataDTO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformInterfaceLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformInterfaceLogCloudController.java
index e0a3b14..ab26a46 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformInterfaceLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformInterfaceLogCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformInterfaceLog;
import com.doumee.service.business.PlatformInterfaceLogService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index e2d96a3..2ec6aff 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -5,9 +5,9 @@
import com.doumee.config.annotation.LoginNoRequired;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.web.reqeust.JobDetailDTO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformLogCloudController.java
index 89050d3..acb79a6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformLogCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformLog;
import com.doumee.service.business.PlatformLogService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformQueueCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformQueueCloudController.java
index a80574c..479247b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformQueueCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformQueueCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformQueue;
import com.doumee.service.business.PlatformQueueService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformReasonCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformReasonCloudController.java
index afaf994..45e9fbb 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformReasonCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformReasonCloudController.java
@@ -4,11 +4,10 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformReason;
import com.doumee.service.business.PlatformReasonService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformShowParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformShowParamCloudController.java
index d1b36a2..2adbf9a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformShowParamCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformShowParamCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformShowParam;
import com.doumee.service.business.PlatformShowParamService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWarnEventCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWarnEventCloudController.java
index d91afa6..ab2a7d4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWarnEventCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWarnEventCloudController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.service.business.PlatformWarnEventService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java
index 4fd1a75..e36e21c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformWaterGas;
import com.doumee.dao.business.vo.PlatformWaterGasForExcelVO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsDetailCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsDetailCloudController.java
index 4152b43..6300a4a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsDetailCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsDetailCloudController.java
@@ -3,16 +3,15 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformWmsDetail;
import com.doumee.service.business.PlatformWmsDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.xpath.operations.Bool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsJobCloudController.java
index ef332b8..846502a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWmsJobCloudController.java
@@ -3,9 +3,9 @@
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.PlatformWmsJob;
import com.doumee.service.business.PlatformWmsJobService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
index b0a1e9c..88ca13c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Position;
import com.doumee.service.business.PositionService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemLogCloudController.java
index 641138c..47add24 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemLogCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.ProblemLog;
import com.doumee.dao.business.vo.ProblemLogVo;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemsCloudController.java
index 5ab466e..bfcc1cb 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ProblemsCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Problems;
import com.doumee.service.business.ProblemsService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
index 8283157..82c7397 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Retention;
import com.doumee.service.business.RetentionService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsConfigCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsConfigCloudController.java
index 5d209a2..b703273 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsConfigCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsConfigCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.SmsConfig;
import com.doumee.service.business.SmsConfigService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
index 0cf4bc7..724a7b8 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
@@ -1,31 +1,21 @@
package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
-import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
-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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.SmsConfig;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
-import com.doumee.service.system.SystemUserService;
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.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
/**
* @author 姹熻箘韫�
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
index e1ade6d..3df4cb5 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
@@ -1,12 +1,10 @@
package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.admin.response.StagingDataVO;
@@ -23,11 +21,8 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
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 java.util.Objects;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TasksCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TasksCloudController.java
index 8f2757a..8aa02a3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TasksCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TasksCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Tasks;
import com.doumee.service.business.TasksService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
index 649ab9c..41ca70e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -2,12 +2,12 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.tms.model.request.*;
-import com.doumee.core.tms.model.response.*;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.request.*;
+import com.doumee.service.business.third.model.response.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -33,13 +33,14 @@
@ApiOperation("銆怲MS銆戠數瀛愰攣涓婇攣鏃堕棿鎺ュ彛")
@LoginNoRequired
@PostMapping("/lockStatusQuery")
- public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request ) {
+ public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request, @RequestHeader(Constants.HEADER_USER_TOKEN) String token ) {
return tmsService.lockStatusQuery(request);
}
@ApiOperation("銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�")
- @LoginNoRequired
+// @LoginNoRequired
@PostMapping("/orderList")
- public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest param ) {
+ public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest param , @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
if(param == null){
param = new TmsOrderListRequest();
}
@@ -55,23 +56,24 @@
if(param.getPager().getRows() == null){
param.getPager().setRows(10);
}
- if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
+ param.getParameters().setPhoneNumber(user.getMobile());
+ /* if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
param.getParameters().setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
- }
+ }*/
if(param.getParameters().getContractNumbers()==null || param.getParameters().getContractNumbers().size()==0){
param.getParameters().setContractNumbers(null);
}
return ApiResponse.success(tmsService.orderList(param));
}
@ApiOperation("銆怲MS銆戝悎鍚岃鎯呮帴鍙�")
- @LoginNoRequired
+// @LoginNoRequired
@PostMapping("/orderInfo")
- public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
+ public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request , @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(tmsService.orderInfo(request));
}
@ApiOperation("銆怲MS銆戝徃鏈哄緟鍔炰换鍔″垪琛ㄦ帴鍙�")
@PostMapping("/taskList")
- public ApiResponse<TmsBasePageResponse<TmsDriveTaskListResponse>> taskList(@RequestBody TmsDriverTaskListRequest param ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ public ApiResponse<TmsBasePageResponse<TmsDriveTaskListResponse>> taskList(@RequestBody TmsDriverTaskListRequest param , @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
if(param == null){
param = new TmsDriverTaskListRequest();
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java
index f907066..3bad97a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.service.business.TmsFactoryParamService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TrainTimeCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TrainTimeCloudController.java
index d675a69..9446290 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TrainTimeCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TrainTimeCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.TrainTime;
import com.doumee.service.business.TrainTimeService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/UserActionCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/UserActionCloudController.java
index f4f64e8..51d366c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/UserActionCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/UserActionCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.UserAction;
import com.doumee.service.business.UserActionService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitEventCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitEventCloudController.java
index a3cd6cf..c0c3c78 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitEventCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitEventCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.VisitEvent;
import com.doumee.service.business.VisitEventService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitParkCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitParkCloudController.java
index 058d39e..482007d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitParkCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitParkCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.VisitPark;
import com.doumee.service.business.VisitParkService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemLogCloudController.java
index db9c026..40b3de5 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemLogCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.VisitProblemLog;
import com.doumee.service.business.VisitProblemLogService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemsCloudController.java
index 6aba77f..8e43b11 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitProblemsCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.VisitProblems;
import com.doumee.service.business.VisitProblemsService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.java
index c32698c..e0b9cd4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.VisitReason;
import com.doumee.service.business.VisitReasonService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java
index d09f453..01e2366 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitorCloudController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Visitor;
import com.doumee.service.business.VisitorService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
index fbd5e45..a635e08 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -5,10 +5,10 @@
import com.doumee.config.annotation.LoginNoRequired;
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.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Visits;
@@ -16,10 +16,7 @@
import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
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.*;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java
index e02f0ad..1582112 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsInterfaceLogCloudController.java
@@ -4,12 +4,11 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.WmsInterfaceLog;
-import com.doumee.service.business.WmsInterfaceLogService;
import com.doumee.service.business.WmsInterfaceLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
index 17efe43..b529a15 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
@@ -2,14 +2,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
-import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
-import com.doumee.core.tms.model.request.TmsOrderListRequest;
-import com.doumee.core.tms.model.response.TmsBaseResponse;
-import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
-import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
-import com.doumee.core.tms.model.response.TmsOrderListResponse;
+import com.doumee.service.business.third.model.request.TmsLockStatusQueryRequest;
+import com.doumee.service.business.third.model.response.TmsBaseResponse;
+import com.doumee.service.business.third.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.third.TmsService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WxNoticeConfigController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WxNoticeConfigController.java
index 696f6f6..affe195 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WxNoticeConfigController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WxNoticeConfigController.java
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
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.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.WxNoticeConfig;
import com.doumee.service.business.WxNoticeConfigService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
index d33fcc9..ce0e62b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
@@ -1,32 +1,24 @@
package com.doumee.cloud.board;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.PlatformLogMapper;
-import com.doumee.dao.business.model.PlatformLog;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.web.response.platformReport.*;
-import com.doumee.service.business.PlatformLogService;
import com.doumee.service.business.third.BoardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.io.File;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Random;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
index 9fc64e3..c33db51 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
@@ -2,12 +2,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.RegionDataRankingTypeRequest;
import com.doumee.core.haikang.model.param.respose.RegionDataRankingDataResponse;
import com.doumee.core.haikang.model.param.respose.RegionEnergyListResponse;
-import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
@@ -16,7 +13,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
index 2955bc4..8d08491 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
@@ -2,7 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 93c3104..aa21852 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -3,7 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.model.Platform;
@@ -23,7 +23,6 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.List;
import java.util.Random;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
index 33508f7..a083d3f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
@@ -1,20 +1,16 @@
package com.doumee.cloud.board;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
-import com.doumee.dao.business.PlatformJobMapper;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformBooks;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.business.model.PlatformWmsJob;
import com.doumee.dao.web.response.platformReport.*;
-import com.doumee.service.business.PlatformJobService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
index c4bbcdc..395bfce 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
@@ -3,9 +3,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.response.platformReport.*;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
index e307abf..7cbca10 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
@@ -2,29 +2,23 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.tms.model.request.*;
-import com.doumee.core.tms.model.response.TmsBasePageResponse;
-import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
-import com.doumee.core.tms.model.response.TmsOrderListResponse;
-import com.doumee.core.tms.model.response.TmsOrderNoFinishListResponse;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.request.TmsOrderInfoRequest;
+import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
+import com.doumee.service.business.third.model.response.TmsBasePageResponse;
+import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
+import com.doumee.service.business.third.model.response.TmsOrderNoFinishListResponse;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.third.BoardService;
import com.doumee.service.business.third.TmsService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
-import java.util.Random;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
index 9b41d15..5f591d0 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
@@ -6,10 +6,9 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
-import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.dao.openapi.request.*;
import com.doumee.dao.openapi.response.*;
import com.doumee.dao.system.model.SystemUser;
@@ -23,9 +22,6 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
import java.util.*;
/**
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
index 9db2a06..26b96b7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
@@ -1,14 +1,12 @@
package com.doumee.cloud.web;
-import cn.hutool.http.useragent.Platform;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.*;
@@ -16,13 +14,10 @@
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
-import com.doumee.dao.web.response.MemberVO;
-import com.doumee.dao.web.response.VisitRecordVO;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
index 45e0748..bff4abf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
@@ -2,18 +2,12 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Visits;
-import com.doumee.dao.system.dto.LoginDTO;
-import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.AuditApproveDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.reqeust.VisitRecordDTO;
@@ -21,19 +15,11 @@
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.VisitsService;
-import com.doumee.service.system.SystemLoginService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ServerWebExchange;
-
-import javax.annotation.Resource;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
index ca0f84e..ff4a5e5 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
@@ -4,30 +4,22 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.*;
-import com.doumee.dao.web.response.DriverHomeVO;
-import com.doumee.dao.web.response.LineUpVO;
import com.doumee.dao.web.response.PlatformWorkVO;
import com.doumee.service.business.*;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.math.BigDecimal;
-import java.util.Date;
import java.util.List;
/**
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/ProblemWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/ProblemWebController.java
index d258b5e..aecaf9b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/ProblemWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/ProblemWebController.java
@@ -2,7 +2,7 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.web.reqeust.FinishAnswerDTO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/UnitWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/UnitWebController.java
index a6082ef..1cfe06a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/UnitWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/UnitWebController.java
@@ -3,7 +3,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.web.response.DeviceRoleVO;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index 3da8c70..2323e35 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -3,20 +3,16 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.model.VisitReason;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.VisitDetailVO;
-import com.doumee.dao.web.response.VisitRecordVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.VisitReasonService;
@@ -27,13 +23,10 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ServerWebExchange;
import javax.validation.Valid;
-import java.util.Arrays;
import java.util.List;
import java.util.Objects;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java
index 30d7dc0..00398b6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java
@@ -1,7 +1,7 @@
package com.doumee.config.shiro;
import com.alibaba.fastjson.JSON;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
import org.springframework.http.HttpStatus;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroCache.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroCache.java
index 4e61661..7a12456 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroCache.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroCache.java
@@ -45,7 +45,7 @@
@Override
public Serializable get(Object key) throws CacheException {
- if (key == null) {
+ if (key == null || getKey(key) == null) {
return null;
}
return redisTemplate.opsForValue().get(getKey(key));
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 690addf..41fcd31 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -1,6 +1,6 @@
package com.doumee.config.shiro;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroToken.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroToken.java
index 4a27415..2dff2da 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroToken.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroToken.java
@@ -1,6 +1,6 @@
package com.doumee.config.shiro;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.springframework.stereotype.Component;
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 2df12af..3ba1f68 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: self
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_screen/src/main/java/com/doumee/api/BaseController.java b/server/visits/dmvisit_screen/src/main/java/com/doumee/api/BaseController.java
index 8e09236..8b9a1f7 100644
--- a/server/visits/dmvisit_screen/src/main/java/com/doumee/api/BaseController.java
+++ b/server/visits/dmvisit_screen/src/main/java/com/doumee/api/BaseController.java
@@ -1,6 +1,6 @@
package com.doumee.api;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
diff --git a/server/visits/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java b/server/visits/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java
index 5c8ef6c..e13d53d 100644
--- a/server/visits/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java
+++ b/server/visits/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java
@@ -1,7 +1,6 @@
package com.doumee.api.web;
-import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.model.*;
import com.doumee.service.ScreenService;
import io.swagger.annotations.Api;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java b/server/visits/dmvisit_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java
index 20ddfd6..c7866a7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/config/handler/GlobalExceptionHandler.java
@@ -2,7 +2,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.UnauthorizedException;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
index 2e9c374..8b317c8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -13,8 +13,8 @@
import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.InterfaceLogMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index beed8eb..2769141 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -1,10 +1,7 @@
package com.doumee.core.haikang.model;
-import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.utils.Constants;
-import javafx.scene.effect.BlendMode;
import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index dcd9bf8..82979e7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -1,10 +1,8 @@
package com.doumee.dao.admin.request;
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
import lombok.Data;
import java.io.Serializable;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java
index f88a2a0..2189436 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/ApproveDTO.java
@@ -1,6 +1,6 @@
package com.doumee.dao.business.dto;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index 7fdb6dd..b815882 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
index 166e758..9e1ea6d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java
index 4bb6efd..a80ce5e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
index de60b29..3d3a164 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
index 690969e..79b457b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
index 7cd9ff9..baa7301 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
@@ -1,14 +1,14 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index b2cd685..df1c8d0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index 1db6fd3..6f1e0e7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index 81cdb04..8821be2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index 1209387..2896604 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -1,16 +1,15 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
* 璁惧淇℃伅琛�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index a2a7574..0c14a26 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index ee75464..19ed30b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -2,15 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index 4e03612..77f4b74 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java
index f411c85..1ddca7f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java
@@ -1,14 +1,14 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index ebb9145..baf09d4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.system.model.Multifile;
-import com.doumee.core.model.LoginUserModel;
-import com.doumee.dao.system.model.Multifile;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
index f40cf32..1ff61b8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
index 09c04f0..114e5ce 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
index a955ab7..b31b817 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index 9ba7cc5..d6eb651 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
index 64f13e6..3c04924 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
index c018e02..d951617 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
@@ -2,16 +2,15 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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.util.List;
/**
* 杞﹁締棰勭害璁板綍淇℃伅琛�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
index a1ccc0e..db06c28 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index f733483..4d0e689 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.web.response.PlatformWorkVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index 8d1c79b..2a75659 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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.math.BigDecimal;
import java.util.Date;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
index b3cbf26..7a3196d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
index d88be28..5c30783 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java
index 8bdf331..f5d9b5d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Position.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
index 0bc8c13..b4f13bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
@@ -4,14 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.config.mybatis.JSONObjectHandler;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
index 0a8a532..6c9e5c6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.admin.request.OptionsObject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 9cb13d8..07466d5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java
index f7fc2ff..f189131 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java
@@ -1,14 +1,14 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java
index 9e11fcb..f8e1c16 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index 7c50037..65b8870 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
index e75339c..e5d5b81 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index 78d66d0..86eb3b4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
index ed90548..0c996a6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java
index e81e128..295e7a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java
@@ -1,14 +1,14 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java
index ffb2042..7e9ff32 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java
@@ -1,14 +1,14 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
index 787c4d4..73fb639 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
@@ -1,14 +1,14 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java
index 47560e7..f3b7d3a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
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;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 159b872..7f3b755 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserModel;
import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
index 5011515..214e097 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/PlatformWaterGasForExcelVO.java
@@ -1,12 +1,6 @@
package com.doumee.dao.business.vo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ConfirmTaskDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ConfirmTaskDTO.java
index e68fbf6..ee52559 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ConfirmTaskDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/ConfirmTaskDTO.java
@@ -1,6 +1,6 @@
package com.doumee.dao.web.reqeust;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobDetailDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobDetailDTO.java
index d34974c..6cef4fe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobDetailDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobDetailDTO.java
@@ -1,6 +1,6 @@
package com.doumee.dao.web.reqeust;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java
index 649e39f..03db00f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/JobOperateDTO.java
@@ -1,6 +1,6 @@
package com.doumee.dao.web.reqeust;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java
index e83da18..56624ac 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/LineUpDetailDTO.java
@@ -1,12 +1,9 @@
package com.doumee.dao.web.reqeust;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.dao.business.model.PlatformJob;
+import com.doumee.service.business.third.model.LoginUserInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/PlatformDataDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/PlatformDataDTO.java
index ffd05e0..2144186 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/PlatformDataDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/PlatformDataDTO.java
@@ -1,6 +1,5 @@
package com.doumee.dao.web.reqeust;
-import com.doumee.core.model.LoginUserInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/SignInDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/SignInDTO.java
index 748f287..c5d51e2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/SignInDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/SignInDTO.java
@@ -1,12 +1,9 @@
package com.doumee.dao.web.reqeust;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java
index c59b0ea..e52a92b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/LineUpVO.java
@@ -1,9 +1,7 @@
package com.doumee.dao.web.response;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.dao.business.model.Platform;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.business.model.PlatformGroup;
-import com.doumee.dao.business.model.PlatformJob;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/LastSevenDaysOrderVo.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/LastSevenDaysOrderVo.java
index b161716..9a337e6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/LastSevenDaysOrderVo.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/LastSevenDaysOrderVo.java
@@ -1,10 +1,9 @@
package com.doumee.dao.web.response.platformReport;
-import com.doumee.core.tms.model.response.TmsSevenArrivalStatusAndDetailsResponse;
+import com.doumee.service.business.third.model.response.TmsSevenArrivalStatusAndDetailsResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java
index 80a94c2..62ece86 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.ApproveParam;
import com.doumee.dao.business.vo.ApproveParamDataVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
index a161b3e..0e8f480 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.model.Approve;
import com.doumee.dao.business.vo.ApproveDataVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveTemplService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveTemplService.java
index 46095fb..85f4244 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveTemplService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveTemplService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.ApproveTempl;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarDriverService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarDriverService.java
index c9a8a88..f354c36 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarDriverService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarDriverService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.CarDriver;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
index 0d49e34..44c5580 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.response.CarEventDTO;
import com.doumee.dao.business.model.CarEvent;
import com.doumee.dao.business.vo.CarEventVo;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarParksService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarParksService.java
index 9039af1..c4e7fa3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarParksService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarParksService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.CarParks;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java
index de88795..7690fec 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarUseBookService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.CarUseBook;
import com.doumee.dao.business.vo.DateIntervalVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
index efdc215..8e6c229 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.model.Cars;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
index 2383cf2..79d69d3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Category;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
index 18cfe71..47d0cde 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
index 0dd5ce2..cddb8ef 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
import com.doumee.dao.business.vo.DeviceEventVo;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
index 5b80629..16df520 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
@@ -1,9 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.erp.model.openapi.request.RoleListRequest;
-import com.doumee.core.erp.model.openapi.response.RoleListResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.web.response.DeviceRoleVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
index 5ba9b71..beef61f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
import com.doumee.core.haikang.model.param.request.TransparentChannelSingleRequest;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Device;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java
index 1b0ed8f..c848c7f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/EmpowerService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Empower;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/FormParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/FormParamService.java
index d78ab35..d7afd4a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/FormParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/FormParamService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.FormParam;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerLogService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerLogService.java
index 9fcc313..caf40a9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerLogService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.HiddenDangerLog;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
index 4cd2c5f..2360a19 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.HiddenDangerParam;
import com.doumee.dao.business.model.Member;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java
index c889cc2..cb20f7d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.HiddenDanger;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutDayCountService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutDayCountService.java
index 474cf63..a051d30 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutDayCountService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutDayCountService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.InoutDayCount;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
index 3c0ea56..50d4cf9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InterfaceLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.InterfaceLog;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
index 3276ab1..898b36a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.MemberCard;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java
index cf3cddf..005f299 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberRoleService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.MemberRole;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 80568fa..260f0f1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
index 4770d0f..3141b05 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.ParkBook;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java
index 5f648fc..201ff95 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParksService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Parks;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBooksService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBooksService.java
index 0a8dd08..9d9d314 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBooksService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBooksService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformBooks;
import com.doumee.dao.web.reqeust.PlatformBooksApplyDTO;
import com.doumee.dao.web.reqeust.PlatformBooksCheckNumDTO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBroadcastLogService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBroadcastLogService.java
index d33ad3a..bb250d8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBroadcastLogService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformBroadcastLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformBroadcastLog;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformDeviceService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformDeviceService.java
index 3b3522a..28dd147 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformDeviceService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformDeviceService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformDevice;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformEventService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformEventService.java
index 21e4231..8e14dbe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformEventService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformEventService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformEvent;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java
index f558b09..f1762f0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java
@@ -1,12 +1,11 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.web.reqeust.PlatformDataDTO;
import com.doumee.dao.web.response.PlatformGroupWorkVO;
-import com.doumee.dao.web.response.PlatformWorkVO;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformInterfaceLogService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformInterfaceLogService.java
index 1dddc75..1462a5d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformInterfaceLogService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformInterfaceLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformInterfaceLog;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
index d70727c..3ec92e8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.business.vo.LargeScreenDataVO;
@@ -12,7 +12,6 @@
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
import com.doumee.dao.web.response.PlatformWorkVO;
-import com.doumee.dao.web.response.platformReport.WholeProvinceBoardVO;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformLogService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformLogService.java
index e892949..9735f4a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformLogService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformLog;
import com.doumee.dao.openapi.request.CarLogsListRequest;
import com.doumee.dao.openapi.response.CarLogsListResponse;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformQueueService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformQueueService.java
index 22e9fa8..eaf0025 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformQueueService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformQueueService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformQueue;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformReasonService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformReasonService.java
index 05c06c7..a12e02f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformReasonService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformReasonService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformReason;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java
index 3a82283..7c78cff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.openapi.response.PlatformNumByStatusResponse;
import com.doumee.dao.openapi.response.PlatformStatusListResponse;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java
index 3798e7d..a3cf94a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformShowParamService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformShowParam;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWarnEventService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWarnEventService.java
index 923b2f9..30cf84e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWarnEventService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWarnEventService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.openapi.response.PlatformWarnEventListResponse;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java
index 374831a..a73288f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWaterGasService.java
@@ -1,9 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformWaterGas;
import com.doumee.dao.openapi.request.GasByMonthRequest;
import com.doumee.dao.openapi.request.WaterByMonthRequest;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsDetailService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsDetailService.java
index d4ad32e..f9754e0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsDetailService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsDetailService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformWmsDetail;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsJobService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsJobService.java
index e1b7fcd..c95372b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsJobService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformWmsJobService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.PlatformWmsJob;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PositionService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PositionService.java
index 732796c..2f35737 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PositionService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PositionService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Position;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
index 9fd12b2..2fd6ee7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.ProblemLog;
import com.doumee.dao.business.vo.ProblemLogVo;
import com.doumee.dao.web.reqeust.FinishAnswerDTO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
index 64367d5..d6d5c9b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.response.ProblemDTO;
import com.doumee.dao.business.model.Problems;
import com.doumee.dao.web.response.ProblemsVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
index 6b2ce03..85db39b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Retention;
import com.doumee.dao.business.vo.RetentionVo;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsConfigService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsConfigService.java
index a41d07d..7a6d8dd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsConfigService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsConfigService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.SmsConfig;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
index f3f7b5a..b553504 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.model.SystemUser;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TasksService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TasksService.java
index 5b77636..c318beb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TasksService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TasksService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Tasks;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java
index fb059d7..2df3a0b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.TmsFactoryParam;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
index befd260..019d930 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
@@ -1,9 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.admin.request.RetentionQuery;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.TrainTime;
import org.springframework.web.multipart.MultipartFile;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/UserActionService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/UserActionService.java
index c2dc56f..e73dc6f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/UserActionService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/UserActionService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.UserAction;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
index 6b496dd..d8a89c5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
@@ -1,11 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.admin.request.VisitEventQuery;
-import com.doumee.dao.admin.response.VisitEventDTO;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.VisitEvent;
-import com.doumee.dao.system.vo.VisitEventVo;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitParkService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitParkService.java
index 14cbc8e..576b4b7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitParkService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitParkService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.VisitPark;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemLogService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemLogService.java
index f143005..36ed200 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemLogService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.VisitProblemLog;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemsService.java
index e8e34c7..8d30de0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitProblemsService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.VisitProblems;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitReasonService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitReasonService.java
index acb46ef..bb4ddb9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitReasonService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitReasonService.java
@@ -1,9 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.LoginUserModel;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.VisitReason;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitorService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitorService.java
index 95182c0..869269e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitorService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitorService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.Visitor;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
index 39fb955..9157115 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Visits;
@@ -11,7 +11,6 @@
import com.doumee.dao.web.reqeust.VisitRecordDTO;
import com.doumee.dao.web.response.VisitDetailVO;
import com.doumee.dao.web.response.VisitRecordVO;
-import io.swagger.models.auth.In;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsInterfaceLogService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsInterfaceLogService.java
index a0af04b..ed0dbaf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsInterfaceLogService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WmsInterfaceLogService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.WmsInterfaceLog;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WxNoticeConfigService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WxNoticeConfigService.java
index 26b7918..8453052 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WxNoticeConfigService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/WxNoticeConfigService.java
@@ -1,7 +1,7 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.WxNoticeConfig;
import java.util.List;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java
index aaea1d2..63878ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/ERPSyncService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business.ext;
import com.doumee.core.erp.model.openapi.request.erp.*;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.*;
import com.doumee.core.erp.model.openapi.response.*;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
index 06278c8..abed35f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
@@ -5,11 +5,9 @@
import com.doumee.core.haikang.model.param.request.event.parks.*;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
-import com.doumee.core.haikang.model.param.respose.AppointmentInfoResponse;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.ParkBook;
-import io.swagger.models.auth.In;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java
index 5f49ba5..c4f8caa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ApproveParamMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 613d663..804ad0d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -9,8 +9,8 @@
import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index fbf4ad6..041f4ed 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -2,9 +2,9 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ApproveParamMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
index 83055f2..4903925 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
@@ -2,9 +2,9 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarDriverMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 13fc797..ed0fc43 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -1,8 +1,8 @@
package com.doumee.service.business.impl;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.response.CarEventDTO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarParksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarParksServiceImpl.java
index b5b4f8f..c9db210 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarParksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarParksServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarParksMapper;
import com.doumee.dao.business.model.CarParks;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 120c174..ecb46e3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -3,9 +3,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index dfadce2..2612c9a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -7,9 +7,9 @@
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.ScientificNotationTUtil;
import com.doumee.core.utils.Utils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 6de45a4..9d6cd82 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -2,9 +2,9 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CategoryMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 5f76792..731771c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -17,9 +17,9 @@
import com.doumee.core.haikang.model.param.respose.OrgOrUserAddResponse;
import com.doumee.core.haikang.model.param.respose.OrgUpdateFailureResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index 8f2954a..664c09c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -4,8 +4,8 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index e503612..b2aec88 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -7,9 +7,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index dcd27b0..8477419 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -5,8 +5,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.param.request.TransparentChannelSingleRequest;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DeviceMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
index 980ba2e..133bb4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java
@@ -1,8 +1,8 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.EmpowerMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/FormParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/FormParamServiceImpl.java
index 3e9515d..22c3b33 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/FormParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/FormParamServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.FormParamMapper;
import com.doumee.dao.business.model.FormParam;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
index 584e2e5..abb07ef 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
@@ -1,8 +1,8 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerLogMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index 4384def..67cda58 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -2,9 +2,9 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerParamMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 2054ba1..5908401 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -8,9 +8,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutDayCountServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutDayCountServiceImpl.java
index c21185c..a91533c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutDayCountServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutDayCountServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.InoutDayCountMapper;
import com.doumee.dao.business.model.InoutDayCount;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
index 2a7e7fd..4b7bfb3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
@@ -1,13 +1,12 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.InterfaceLogMapper;
import com.doumee.dao.business.model.InterfaceLog;
-import com.doumee.dao.business.model.WmsInterfaceLog;
import com.doumee.service.business.InterfaceLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 5e62c02..1697d40 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -12,9 +12,9 @@
import com.doumee.core.haikang.model.param.request.CardInfoRequest;
import com.doumee.core.haikang.model.param.request.CardLossRequest;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java
index 6e6fd07..af41fe6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberRoleServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberRoleMapper;
import com.doumee.dao.business.model.MemberRole;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index af87a83..0f64ff0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -19,9 +19,10 @@
import com.doumee.core.haikang.model.param.respose.UserAddResponse;
import com.doumee.core.haikang.model.param.respose.UserDelResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
@@ -49,6 +50,8 @@
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import com.doumee.service.business.third.model.request.TmsEmployeeListRequest;
+import com.doumee.service.business.third.model.response.TmsEmployeeListResponse;
import com.doumee.service.system.SystemLoginService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
@@ -118,6 +121,8 @@
@Autowired
private VisitsMapper visitsMapper;
+ @Autowired
+ private TmsService tmsService;
@Autowired
private SystemUserMapper systemUserMapper;
@@ -1725,76 +1730,119 @@
}
wxAuthorizeVO.setOpenid(openId);
if(source==1){
- //鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
- Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
- .selectAll(Member.class)
- .selectAs(Company::getName,Member::getCompanyName)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .eq(Member::getOpenid,openId)
- .eq(Member::getType,source)
- .eq(Member::getIsdeleted,Constants.ZERO)
- .orderByDesc(Member::getCreateDate)
- .last(" limit 1 ")
- );
- //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
- if(!Objects.isNull(member)){
- if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
- }
- if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
- }
- if(StringUtils.isNotBlank(member.getIdcardNo())){
- member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
- }
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- member.setPrefixUrl(prefixUrl);
- wxAuthorizeVO.setMember(member);
- //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
- if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
- SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
- .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
- if(Objects.nonNull(systemUser)){
- String token = systemLoginService.loginByUserId(systemUser.getId());
- wxAuthorizeVO.setToken(token);
- }
- }
- }
+ //澶勭悊鏅�氳瀹汉鍛樿嚜鍔ㄦ巿鏉冮�昏緫
+ dealVisitUserAuthBiz(wxAuthorizeVO,openId,source);
+ }else if(source == 3){
+ //澶勭悊tms绠℃帶浜哄憳鑷姩鎺堟潈閫昏緫
+ dealGkUserAuthBiz(wxAuthorizeVO,openId,source);
}else{
//濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
- SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
- .eq(SystemUser::getOpenid,openId)
- .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
- .last(" limit 1 "));
- //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
- if(!Objects.isNull(user)){
- Member member = memberMapper.selectById(user.getMemberId());
- if(member.getIsdeleted() == Constants.ONE){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
- }
- if(member.getStatus() != Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
- }
- if(StringUtils.isNotBlank(member.getIdcardNo())){
- member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
- }
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- member.setPrefixUrl(prefixUrl);
- wxAuthorizeVO.setMember(member);
- //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
- String token = systemLoginService.loginByUserId(user.getId());
- wxAuthorizeVO.setToken(token);
- }
+ dealSystemUserAuthBiz(wxAuthorizeVO,openId,source);
}
-
-
return wxAuthorizeVO;
}
+ private void dealSystemUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getOpenid,openId)
+ .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
+ .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .last(" limit 1 "));
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(user)){
+ Member member = memberMapper.selectById(user.getMemberId());
+ if(member.getIsdeleted() == Constants.ONE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+ private void dealGkUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) {
+ //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
+ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getOpenid,openId)
+ .eq(SystemUser::getType,source)
+ .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
+ .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .last(" limit 1 "));
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(user)){
+ TmsEmployeeListRequest tp = new TmsEmployeeListRequest();
+ tp.setTel(user.getMobile());
+ TmsEmployeeListResponse response = tmsService.getEmployeeList(tp);
+ if(response == null || response.getTel()==null){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ处鎴蜂汉鍛樹俊鎭笉姝ｇ‘锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛樻煡鐪嬶紒");
+ }
+ Member member = memberMapper.selectById(user.getMemberId());
+ if(member.getIsdeleted() == Constants.ONE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ String token = systemLoginService.loginByUserId(user.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+
+ private void dealVisitUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId,Integer source) {
+ Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getOpenid,openId)
+ .eq(Member::getType,source)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .orderByDesc(Member::getCreateDate)
+ .last(" limit 1 ")
+ );
+ //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
+ if(!Objects.isNull(member)){
+ if(member.getIsdeleted() == Constants.ONE){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getStatus() != Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(StringUtils.isNotBlank(member.getIdcardNo())){
+ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo()));
+ }
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ member.setPrefixUrl(prefixUrl);
+ wxAuthorizeVO.setMember(member);
+ //鍙告満 涓� 鍐呴儴浜哄憳 鎻愪緵token
+ if(Constants.equalsInteger(source,Constants.ZERO)||Constants.equalsInteger(source,Constants.TWO)){
+ SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,member.getId())
+ .eq(SystemUser::getStatus,Constants.ZERO).last(" limit 1 "));
+ if(Objects.nonNull(systemUser)){
+ String token = systemLoginService.loginByUserId(systemUser.getId());
+ wxAuthorizeVO.setToken(token);
+ }
+ }
+ }
+ }
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index 399e656..f371b8f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -2,9 +2,9 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.ParkBookMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
index 338441f..cf85080 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParksServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.ParksMapper;
import com.doumee.dao.business.join.ParksJoinMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index f3398ca..913db0d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -3,9 +3,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java
index b06620d..65155c2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBroadcastLogServiceImpl.java
@@ -1,10 +1,9 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformBroadcastLogMapper;
-import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.PlatformBroadcastLog;
import com.doumee.service.business.PlatformBroadcastLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformDeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformDeviceServiceImpl.java
index 7c33b95..34990e3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformDeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformDeviceServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformDeviceMapper;
import com.doumee.dao.business.model.PlatformDevice;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java
index 0a6bbca..aa187e8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java
@@ -1,12 +1,11 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformEventMapper;
-import com.doumee.dao.business.model.Empower;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformEvent;
import com.doumee.service.business.PlatformEventService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index 39e4bec..55300c8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -2,11 +2,10 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformGroupMapper;
import com.doumee.dao.business.PlatformShowParamMapper;
@@ -21,9 +20,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.PlatformJobService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import lombok.extern.java.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
index e1cb423..9d90092 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
@@ -1,12 +1,11 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformInterfaceLogMapper;
-import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.PlatformInterfaceLog;
import com.doumee.service.business.PlatformInterfaceLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 3549483..265e4a9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -10,12 +10,12 @@
import com.doumee.core.haikang.model.param.request.ParkReservationDelRequest;
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
-import com.doumee.core.tms.model.response.TmsBaseResponse;
-import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.request.TmsLockStatusQueryRequest;
+import com.doumee.service.business.third.model.response.TmsBaseResponse;
+import com.doumee.service.business.third.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.utils.*;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
index 17d2a74..a50c14e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformLogServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformLogMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformQueueServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformQueueServiceImpl.java
index 075e998..6d9abd6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformQueueServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformQueueServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformQueueMapper;
import com.doumee.dao.business.model.PlatformQueue;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java
index d4dca8b..5745b3a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformReasonServiceImpl.java
@@ -2,13 +2,12 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformReasonMapper;
-import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.business.model.PlatformReason;
import com.doumee.service.business.PlatformReasonService;
@@ -16,7 +15,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index b950337..45d200c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -1,11 +1,10 @@
package com.doumee.service.business.impl;
-import cn.emay.sdk.util.StringUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
@@ -15,14 +14,12 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.openapi.response.PlatformNumByStatusResponse;
import com.doumee.dao.openapi.response.PlatformStatusListResponse;
-import com.doumee.service.business.PlatformDeviceService;
import com.doumee.service.business.PlatformService;
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 com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java
index 168ed88..c7fb583 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformShowParamServiceImpl.java
@@ -1,9 +1,9 @@
package com.doumee.service.business.impl;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformShowParamMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
index 51c4937..f7816fe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWarnEventServiceImpl.java
@@ -1,9 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformWarnEventMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
index a0756e8..40b49e9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java
@@ -3,9 +3,9 @@
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsDetailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsDetailServiceImpl.java
index 92fb2d2..3d9786f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsDetailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsDetailServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformWmsDetailMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
index b17522e..16ef858 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
@@ -2,8 +2,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformWmsDetailMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PositionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PositionServiceImpl.java
index 6b5c2b8..d23ea74 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PositionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PositionServiceImpl.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PositionMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index ad60730..72a3998 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.dao.MemberMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index b7e018f..3aa9df5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.OptionsObject;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 75a1043..b095a33 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -3,8 +3,8 @@
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.RetentionMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsConfigServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsConfigServiceImpl.java
index cd5f64f..db81e0f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsConfigServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsConfigServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.model.SmsConfig;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 502ea87..b5bb4a2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -8,8 +8,8 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TasksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TasksServiceImpl.java
index 958dc5c..788613c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TasksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TasksServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.TasksMapper;
import com.doumee.dao.business.model.Tasks;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java
index 5479690..87f4289 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java
@@ -2,14 +2,12 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.TmsFactoryParamMapper;
-import com.doumee.dao.business.model.Category;
-import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TmsFactoryParamService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index f6f561e..f1b7560 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -1,15 +1,14 @@
package com.doumee.service.business.impl;
import cn.hutool.core.util.IdcardUtil;
-import cn.hutool.core.util.PhoneUtil;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
index e1fc2a6..eb83a8d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.UserActionMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index 6539ec6..93d9a0d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -4,8 +4,8 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitEventMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
index a1a6029..8aacdc6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitParkServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.VisitParkMapper;
import com.doumee.dao.business.join.VisitParkJoinMapper;
import com.doumee.dao.business.model.*;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemLogServiceImpl.java
index 243668d..109e692 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemLogServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitProblemLogMapper;
import com.doumee.dao.business.model.VisitProblemLog;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemsServiceImpl.java
index b80cefd..a0307cb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitProblemsServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitProblemsMapper;
import com.doumee.dao.business.model.VisitProblems;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
index 49d54a6..91f69a6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
@@ -1,8 +1,8 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitReasonMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitorServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitorServiceImpl.java
index abb0a3f..9e0a800 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitorServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitorServiceImpl.java
@@ -1,7 +1,7 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitorMapper;
import com.doumee.dao.business.model.Visitor;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index bd4c13c..b2dd665 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -17,9 +17,9 @@
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WmsInterfaceLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WmsInterfaceLogServiceImpl.java
index a91675c..b453bf8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WmsInterfaceLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WmsInterfaceLogServiceImpl.java
@@ -5,8 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WmsInterfaceLogMapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WxNoticeConfigServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WxNoticeConfigServiceImpl.java
index 9ff4e73..eca8c21 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WxNoticeConfigServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WxNoticeConfigServiceImpl.java
@@ -1,10 +1,9 @@
package com.doumee.service.business.impl;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WxNoticeConfigMapper;
-import com.doumee.dao.business.model.SmsConfig;
import com.doumee.dao.business.model.WxNoticeConfig;
import com.doumee.service.business.WxNoticeConfigService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 091422e..0a46f0b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -14,8 +14,8 @@
import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.*;
import com.doumee.core.erp.model.openapi.response.*;
import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
index e359692..a53faca 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -11,7 +11,7 @@
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
import com.doumee.core.haikang.model.param.respose.TaskAdditionResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.ParkBook;
import com.doumee.service.business.ext.HkSyncService;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index ef1becb..77c2f83 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -10,7 +10,7 @@
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
index 3f5d870..0142379 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
@@ -12,7 +12,7 @@
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
index 2cdc824..0055e55 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromSelfServiceImpl.java
@@ -13,7 +13,7 @@
import com.doumee.core.haikang.model.param.respose.OrgInfoResponse;
import com.doumee.core.haikang.model.param.respose.UserInfoResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 29d38af..a4fdea4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -14,11 +14,10 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKCarOpenService;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.tms.model.request.TmsFacrotyCodeListRequest;
-import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
-import com.doumee.core.tms.model.request.TmsOutQtyAndVehicleQtyRequest;
-import com.doumee.core.tms.model.request.TmsSevenArrivalDetailsRequest;
-import com.doumee.core.tms.model.response.*;
+import com.doumee.service.business.third.model.request.TmsFacrotyCodeListRequest;
+import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
+import com.doumee.service.business.third.model.request.TmsOutQtyAndVehicleQtyRequest;
+import com.doumee.service.business.third.model.request.TmsSevenArrivalDetailsRequest;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
@@ -36,8 +35,10 @@
import com.doumee.service.business.third.BoardService;
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.WmsService;
+import com.doumee.service.business.third.model.response.*;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -2150,6 +2151,11 @@
if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
}
+ if(Constants.UNIT_TYPE == 1) {
+ //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+ t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ }
}
result.getDetailList().add(t);
result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
@@ -2292,6 +2298,15 @@
if(data.getCrrentRestCarNum()<=0){
data.setCrrentRestCarNum(0);
}
+ //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+ if(Constants.UNIT_TYPE == 1) {
+ data.setMaxAbility(Constants.formatBigdecimal(data.getMaxAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setHoursAbility(Constants.formatBigdecimal(data.getHoursAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCrrentRestNum(Constants.formatBigdecimal(data.getCrrentRestNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCurrentPlanNum(Constants.formatBigdecimal(data.getCurrentPlanNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCrrentOutNum(Constants.formatBigdecimal(data.getCrrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCurrentOrderNum(Constants.formatBigdecimal(data.getCurrentOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ }
}
private boolean notInList(String transportCode, List<String> planCodes) {
@@ -2380,6 +2395,16 @@
data.setSameOutNum(data.getLastOutNum());
data.setSameInNum(data.getLastInNum());
}
+
+ //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+ if(Constants.UNIT_TYPE == 1) {
+ data.setCurrentInNum(Constants.formatBigdecimal(data.getCurrentInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCurrentOutNum(Constants.formatBigdecimal(data.getCurrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setLastInNum(Constants.formatBigdecimal(data.getLastInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setLastOutNum(Constants.formatBigdecimal(data.getLastOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setSameInNum(Constants.formatBigdecimal(data.getSameInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setSameOutNum(Constants.formatBigdecimal(data.getSameOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ }
return data;
}
/**
@@ -2397,14 +2422,20 @@
List<TmsDistributionOfDeliveryLocResponse> response = tmsService.getDistributionOfDeliveryLocations(param);//鏌ヨ鍑哄簱閲�
if(response!=null &&response.size()>0){
for(TmsDistributionOfDeliveryLocResponse model : response){
- WholeProvinceMapVO tt = getFromProvinceResultList(model ,result);
- if(tt == null){
- tt =new WholeProvinceMapVO();
- tt.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
- tt.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
- tt.setProvinceCode(model.getToProvinceCode());
- tt.setProvinceName(model.getToProvinceName());
- result.add(tt);
+ WholeProvinceMapVO t = getFromProvinceResultList(model ,result);
+ if(t == null){
+ t =new WholeProvinceMapVO();
+ t.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
+ t.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
+
+ if(Constants.UNIT_TYPE == 1) {
+ //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+ t.setMonthNum(Constants.formatBigdecimal(t.getMonthNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ t.setYearNum(Constants.formatBigdecimal(t.getYearNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ }
+ t.setProvinceCode(model.getToProvinceCode());
+ t.setProvinceName(model.getToProvinceName());
+ result.add(t);
}
}
}
@@ -2528,6 +2559,12 @@
if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
}
+ if(Constants.UNIT_TYPE == 1) {
+ //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+ t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+
+ }
result.getDetailList().add(t);
result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
result.setTotalNum(result.getTotalNum().add(t.getTotalNum()));
@@ -2586,6 +2623,11 @@
if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
}
+ if(Constants.UNIT_TYPE == 1){
+ //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+ t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5),2,BigDecimal.ROUND_HALF_UP));
+ t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5),2,BigDecimal.ROUND_HALF_UP));
+ }
result.getDetailList().add(t);
result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
result.setTotalNum(result.getTotalNum().add(t.getTotalNum()));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index 82403aa..b8cd073 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -2,9 +2,9 @@
import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.param.respose.*;
-import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
-import com.doumee.core.tms.model.response.TmsBasePageResponse;
-import com.doumee.core.tms.model.response.TmsOrderNoFinishListResponse;
+import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
+import com.doumee.service.business.third.model.response.TmsBasePageResponse;
+import com.doumee.service.business.third.model.response.TmsOrderNoFinishListResponse;
import com.doumee.dao.business.model.PlatformWarnEvent;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/systembiz/impl/SystemDictDataBizServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/systembiz/impl/SystemDictDataBizServiceImpl.java
index ad81421..6e51fa0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/systembiz/impl/SystemDictDataBizServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/systembiz/impl/SystemDictDataBizServiceImpl.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.SystemDictMapper;
diff --git a/server/visits/openapi/src/main/java/com/doumee/api/BaseController.java b/server/visits/openapi/src/main/java/com/doumee/api/BaseController.java
index 8e09236..8b9a1f7 100644
--- a/server/visits/openapi/src/main/java/com/doumee/api/BaseController.java
+++ b/server/visits/openapi/src/main/java/com/doumee/api/BaseController.java
@@ -1,6 +1,6 @@
package com.doumee.api;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.service.business.third.model.LoginUserInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
diff --git a/server/visits/openapi/src/main/java/com/doumee/api/common/CaptchaController.java b/server/visits/openapi/src/main/java/com/doumee/api/common/CaptchaController.java
index f79c623..143ff2f 100644
--- a/server/visits/openapi/src/main/java/com/doumee/api/common/CaptchaController.java
+++ b/server/visits/openapi/src/main/java/com/doumee/api/common/CaptchaController.java
@@ -2,7 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.common.CaptchaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/visits/openapi/src/main/java/com/doumee/api/web/BizResourceController.java b/server/visits/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
index bca5a78..cfa83d4 100644
--- a/server/visits/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
+++ b/server/visits/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
@@ -1,32 +1,12 @@
package com.doumee.api.web;
-import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.config.annotation.ErpLoginRequired;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.erp.model.openapi.request.*;
-import com.doumee.core.erp.model.openapi.response.*;
-import com.doumee.core.utils.Constants;
-import com.doumee.dao.web.reqeust.ErpVisitDTO;
import com.doumee.service.business.VisitsService;
import com.doumee.service.business.ext.ERPSyncService;
-import com.google.gson.JsonObject;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* Created by IntelliJ IDEA.
diff --git a/server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java b/server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
index c8f4f5e..859229e 100644
--- a/server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
+++ b/server/visits/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
@@ -6,8 +6,8 @@
import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest;
import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
import com.doumee.core.erp.model.openapi.request.erp.UserListRequest;
import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
--
Gitblit v1.9.3