diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 33c8492..71562fd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,31 +5,175 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="84ac1b15-3cfa-4375-9957-45b7b581d04e" name="Changes" comment="#update">
-      <change afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysOrgController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysSiteController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysOrgMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysSiteMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysOrgService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysSiteService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/maibu-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/MiddlePlatformApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/MiddlePlatformApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeptController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysMenuController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysOrgController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysOrgController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysPostController.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysProfileController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysProfileController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysRoleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysSiteController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysSiteController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysUserController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/application-dev.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/device/DeviceAndProtocol.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/BaseDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/BaseDO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/SysMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/SysMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/SysOrg.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/SysOrg.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/SysRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/SysRole.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/SysUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/SecurityConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceBindDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceBindDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/model/LoginUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/model/LoginUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/CommonStatusEnum.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/DataEnum.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/DeviceDistributeTypeEnum.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/DeviceLogTypeEnum.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/DeviceRecordTypeEnum.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/JobType.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/PushType.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/ResultCode.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/StatusEnum.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/exception/iot/MqttAuthorizationException.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/exception/iot/MqttClientUserNameOrPassException.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/exception/job/TaskException.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/SecurityUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/SecurityUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-external/src/main/java/com/maibu/own/controller/CommonDeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-external/src/main/java/com/maibu/own/controller/CommonDeviceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-external/src/main/java/com/maibu/own/service/CommonDeviceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-external/src/main/java/com/maibu/own/service/CommonDeviceService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-framework/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-framework/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/mybatis/LambdaQueryWrapperX.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/mybatis/QueryWrapperX.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/mybatis/mapper/BaseMapperX.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/mybatis/utils/MyBatisUtils.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/web/service/SysLoginService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/web/service/SysLoginService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/web/service/UserDetailsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/web/service/UserDetailsServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-iotDA/src/main/java/com/maibu/utils/IoTDAMqttClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-iotDA/src/main/java/com/maibu/utils/IoTDAMqttClient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/common/Constant.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/common/Constant.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/controller/DeviceExternalApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/controller/DeviceExternalApiController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/controller/DeviceTaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/controller/DeviceTaskController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/controller/NettyDeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/controller/NettyDeviceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/Connector.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/device/Connector.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceErrorPushDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceErrorPushDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceLoginResponseDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceLoginResponseDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceRequestDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceRequestDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceStatusChangeDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceStatusChangeDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceTaskQueryDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/DeviceTaskQueryDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/dto/NettyDevice.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/device/NettyDevice.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/entity/ErrorIdentificationStandard.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/ErrorIdentificationStandard.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/entity/path/LatAndLngEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/path/LatAndLngEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/entity/path/MowingPathGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/path/MowingPathGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/entity/path/RPPathData.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/path/RPPathData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanRecEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/path/RoutePlanRecEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanSendEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/path/RoutePlanSendEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/enums/CommandRequestType.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/enums/CompareEnum.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/enums/ConnectionCloseReason.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/enums/ConnectorStatus.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/enums/ConnectorType.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/enums/DeviceStatus.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/enums/RespondCode.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/init/InitThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/init/InitThread.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/manager/DeviceSessionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/manager/DeviceSessionManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/mapper/ErrorIdentificationStandardMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/mapper/ErrorIdentificationStandardMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/memory/GlobalMemory.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/netty/handler/CommandForwardHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/netty/handler/CommandForwardHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/netty/handler/DataToDataBaseHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/netty/handler/DataToDataBaseHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/scheduled/ScheduledTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/scheduled/ScheduledTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/DevicePlanTaskMonitorService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/DevicePlanTaskMonitorService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/NettyDeviceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/NettyDeviceService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/TransferDeviceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/service/TransferDeviceService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Bridge.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Device.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Device.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/utils/CompareUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/utils/CompareUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Category.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Device.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DevicePlan.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DevicePlanTask.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceRunStatistics.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceRunningStatusHistory.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceStatusRecordDTO.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceTaskPlanRule.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/EventLog.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonDevice.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDevice.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonDeviceAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDeviceAction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonProduct.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/IoTCommonProduct.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonThingsModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/IoTCommonThingsModel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/ConnectType.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceTaskPlanRepeatType.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceTaskStaus.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceType.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/CategoryMapper.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceRunStatisticsMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceRunStatisticsMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceStatusHistoryMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceStatusHistoryMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/EventLogMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/EventLogMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/IoTCommonDevicesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/IoTCommonDevicesMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/MqttClientMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/WorkRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/WorkRecordMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/memory/CommonMemory.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/AuthenticateInputModel.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceAlertCount.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceAllShortOutput.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceMqttVO.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceNumberStatus.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceRelateAlertLogVO.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceRunningStatus.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceStatistic.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceStatusVO.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/HistoryModel.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/IdAndName.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/MonitorModel.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/ProductAuthenticateModel.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/ProductCode.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/RegisterUserInput.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/RegisterUserOutput.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/UserIdDeviceIdModel.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/UserSocialProfile.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/WorkRecord.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/gateWay/ProductSubGatewayVO.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/param/DataCenterParam.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/ICategoryService.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IEventLogService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IEventLogService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IToolService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IToolService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IUserSocialProfileService.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IWorkRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IWorkRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/CategoryServiceImpl.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/EventLogServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/EventLogServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/ToolServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/ToolServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/WorkRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/WorkRecordMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/domain/SysPost.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/domain/SysUserPost.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/enums/Language.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysPostMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysRoleMenuMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysRoleMenuMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserPostMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysMenuService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysPostService.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysRoleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysOrgService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysOrgService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysSiteService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysSiteService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysMenuServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysPostServiceImpl.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysRoleServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserOnlineServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserOnlineServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysPostMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMenuMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMenuMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysUserPostMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-web-middleware/src/main/java/com/maibu/websocket/WebsocketHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-web-middleware/src/main/java/com/maibu/websocket/WebsocketHandler.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,6 +205,7 @@
   <component name="PropertiesComponent">{
   &quot;keyToString&quot;: {
     &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;Application.test.executor&quot;: &quot;Debug&quot;,
     &quot;Maven.MiddlePlatform [clean].executor&quot;: &quot;Run&quot;,
     &quot;Maven.MiddlePlatform [install].executor&quot;: &quot;Run&quot;,
     &quot;Maven.maibu-netty-server [clean].executor&quot;: &quot;Run&quot;,
@@ -77,7 +222,7 @@
     &quot;Spring Boot.MiddlePlatformApplication.executor&quot;: &quot;Debug&quot;,
     &quot;git-widget-placeholder&quot;: &quot;main&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/maibu/Test/MiddlePlatform/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/maibu/Test/MiddlePlatform/maibu-common/src/main/java/com/maibu/core/business&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -96,8 +241,8 @@
       <window_info id="Commit_Guest" show_stripe_button="false" />
       <window_info id="Pull Requests" />
       <window_info id="Learn" show_stripe_button="false" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.28090215" />
-      <window_info active="true" id="Commit" order="1" visible="true" weight="0.28090215" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30316347" />
+      <window_info id="Commit" order="1" weight="0.28090215" />
       <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Database Changes" />
       <window_info anchor="bottom" id="TypeScript" />
@@ -110,9 +255,9 @@
       <window_info anchor="bottom" id="Terminal" order="3" />
       <window_info anchor="bottom" id="Services" order="4" />
       <window_info anchor="bottom" id="Build" order="5" weight="0.3302257" />
-      <window_info anchor="bottom" id="Run" order="6" weight="0.30961728" />
+      <window_info anchor="bottom" id="Run" order="6" weight="0.3302257" />
       <window_info anchor="bottom" id="Find" order="7" weight="0.3302257" />
-      <window_info anchor="bottom" id="Debug" order="8" weight="0.5019627" />
+      <window_info anchor="bottom" id="Debug" order="8" visible="true" weight="0.3370952" />
       <window_info anchor="right" id="Endpoints" />
       <window_info anchor="right" id="documentation.v2" show_stripe_button="false" side_tool="true" />
       <window_info anchor="right" id="Coverage" side_tool="true" />
@@ -121,26 +266,39 @@
       <window_info anchor="right" id="AIAssistant" order="1" weight="0.25" />
       <window_info anchor="right" id="Database" order="2" weight="0.25" />
       <window_info anchor="right" id="Gradle" order="3" weight="0.25" />
-      <window_info active="true" anchor="right" id="Maven" order="4" visible="true" weight="0.12214411" />
+      <window_info anchor="right" id="Maven" order="4" weight="0.20415935" />
     </layout>
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business" />
+      <recent name="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/enums" />
+      <recent name="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu" />
       <recent name="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller" />
       <recent name="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl" />
-      <recent name="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service" />
-      <recent name="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper" />
-      <recent name="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/model" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.maibu.core.business" />
+      <recent name="com.maibu.memory" />
       <recent name="com.maibu.service" />
-      <recent name="com.maibu.web.controller.system" />
       <recent name="com.maibu.mapper" />
-      <recent name="com.maibu.core.domain.entity" />
-      <recent name="com.maibu.service.impl" />
+      <recent name="com.maibu.web.controller.system" />
     </key>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.MiddlePlatformApplication">
+    <configuration name="test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.maibu.influxdb.test" />
+      <module name="maibu-netty-server" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.maibu.utils.inter.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="JetRunConfigurationType">
       <module name="maibu-iot-service" />
       <method v="2">
@@ -176,6 +334,7 @@
     <recent_temporary>
       <list>
         <item itemvalue="Spring Boot.MiddlePlatformApplication" />
+        <item itemvalue="Application.test" />
       </list>
     </recent_temporary>
   </component>
@@ -205,7 +364,16 @@
       <workItem from="1776818751852" duration="9107000" />
       <workItem from="1776832672297" duration="8049000" />
       <workItem from="1776904775197" duration="11165000" />
-      <workItem from="1776991172322" duration="5635000" />
+      <workItem from="1776991172322" duration="17194000" />
+      <workItem from="1777249981569" duration="10136000" />
+      <workItem from="1777265527819" duration="43499000" />
+      <workItem from="1777423535761" duration="4627000" />
+      <workItem from="1777428666766" duration="4786000" />
+      <workItem from="1777437225486" duration="5747000" />
+      <workItem from="1777443053830" duration="11329000" />
+      <workItem from="1777508899679" duration="10803000" />
+      <workItem from="1777523683395" duration="1929000" />
+      <workItem from="1777526446322" duration="7174000" />
     </task>
     <task id="LOCAL-00001" summary="#update">
       <option name="closed" value="true" />
@@ -231,7 +399,15 @@
       <option name="project" value="LOCAL" />
       <updated>1776736541601</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="#update">
+      <option name="closed" value="true" />
+      <created>1776997902015</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1776997902016</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -264,9 +440,24 @@
           <option name="timeStamp" value="11" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java</url>
-          <line>76</line>
-          <option name="timeStamp" value="12" />
+          <url>file://$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/utils/test.java</url>
+          <line>52</line>
+          <option name="timeStamp" value="17" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysMenuServiceImpl.java</url>
+          <line>166</line>
+          <option name="timeStamp" value="18" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/web/exception/GlobalExceptionHandler.java</url>
+          <line>34</line>
+          <option name="timeStamp" value="19" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysMenuController.java</url>
+          <line>127</line>
+          <option name="timeStamp" value="25" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeptController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeptController.java
index 21af174..3e58576 100644
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeptController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeptController.java
@@ -3,6 +3,8 @@ package com.maibu.web.controller.system;
 import cn.hutool.core.util.ObjectUtil;
 import com.maibu.annotation.Log;
 import com.maibu.constant.UserConstants;
+import com.maibu.core.business.RegisterUserInput;
+import com.maibu.core.business.RegisterUserOutput;
 import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.domain.entity.*;
@@ -11,8 +13,6 @@ import com.maibu.enums.BusinessType;
 import com.maibu.exception.ServiceException;
 import com.maibu.mapper.DeviceMapper;
 import com.maibu.mapper.SysRoleDeptMapper;
-import com.maibu.model.RegisterUserInput;
-import com.maibu.model.RegisterUserOutput;
 import com.maibu.service.*;
 import com.maibu.utils.MessageUtils;
 import com.maibu.utils.StringUtils;
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java
index 6585f1a..de3b59a 100644
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java
@@ -6,10 +6,10 @@ import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.domain.entity.SysMenu;
 import com.maibu.core.domain.entity.SysUser;
 import com.maibu.core.domain.model.LoginBody;
+import com.maibu.core.enums.ConnectorStatus;
 import com.maibu.domain.AppPreferences;
-import com.maibu.dto.NettyDevice;
+import com.maibu.core.business.device.NettyDevice;
 import com.maibu.enums.BusinessType;
-import com.maibu.enums.ConnectorStatus;
 import com.maibu.enums.SourceType;
 import com.maibu.manager.DeviceSessionManager;
 import com.maibu.service.IAppPreferencesService;
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysMenuController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysMenuController.java
index 34072ed..5949bb2 100644
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysMenuController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysMenuController.java
@@ -7,6 +7,7 @@ import com.maibu.constant.UserConstants;
 import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.domain.entity.SysMenu;
+import com.maibu.core.page.TableDataInfo;
 import com.maibu.enums.BusinessType;
 import com.maibu.service.ISysMenuService;
 import com.maibu.utils.MessageUtils;
@@ -26,8 +27,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "菜单管理")
 @RestController
 @RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
-{
+public class SysMenuController extends BaseController {
     @Autowired
     private ISysMenuService menuService;
 
@@ -35,22 +35,25 @@ public class SysMenuController extends BaseController
      * 获取菜单列表
      */
     @ApiOperation("获取菜单列表")
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+//    @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
-    {
-        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return success(menus);
+    public TableDataInfo list(SysMenu menu) {
+        try {
+            startPage();
+            List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+            return getDataTable(menus);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
      * 根据菜单编号获取详细信息
      */
     @ApiOperation("根据菜单编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+//    @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
-    {
+    public AjaxResult getInfo(@PathVariable Long menuId) {
         return success(menuService.selectMenuById(menuId));
     }
 
@@ -59,8 +62,7 @@ public class SysMenuController extends BaseController
      */
     @ApiOperation("获取菜单下拉树列表")
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysMenu menu)
-    {
+    public AjaxResult treeselect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return success(menuService.buildMenuTreeSelect(menus));
     }
@@ -70,8 +72,7 @@ public class SysMenuController extends BaseController
      */
     @ApiOperation("加载对应角色菜单列表树")
     @GetMapping(value = "/roleMenuTreeselect")
-    public AjaxResult roleMenuTreeselect(@RequestParam Long roleId, @RequestParam Long deptId)
-    {
+    public AjaxResult roleMenuTreeselect(@RequestParam Long roleId, @RequestParam Long deptId) {
         List<SysMenu> menus = menuService.deptRoleMenuTreeselect(deptId, roleId);
 //        List<SysMenu> menus = menuService.selectMenuList(getUserId(), request.getHeader(LANGUAGE));
         AjaxResult ajax = AjaxResult.success();
@@ -84,17 +85,13 @@ public class SysMenuController extends BaseController
      * 新增菜单
      */
     @ApiOperation("新增菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+//    @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
+    public AjaxResult add(@Validated @RequestBody SysMenu menu) {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
             return error(StringUtils.format(MessageUtils.message("menu.add.failed.name.exists"), menu.getMenuName()));
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
-        {
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
             return error(StringUtils.format(MessageUtils.message("menu.add.failed.path.not.valid"), menu.getMenuName()));
         }
         menu.setCreateBy(getUsername());
@@ -105,21 +102,15 @@ public class SysMenuController extends BaseController
      * 修改菜单
      */
     @ApiOperation("修改菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
             return error(StringUtils.format(MessageUtils.message("menu.update.failed.name.exists"), menu.getMenuName()));
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
-        {
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
             return error(StringUtils.format(MessageUtils.message("menu.update.failed.path.not.valid"), menu.getMenuName()));
-        }
-        else if (menu.getMenuId().equals(menu.getParentId()))
-        {
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
             return error(StringUtils.format(MessageUtils.message("menu.update.failed.parent.not.valid"), menu.getMenuName()));
         }
         menu.setUpdateBy(getUsername());
@@ -130,17 +121,14 @@ public class SysMenuController extends BaseController
      * 删除菜单
      */
     @ApiOperation("删除菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
-    {
-        if (menuService.hasChildByMenuId(menuId))
-        {
+    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+        if (menuService.hasChildByMenuId(menuId)) {
             return warn(MessageUtils.message("menu.delete.failed.child.exists"));
         }
-        if (menuService.checkMenuExistRole(menuId))
-        {
+        if (menuService.checkMenuExistRole(menuId)) {
             return warn(MessageUtils.message("menu.delete.failed.role.exists"));
         }
         return toAjax(menuService.deleteMenuById(menuId));
@@ -151,9 +139,10 @@ public class SysMenuController extends BaseController
      */
     @ApiOperation("加载对应部门菜单列表树")
     @GetMapping(value = "/deptMenuTreeselect/{deptId}")
-    public AjaxResult deptMenuTreeselect(@PathVariable("deptId") Long deptId)
-    {
+    public AjaxResult deptMenuTreeselect(@PathVariable("deptId") Long deptId) {
         List<SysMenu> menus = menuService.deptMenuTreeselect(deptId);
         return success(menuService.buildMenuTreeSelect(menus));
     }
+
+
 }
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysOrgController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysOrgController.java
index f46181e..b829ae2 100644
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysOrgController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysOrgController.java
@@ -4,12 +4,9 @@ import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.domain.entity.SysOrg;
 import com.maibu.core.page.TableDataInfo;
-import com.maibu.domain.Device;
 import com.maibu.service.SysOrgService;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -58,7 +55,7 @@ public class SysOrgController extends BaseController {
     @GetMapping("/delete")
     public AjaxResult delete(@RequestParam Long id) {
         try {
-            return AjaxResult.success(sysOrgService.delete(id));
+            return sysOrgService.delete(id);
         } catch (Exception e) {
             return AjaxResult.error("保存组织出错", e.getMessage());
         }
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysPostController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysPostController.java
deleted file mode 100644
index dcc8f19..0000000
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysPostController.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.maibu.web.controller.system;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.maibu.annotation.Log;
-import com.maibu.constant.UserConstants;
-import com.maibu.core.controller.BaseController;
-import com.maibu.core.domain.AjaxResult;
-import com.maibu.core.page.TableDataInfo;
-import com.maibu.domain.SysPost;
-import com.maibu.enums.BusinessType;
-import com.maibu.service.ISysPostService;
-import com.maibu.utils.MessageUtils;
-import com.maibu.utils.StringUtils;
-import com.maibu.utils.poi.ExcelUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 岗位信息操作处理
- *
- * @author ruoyi
- */
-@Api(tags = "岗位管理")
-@RestController
-@RequestMapping("/system/post")
-public class SysPostController extends BaseController
-{
-    @Autowired
-    private ISysPostService postService;
-
-    /**
-     * 获取岗位列表
-     */
-    @ApiOperation("获取岗位列表")
-    @PreAuthorize("@ss.hasPermi('system:post:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysPost post)
-    {
-        startPage();
-        List<SysPost> list = postService.selectPostList(post);
-        return getDataTable(list);
-    }
-
-    @ApiOperation("导出岗位列表")
-    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:post:export')")
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, SysPost post)
-    {
-        List<SysPost> list = postService.selectPostList(post);
-        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
-        util.exportExcel(response, list, "岗位数据");
-    }
-
-    /**
-     * 根据岗位编号获取详细信息
-     */
-    @ApiOperation("根据岗位编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:post:query')")
-    @GetMapping(value = "/{postId}")
-    public AjaxResult getInfo(@PathVariable Long postId)
-    {
-        return success(postService.selectPostById(postId));
-    }
-
-    /**
-     * 新增岗位
-     */
-    @ApiOperation("新增岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:add')")
-    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysPost post)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
-        {
-            return error(StringUtils.format(MessageUtils.message("post.add.failed.name.exists"), post.getPostName()));
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
-            return error(StringUtils.format(MessageUtils.message("post.add.failed.code.exists"), post.getPostName()));
-        }
-        post.setCreateBy(getUsername());
-        return toAjax(postService.insertPost(post));
-    }
-
-    /**
-     * 修改岗位
-     */
-    @ApiOperation("修改岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:edit')")
-    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysPost post)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
-        {
-            return error(StringUtils.format(MessageUtils.message("post.update.failed.name.exists"), post.getPostName()));
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
-            return error(StringUtils.format(MessageUtils.message("post.update.failed.code.exists"), post.getPostName()));
-        }
-        post.setUpdateBy(getUsername());
-        return toAjax(postService.updatePost(post));
-    }
-
-    /**
-     * 删除岗位
-     */
-    @ApiOperation("删除岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:remove')")
-    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{postIds}")
-    public AjaxResult remove(@PathVariable Long[] postIds)
-    {
-        return toAjax(postService.deletePostByIds(postIds));
-    }
-
-    /**
-     * 获取岗位选择框列表
-     */
-    @ApiOperation("获取岗位选择框列表")
-    @GetMapping("/optionselect")
-    public AjaxResult optionselect()
-    {
-        List<SysPost> posts = postService.selectPostAll();
-        return success(posts);
-    }
-}
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysProfileController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysProfileController.java
index a336592..ddee82a 100644
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysProfileController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysProfileController.java
@@ -52,7 +52,7 @@ public class SysProfileController extends BaseController
         SysUser user = loginUser.getUser();
         AjaxResult ajax = AjaxResult.success(user);
         ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
-        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+//        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
 //        List<UserSocialProfile> socialProfileList = iUserSocialProfileService.selectUserSocialProfile(loginUser.getUserId());
 //        UserSocialProfile userSocialProfile = socialProfileList.stream().filter(s -> SocialPlatformType.listWechatPlatform.contains(s.getSourceClient()) && "1".equals(s.getStatus())).findFirst().orElse(null);
 //        ajax.put("socialGroup", socialProfileList);
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysRoleController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysRoleController.java
index bfd1c80..7e17daa 100644
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysRoleController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysRoleController.java
@@ -1,8 +1,5 @@
 package com.maibu.web.controller.system;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.github.pagehelper.PageInfo;
 import com.maibu.annotation.Log;
 import com.maibu.constant.HttpStatus;
@@ -29,14 +26,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 角色信息
@@ -46,8 +39,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "角色管理")
 @RestController
 @RequestMapping("/system/role")
-public class SysRoleController extends BaseController
-{
+public class SysRoleController extends BaseController {
     @Autowired
     private ISysRoleService roleService;
 
@@ -64,10 +56,9 @@ public class SysRoleController extends BaseController
     private ISysDeptService deptService;
 
     @ApiOperation("获取角色分页列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+//    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysRole role, Integer pageNum, Integer pageSize)
-    {
+    public TableDataInfo list(SysRole role, Integer pageNum, Integer pageSize) {
 //        startPage();
         List<SysRole> list = roleService.selectRoleList(role);
         TableDataInfo tableDataInfo = new TableDataInfo();
@@ -86,10 +77,9 @@ public class SysRoleController extends BaseController
 
     @ApiOperation("导出角色列表")
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
+//    @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysRole role)
-    {
+    public void export(HttpServletResponse response, SysRole role) {
         List<SysRole> list = roleService.selectRoleList(role);
         ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
         util.exportExcel(response, list, "角色数据");
@@ -99,11 +89,10 @@ public class SysRoleController extends BaseController
      * 根据角色编号获取详细信息
      */
     @ApiOperation("根据角色编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+//    @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
-    {
-        roleService.checkRoleDataScope(roleId);
+    public AjaxResult getInfo(@PathVariable Long roleId) {
+//        roleService.checkRoleDataScope(roleId);
         return success(roleService.selectRoleById(roleId));
     }
 
@@ -111,20 +100,14 @@ public class SysRoleController extends BaseController
      * 新增角色
      */
     @ApiOperation("新增角色")
-    @PreAuthorize("@ss.hasPermi('system:role:add')")
+//    @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
-    {
-//        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-//        {
-//            return error(StringUtils.format(MessageUtils.message("role.add.failed.name.exists"), role.getRoleName()));
+    public AjaxResult add(@Validated @RequestBody SysRole role) {
+//        if ("manager".equals(role.getRoleKey())) {
+//            return error(MessageUtils.message("role.add.manager.failed"));
 //        }
-//        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-//        {
-//            return error(StringUtils.format(MessageUtils.message("role.add.failed.key.exists"), role.getRoleName()));
-//        }
-        if ("manager".equals(role.getRoleKey())) {
+        if ("admin".equals(role.getRoleKey())) {
             return error(MessageUtils.message("role.add.manager.failed"));
         }
         role.setCreateBy(getUsername());
@@ -136,29 +119,18 @@ public class SysRoleController extends BaseController
      * 修改保存角色
      */
     @ApiOperation("修改角色")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
-//        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-//        {
-//            return error(StringUtils.format(MessageUtils.message("role.update.failed.name.exists"), role.getRoleName()));
-//        }
-//        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-//        {
-//            return error(StringUtils.format(MessageUtils.message("role.update.failed.key.exists"), role.getRoleName()));
-//        }
         role.setUpdateBy(getUsername());
 
-        if (roleService.updateRole(role) > 0)
-        {
+        if (roleService.updateRole(role) > 0) {
             // 更新缓存用户权限
             LoginUser loginUser = getLoginUser();
-            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
-            {
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
                 loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                 tokenService.setLoginUser(loginUser);
@@ -172,11 +144,10 @@ public class SysRoleController extends BaseController
      * 修改保存数据权限
      */
     @ApiOperation("修改保存数据权限")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role)
-    {
+    public AjaxResult dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         return toAjax(roleService.authDataScope(role));
@@ -186,11 +157,10 @@ public class SysRoleController extends BaseController
      * 状态修改
      */
     @ApiOperation("修改角色状态")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
-    {
+    public AjaxResult changeStatus(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         role.setUpdateBy(getUsername());
@@ -201,11 +171,10 @@ public class SysRoleController extends BaseController
      * 删除角色
      */
     @ApiOperation("删除角色")
-    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] roleIds) {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
 
@@ -213,10 +182,8 @@ public class SysRoleController extends BaseController
      * 获取角色选择框列表
      */
     @ApiOperation("获取角色选择框列表")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
-    @GetMapping("/optionselect")
-    public AjaxResult optionselect()
-    {
+    @GetMapping("/selectRoleAll")
+    public AjaxResult selectRoleAll() {
         return success(roleService.selectRoleAll());
     }
 
@@ -224,10 +191,9 @@ public class SysRoleController extends BaseController
      * 查询已分配用户角色列表
      */
     @ApiOperation("查询已分配用户角色列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+//    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/allocatedList")
-    public TableDataInfo allocatedList(SysUser user)
-    {
+    public TableDataInfo allocatedList(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectAllocatedList(user);
         return getDataTable(list);
@@ -237,10 +203,9 @@ public class SysRoleController extends BaseController
      * 查询未分配用户角色列表
      */
     @ApiOperation("查询未分配用户角色列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+//    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
-    public TableDataInfo unallocatedList(SysUser user)
-    {
+    public TableDataInfo unallocatedList(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUnallocatedList(user);
         return getDataTable(list);
@@ -250,11 +215,10 @@ public class SysRoleController extends BaseController
      * 取消授权用户
      */
     @ApiOperation("取消授权用户")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
-    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
-    {
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
@@ -262,11 +226,10 @@ public class SysRoleController extends BaseController
      * 批量取消授权用户
      */
     @ApiOperation("批量取消授权用户")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
-    {
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
 
@@ -274,11 +237,10 @@ public class SysRoleController extends BaseController
      * 批量选择用户授权
      */
     @ApiOperation("批量选择用户授权")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
-    {
+    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
@@ -287,10 +249,9 @@ public class SysRoleController extends BaseController
      * 获取对应角色部门树列表
      */
     @ApiOperation("获取对应角色部门树列表")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+//    @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/deptTree/{roleId}")
-    public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
-    {
+    public AjaxResult deptTree(@PathVariable("roleId") Long roleId) {
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
         ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysSiteController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysSiteController.java
index aab80bf..a281690 100644
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysSiteController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysSiteController.java
@@ -1,39 +1,15 @@
 package com.maibu.web.controller.system;
 
-import com.maibu.annotation.Log;
-import com.maibu.constant.Constants;
 import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
-import com.maibu.core.domain.entity.SysMenu;
-import com.maibu.core.domain.entity.SysOrg;
 import com.maibu.core.domain.entity.SysSite;
-import com.maibu.core.domain.entity.SysUser;
-import com.maibu.core.domain.model.LoginBody;
 import com.maibu.core.page.TableDataInfo;
-import com.maibu.domain.AppPreferences;
-import com.maibu.dto.NettyDevice;
-import com.maibu.enums.BusinessType;
-import com.maibu.enums.ConnectorStatus;
-import com.maibu.enums.SourceType;
-import com.maibu.manager.DeviceSessionManager;
-import com.maibu.service.*;
-import com.maibu.utils.SecurityUtils;
-import com.maibu.web.domain.dto.LoginResultDto;
-import com.maibu.web.service.SysLoginService;
-import com.maibu.web.service.SysPermissionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
+import com.maibu.service.SysSiteService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Set;
-
-import static com.maibu.constant.Constants.LANGUAGE;
 
 
 /**
@@ -42,6 +18,7 @@ import static com.maibu.constant.Constants.LANGUAGE;
  * @author ruoyi
  */
 @RestController
+@RequestMapping("/system/site")
 public class SysSiteController extends BaseController {
     @Autowired
     private SysSiteService sysSiteService;
@@ -77,17 +54,21 @@ public class SysSiteController extends BaseController {
      * 删除组织
      */
 
-    @GetMapping("/delete")
-    public AjaxResult delete(@RequestParam Long id) {
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody List<Long> ids) {
         try {
-            return AjaxResult.success(sysSiteService.delete(id));
+            if (CollectionUtils.isEmpty(ids)) {
+//                return error(StringUtils.format(MessageUtils.message("menu.add.failed.name.exists"), menu.getMenuName()));
+                return error("删除id为空");
+            }
+            return AjaxResult.success(sysSiteService.delete(ids));
         } catch (Exception e) {
             return AjaxResult.error("保存组织出错", e.getMessage());
         }
     }
 
     /**
-     * 查询组织详情
+     * 查询场站详情
      */
 
     @GetMapping("/selectById")
@@ -98,4 +79,17 @@ public class SysSiteController extends BaseController {
             return AjaxResult.error("保存组织出错", e.getMessage());
         }
     }
+
+    /**
+     * 查询组织下所有的区域场站
+     */
+
+    @GetMapping("/selectByOrgId")
+    public AjaxResult selectByOrgId(@RequestParam Long id) {
+        try {
+            return AjaxResult.success(sysSiteService.selectByOrgId(id));
+        } catch (Exception e) {
+            return AjaxResult.error("保存组织出错", e.getMessage());
+        }
+    }
 }
diff --git a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysUserController.java b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysUserController.java
index 8ebec4c..42c837b 100644
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysUserController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysUserController.java
@@ -14,7 +14,6 @@ import com.maibu.core.domain.entity.SysUser;
 import com.maibu.core.page.TableDataInfo;
 import com.maibu.enums.BusinessType;
 import com.maibu.service.ISysDeptService;
-import com.maibu.service.ISysPostService;
 import com.maibu.service.ISysRoleService;
 import com.maibu.service.ISysUserService;
 import com.maibu.utils.MessageUtils;
@@ -27,14 +26,7 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -56,28 +48,25 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
-    @Autowired
-    private ISysPostService postService;
-
     /**
      * 获取用户列表
      */
     @ApiOperation("获取用户分页列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+//    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)
     {
         startPage();
-        if (null == user.getDeptId()) {
-            user.setDeptId(getLoginUser().getDeptId());
-        }
+//        if (null == user.getDeptId()) {
+//            user.setDeptId(getLoginUser().getDeptId());
+//        }
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
 
     @ApiOperation("导出用户列表")
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
+//    @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user)
     {
@@ -91,7 +80,7 @@ public class SysUserController extends BaseController
 
     @ApiOperation("批量导入用户")
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:import')")
+//    @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
     {
@@ -115,7 +104,7 @@ public class SysUserController extends BaseController
      * 根据用户编号获取详细信息
      */
     @ApiOperation("根据用户编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+//    @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
@@ -123,12 +112,12 @@ public class SysUserController extends BaseController
         AjaxResult ajax = AjaxResult.success();
 //        List<SysRole> roles = roleService.selectRoleAll();
 //        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        ajax.put("posts", postService.selectPostAll());
+//        ajax.put("posts", postService.selectPostAll());
         if (StringUtils.isNotNull(userId))
         {
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
-            ajax.put("postIds", postService.selectPostListByUserId(userId));
+//            ajax.put("postIds", postService.selectPostListByUserId(userId));
             SysRole sysRole = new SysRole();
             sysRole.setDeptId(sysUser.getDeptId());
             sysRole.setShowChild(false);
@@ -143,7 +132,7 @@ public class SysUserController extends BaseController
      * 新增用户
      */
     @ApiOperation("新增用户")
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
+//    @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user)
@@ -173,7 +162,7 @@ public class SysUserController extends BaseController
      * 修改用户
      */
     @ApiOperation("修改用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user)
@@ -195,6 +184,8 @@ public class SysUserController extends BaseController
             return error(StringUtils.format(MessageUtils.message("user.update.failed.email.exists"), user.getUserName()));
         }
         user.setUpdateBy(getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setDisplayPassword(user.getPassword());
         return toAjax(userService.updateUser(user));
     }
 
@@ -202,7 +193,7 @@ public class SysUserController extends BaseController
      * 删除用户
      */
     @ApiOperation("删除用户")
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds)
@@ -218,7 +209,7 @@ public class SysUserController extends BaseController
      * 重置密码
      */
     @ApiOperation("重置用户密码")
-    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+//    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user)
@@ -235,7 +226,7 @@ public class SysUserController extends BaseController
      * 状态修改
      */
     @ApiOperation("修改用户状态")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user)
@@ -250,7 +241,7 @@ public class SysUserController extends BaseController
      * 根据用户编号获取授权角色
      */
     @ApiOperation("根据用户编号获取授权角色")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+//    @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
     public AjaxResult authRole(@PathVariable("userId") Long userId)
     {
@@ -266,7 +257,7 @@ public class SysUserController extends BaseController
      * 用户授权角色
      */
     @ApiOperation("为用户授权角色")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
@@ -280,7 +271,7 @@ public class SysUserController extends BaseController
      * 获取部门树列表
      */
     @ApiOperation("获取部门树列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+//    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {
@@ -293,7 +284,7 @@ public class SysUserController extends BaseController
      * @return com.fastbee.common.core.page.TableDataInfo
      */
     @ApiOperation("获取用户分页列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+//    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/listTerminal")
     public TableDataInfo listTerminal(SysUser user)
     {
@@ -307,7 +298,7 @@ public class SysUserController extends BaseController
      * 根据机构id获取当前用户列表
      */
     @ApiOperation("根据机构id获取当前用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+//    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/getByDeptId")
     public TableDataInfo getByDeptId()
     {
@@ -316,4 +307,14 @@ public class SysUserController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 根据机构id获取当前用户列表
+     */
+    @GetMapping("/getByRoleId")
+    public TableDataInfo getByRoleId(@RequestParam Long id)
+    {
+        startPage();
+        List<SysUser> list = userService.selectByRoleId(id);
+        return getDataTable(list);
+    }
 }
diff --git a/maibu-admin/src/main/resources/application-dev.yml b/maibu-admin/src/main/resources/application-dev.yml
index e32b5ec..3c728ac 100644
--- a/maibu-admin/src/main/resources/application-dev.yml
+++ b/maibu-admin/src/main/resources/application-dev.yml
@@ -73,4 +73,11 @@ ioTDA:
   ak: HPUAQHOL0WPXJ1BX3SDV
   sk: 06B2ex4JkeGjE7PfWLsYt7PdXN2xvBxEjotPbkaQ
   projectId: df32e2f94c15428a9763f01f4f0d337c
-  productId: 698551ef7f2e6c302f519144
\ No newline at end of file
+  productId: 698551ef7f2e6c302f519144
+
+influxdb:
+  username: admin
+  password: admin123
+  bucket: device_data
+  org: maibu
+  token: maibu-token
diff --git a/maibu-admin/src/main/resources/application.yml b/maibu-admin/src/main/resources/application.yml
index 5eecf43..bd2ce66 100644
--- a/maibu-admin/src/main/resources/application.yml
+++ b/maibu-admin/src/main/resources/application.yml
@@ -11,7 +11,7 @@ maibu:
 
 # 开发环境配置
 server:
-  port: 8082                # 服务器的HTTP端口，默认为8080
+  port: 8081                # 服务器的HTTP端口，默认为8080
   servlet:
     context-path: /         # 应用的访问路径
   tomcat:
@@ -117,6 +117,8 @@ mybatis-plus:
       id-type: AUTO # 自增 ID
       logic-delete-value: 1 # 逻辑已删除值(默认为 1)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    map-underscore-to-camel-case: true
 
 # PageHelper分页插件
 pagehelper:
diff --git a/maibu-common/pom.xml b/maibu-common/pom.xml
index 4cdc24d..1a2f6d2 100644
--- a/maibu-common/pom.xml
+++ b/maibu-common/pom.xml
@@ -208,6 +208,12 @@
             <version>8.5.7</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.influxdb</groupId>
+            <artifactId>influxdb-client-java</artifactId>
+            <version>6.10.0</version>
+        </dependency>
+
     </dependencies>
 
     <properties>
diff --git a/maibu-netty-server/src/main/java/com/maibu/entity/ErrorIdentificationStandard.java b/maibu-common/src/main/java/com/maibu/core/business/ErrorIdentificationStandard.java
similarity index 75%
rename from maibu-netty-server/src/main/java/com/maibu/entity/ErrorIdentificationStandard.java
rename to maibu-common/src/main/java/com/maibu/core/business/ErrorIdentificationStandard.java
index 2160f9d..0bc5a5a 100644
--- a/maibu-netty-server/src/main/java/com/maibu/entity/ErrorIdentificationStandard.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/ErrorIdentificationStandard.java
@@ -1,13 +1,9 @@
-package com.maibu.entity;
+package com.maibu.core.business;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.maibu.enums.CompareEnum;
-import lombok.Data;
-import org.springframework.data.annotation.Id;
-
-import java.util.List;
+import com.maibu.core.enums.CompareEnum;import lombok.Data;
 
 
 @Data
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonDevice.java b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDevice.java
similarity index 87%
rename from maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonDevice.java
rename to maibu-common/src/main/java/com/maibu/core/business/IoTCommonDevice.java
index 0353c6c..d17ed59 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonDevice.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDevice.java
@@ -1,4 +1,4 @@
-package com.maibu.domain;
+package com.maibu.core.business;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.maibu.core.domain.BaseDO;
-import com.maibu.enums.ConnectType;
+import com.maibu.core.enums.ConnectType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Id;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,7 +30,6 @@ public class IoTCommonDevice extends BaseDO {
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    private String siteId; //场地id
     /**
      * 设备ID
      */
@@ -41,18 +40,6 @@ public class IoTCommonDevice extends BaseDO {
      */
     private String deviceName;
 
-    /**
-     * 产品ID
-     */
-    private Long productId;
-
-    private String productName;
-
-    /**
-     * 设备编号
-     */
-    private String serialNumber;
-
     /**
      * 固件版本
      */
@@ -124,4 +111,23 @@ public class IoTCommonDevice extends BaseDO {
 
     @TableField(exist = false)
     private Boolean hasRegister;
+
+    private Long orgId; //组织id
+
+    private Long siteId; //场站id
+
+    private Long modelId; //属于某个设备模型
+
+
+    /**
+     * 产品ID
+     */
+    private Long productId;
+
+    private String productName;
+
+    @TableField(exist = false)
+    private List<DeviceModelProperty> propertyList;
+
+
 }
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonDeviceAction.java b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDeviceAction.java
similarity index 89%
rename from maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonDeviceAction.java
rename to maibu-common/src/main/java/com/maibu/core/business/IoTCommonDeviceAction.java
index 3e2a79b..eb2a1a9 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonDeviceAction.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDeviceAction.java
@@ -1,4 +1,4 @@
-package com.maibu.domain;
+package com.maibu.core.business;
 
 import lombok.Data;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonProduct.java b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonProduct.java
similarity index 96%
rename from maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonProduct.java
rename to maibu-common/src/main/java/com/maibu/core/business/IoTCommonProduct.java
index 5e08d0d..31edf10 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonProduct.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonProduct.java
@@ -1,4 +1,4 @@
-package com.maibu.domain;
+package com.maibu.core.business;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonThingsModel.java b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonThingsModel.java
similarity index 92%
rename from maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonThingsModel.java
rename to maibu-common/src/main/java/com/maibu/core/business/IoTCommonThingsModel.java
index b340f43..450024c 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/IoTCommonThingsModel.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonThingsModel.java
@@ -1,4 +1,4 @@
-package com.maibu.domain;
+package com.maibu.core.business;
 
 
 import lombok.AllArgsConstructor;
diff --git a/maibu-netty-server/src/main/java/com/maibu/dto/Connector.java b/maibu-common/src/main/java/com/maibu/core/business/device/Connector.java
similarity index 95%
rename from maibu-netty-server/src/main/java/com/maibu/dto/Connector.java
rename to maibu-common/src/main/java/com/maibu/core/business/device/Connector.java
index f430235..f0c04c9 100644
--- a/maibu-netty-server/src/main/java/com/maibu/dto/Connector.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/device/Connector.java
@@ -1,6 +1,6 @@
-package com.maibu.dto;
+package com.maibu.core.business.device;
 
-import com.maibu.enums.ConnectorStatus;
+import com.maibu.core.enums.ConnectorStatus;
 import io.netty.channel.Channel;
 import lombok.Data;
 
diff --git a/maibu-netty-server/src/main/java/com/maibu/dto/NettyDevice.java b/maibu-common/src/main/java/com/maibu/core/business/device/NettyDevice.java
similarity index 83%
rename from maibu-netty-server/src/main/java/com/maibu/dto/NettyDevice.java
rename to maibu-common/src/main/java/com/maibu/core/business/device/NettyDevice.java
index 502ac20..1c70bc5 100644
--- a/maibu-netty-server/src/main/java/com/maibu/dto/NettyDevice.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/device/NettyDevice.java
@@ -1,11 +1,11 @@
-package com.maibu.dto;
+package com.maibu.core.business.device;
 
 
-import com.maibu.domain.DeviceRunStatistics;
-import com.maibu.entity.path.LatAndLngEntity;
-import com.maibu.enums.ConnectorType;
+import com.maibu.core.business.DeviceRunStatistics;
+import com.maibu.core.enums.ConnectorType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import com.maibu.core.business.path.LatAndLngEntity;
 
 import java.util.LinkedList;
 import java.util.Queue;
diff --git a/maibu-netty-server/src/main/java/com/maibu/entity/path/LatAndLngEntity.java b/maibu-common/src/main/java/com/maibu/core/business/path/LatAndLngEntity.java
similarity index 84%
rename from maibu-netty-server/src/main/java/com/maibu/entity/path/LatAndLngEntity.java
rename to maibu-common/src/main/java/com/maibu/core/business/path/LatAndLngEntity.java
index 933e74d..54e458b 100644
--- a/maibu-netty-server/src/main/java/com/maibu/entity/path/LatAndLngEntity.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/path/LatAndLngEntity.java
@@ -1,4 +1,4 @@
-package com.maibu.entity.path;
+package com.maibu.core.business.path;
 
 import lombok.Data;
 
diff --git a/maibu-netty-server/src/main/java/com/maibu/entity/path/MowingPathGenerator.java b/maibu-common/src/main/java/com/maibu/core/business/path/MowingPathGenerator.java
similarity index 99%
rename from maibu-netty-server/src/main/java/com/maibu/entity/path/MowingPathGenerator.java
rename to maibu-common/src/main/java/com/maibu/core/business/path/MowingPathGenerator.java
index 1b8186d..8eea0a4 100644
--- a/maibu-netty-server/src/main/java/com/maibu/entity/path/MowingPathGenerator.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/path/MowingPathGenerator.java
@@ -1,4 +1,4 @@
-package com.maibu.entity.path;
+package com.maibu.core.business.path;
 
 
 
diff --git a/maibu-netty-server/src/main/java/com/maibu/entity/path/RPPathData.java b/maibu-common/src/main/java/com/maibu/core/business/path/RPPathData.java
similarity index 79%
rename from maibu-netty-server/src/main/java/com/maibu/entity/path/RPPathData.java
rename to maibu-common/src/main/java/com/maibu/core/business/path/RPPathData.java
index ed136e0..3eb4ad4 100644
--- a/maibu-netty-server/src/main/java/com/maibu/entity/path/RPPathData.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/path/RPPathData.java
@@ -1,7 +1,7 @@
-package com.maibu.entity.path;
+package com.maibu.core.business.path;
 
 import java.util.List;
-import com.maibu.entity.path.MowingPathGenerator.*;
+import com.maibu.core.business.path.MowingPathGenerator.*;
 
 public class RPPathData {
     public ScanLine scanLine;
diff --git a/maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanRecEntity.java b/maibu-common/src/main/java/com/maibu/core/business/path/RoutePlanRecEntity.java
similarity index 95%
rename from maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanRecEntity.java
rename to maibu-common/src/main/java/com/maibu/core/business/path/RoutePlanRecEntity.java
index 0c8439c..88db088 100644
--- a/maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanRecEntity.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/path/RoutePlanRecEntity.java
@@ -1,4 +1,4 @@
-package com.maibu.entity.path;
+package com.maibu.core.business.path;
 
 import lombok.Data;
 
diff --git a/maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanSendEntity.java b/maibu-common/src/main/java/com/maibu/core/business/path/RoutePlanSendEntity.java
similarity index 98%
rename from maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanSendEntity.java
rename to maibu-common/src/main/java/com/maibu/core/business/path/RoutePlanSendEntity.java
index 10f158e..80c8351 100644
--- a/maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanSendEntity.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/path/RoutePlanSendEntity.java
@@ -1,4 +1,4 @@
-package com.maibu.entity.path;
+package com.maibu.core.business.path;
 
 import lombok.Data;
 
diff --git a/maibu-common/src/main/java/com/maibu/core/domain/BaseDO.java b/maibu-common/src/main/java/com/maibu/core/domain/BaseDO.java
index 39066f7..7d1ea20 100644
--- a/maibu-common/src/main/java/com/maibu/core/domain/BaseDO.java
+++ b/maibu-common/src/main/java/com/maibu/core/domain/BaseDO.java
@@ -1,12 +1,16 @@
 package com.maibu.core.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 基类，时间类型改为LocalDateTime
@@ -40,4 +44,15 @@ public class BaseDO implements Serializable {
     @TableLogic
     private Boolean delFlag;
 
+    /** 请求参数 */
+    @TableField(exist = false)
+    @ApiModelProperty("请求参数")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, Object> params = new HashMap<>();
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    @TableField(exist = false)
+    private String remark;
+
 }
diff --git a/maibu-common/src/main/java/com/maibu/core/domain/entity/SysMenu.java b/maibu-common/src/main/java/com/maibu/core/domain/entity/SysMenu.java
index 14ebb0b..7e7596e 100644
--- a/maibu-common/src/main/java/com/maibu/core/domain/entity/SysMenu.java
+++ b/maibu-common/src/main/java/com/maibu/core/domain/entity/SysMenu.java
@@ -4,17 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.maibu.core.domain.BaseDO;
-import com.maibu.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,7 +19,7 @@ import java.util.List;
  */
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "SysMenu", description = "菜单权限表 sys_menu")
-@TableName(value = "sys_site")
+@TableName(value = "sys_menu")
 @Data
 public class SysMenu extends BaseDO {
     private static final long serialVersionUID = 1L;
diff --git a/maibu-common/src/main/java/com/maibu/core/domain/entity/SysOrg.java b/maibu-common/src/main/java/com/maibu/core/domain/entity/SysOrg.java
index 0f6bc24..47be553 100644
--- a/maibu-common/src/main/java/com/maibu/core/domain/entity/SysOrg.java
+++ b/maibu-common/src/main/java/com/maibu/core/domain/entity/SysOrg.java
@@ -1,6 +1,7 @@
 package com.maibu.core.domain.entity;
 
 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.maibu.core.domain.BaseDO;
@@ -48,4 +49,7 @@ public class SysOrg extends BaseDO {
      */
     private String manager;
 
+    @TableField(exist = false)
+    private Long userId;
+
 }
diff --git a/maibu-common/src/main/java/com/maibu/core/domain/entity/SysRole.java b/maibu-common/src/main/java/com/maibu/core/domain/entity/SysRole.java
index 23ad692..a8c1262 100644
--- a/maibu-common/src/main/java/com/maibu/core/domain/entity/SysRole.java
+++ b/maibu-common/src/main/java/com/maibu/core/domain/entity/SysRole.java
@@ -1,6 +1,7 @@
 package com.maibu.core.domain.entity;
 
 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.maibu.annotation.Excel;
@@ -9,7 +10,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Transient;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -63,15 +66,13 @@ public class SysRole extends BaseDO {
     @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
-    @ApiModelProperty("删除标志")
-    private String delFlag;
-
     /** 用户是否存在此角色标识 默认不存在 */
     private boolean flag = false;
 
-    /** 菜单组 */
-    @ApiModelProperty("菜单组")
+    @TableField(exist = false)
+    private String menuList;
+
+    @TableField(exist = false)
     private Long[] menuIds;
 
     /** 部门组（数据权限） */
@@ -107,6 +108,11 @@ public class SysRole extends BaseDO {
      */
     private Boolean manager;
 
+    /**
+     * 是否有场站设置的权限
+     */
+    private Boolean siteAccess = false;
+
 
     public SysRole() {
 
diff --git a/maibu-common/src/main/java/com/maibu/core/domain/entity/SysUser.java b/maibu-common/src/main/java/com/maibu/core/domain/entity/SysUser.java
index e4e5098..3b4d79e 100644
--- a/maibu-common/src/main/java/com/maibu/core/domain/entity/SysUser.java
+++ b/maibu-common/src/main/java/com/maibu/core/domain/entity/SysUser.java
@@ -2,9 +2,9 @@ package com.maibu.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.maibu.annotation.Excel;
-import com.maibu.annotation.Excels;
-import com.maibu.core.domain.BaseEntity;
+import com.maibu.core.domain.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,9 +21,10 @@ import java.util.List;
  */
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "SysUser", description = "用户对象 sys_user")
+@TableName(value = "sys_user")
 @Data
 @NoArgsConstructor
-public class SysUser extends BaseEntity {
+public class SysUser extends BaseDO {
     private static final long serialVersionUID = 1L;
     /**
      * 用户ID
@@ -40,6 +41,11 @@ public class SysUser extends BaseEntity {
     @Excel(name = "部门编号", type = Excel.Type.IMPORT)
     private Long deptId;
 
+
+    private Long orgId;
+
+    private Long siteId;
+
     /**
      * 用户账号
      */
@@ -97,12 +103,6 @@ public class SysUser extends BaseEntity {
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    @ApiModelProperty("删除标志")
-    private String delFlag;
-
     /**
      * 最后登录IP
      */
@@ -117,66 +117,11 @@ public class SysUser extends BaseEntity {
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT)
     private Date loginDate;
 
-    /**
-     * 部门对象
-     */
-    @ApiModelProperty("部门对象")
-    @Excels({
-            @Excel(name = "部门名称", targetAttr = "deptName", type = Excel.Type.EXPORT),
-            @Excel(name = "部门负责人", targetAttr = "leader", type = Excel.Type.EXPORT)
-    })
-    private SysDept dept;
-
-    /**
-     * 角色对象
-     */
-    @ApiModelProperty("角色对象")
-    private List<SysRole> roles;
-
-    /**
-     * 角色组
-     */
-    @ApiModelProperty("角色组")
-    private Long[] roleIds;
-
-    /**
-     * 岗位组
-     */
-    @ApiModelProperty("岗位组")
-    private Long[] postIds;
-
-    /**
-     * 角色ID
-     */
-    @ApiModelProperty("角色ID")
-    private Long roleId;
-
-    /**
-     * 用，拼接的角色名称
-     */
-    @ApiModelProperty("用，拼接的角色名称")
-    private String roleNames;
-
-    /**
-     * 用，拼接的角色名称
-     */
-    @ApiModelProperty("sessionId")
-    private String sessionId;
-
     /**
      * 微信openid
      */
     private String openId;
 
-    /**
-     * 是否显示下级机构数据
-     */
-    private Boolean showChild;
-
-    /**
-     * 是否是机构管理员
-     */
-    private Boolean manager;
     /**
      * 语言
      */
@@ -186,6 +131,40 @@ public class SysUser extends BaseEntity {
      */
     private String timeZone;
 
+    /**
+     * 角色对象
+     */
+    @ApiModelProperty("角色对象")
+    private List<SysRole> roles;
+
+    /**
+     * 用，拼接的角色名称
+     */
+    @ApiModelProperty("用，拼接的角色名称")
+    private String roleNames;
+
+    /**
+     * 角色组
+     */
+    @ApiModelProperty("角色组")
+    private Long[] roleIds;
+//
+//    /**
+//     * 岗位组
+//     */
+//    @ApiModelProperty("岗位组")
+//    private Long[] postIds;
+
+    /**
+     * 角色ID
+     */
+    @ApiModelProperty("角色ID")
+    private Long roleId;
+
+
+    @ApiModelProperty("sessionId")
+    private String sessionId;
+
     /**
      * ai助手问答使用条数
      */
diff --git a/maibu-common/src/main/java/com/maibu/core/domain/model/LoginUser.java b/maibu-common/src/main/java/com/maibu/core/domain/model/LoginUser.java
index d7257cf..880dcc7 100644
--- a/maibu-common/src/main/java/com/maibu/core/domain/model/LoginUser.java
+++ b/maibu-common/src/main/java/com/maibu/core/domain/model/LoginUser.java
@@ -2,6 +2,7 @@ package com.maibu.core.domain.model;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.maibu.core.domain.entity.SysUser;
+import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -13,6 +14,7 @@ import java.util.Set;
  *
  * @author ruoyi
  */
+@Data
 public class LoginUser implements UserDetails {
     private static final long serialVersionUID = 1L;
 
@@ -26,6 +28,21 @@ public class LoginUser implements UserDetails {
      */
     private Long deptId;
 
+    /**
+     * 组织id
+     */
+    private Long orgId;
+
+    /**
+     * 区域id
+     */
+    private Long siteId;
+
+    /**
+     * 组织id
+     */
+    private Long roleId;
+
     /**
      * 用户唯一标识
      */
@@ -82,61 +99,6 @@ public class LoginUser implements UserDetails {
      */
     private Integer sourceType;
 
-    public Integer getSourceType() {
-        return sourceType;
-    }
-
-    public void setSourceType(Integer s) {
-        this.sourceType = s;
-    }
-
-    public Boolean getNeverExpire() {
-        return neverExpire;
-    }
-
-    public void setNeverExpire(Boolean neverExpire) {
-        this.neverExpire = neverExpire;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public Long getDeptUserId() {
-        return deptUserId;
-    }
-
-    public void setDeptUserId(Long deptUserId) {
-        this.deptUserId = deptUserId;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
 
     public LoginUser() {
     }
@@ -146,9 +108,11 @@ public class LoginUser implements UserDetails {
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, Long deptId, String language, SysUser user, Set<String> permissions) {
+    public LoginUser(Long userId, Long deptId, Long orgId, Long siteId, String language, SysUser user, Set<String> permissions) {
         this.userId = userId;
         this.deptId = deptId;
+        this.orgId = orgId;
+        this.siteId = siteId;
         this.user = user;
         this.language = language;
         this.permissions = permissions;
@@ -207,70 +171,6 @@ public class LoginUser implements UserDetails {
         return true;
     }
 
-    public Long getLoginTime() {
-        return loginTime;
-    }
-
-    public void setLoginTime(Long loginTime) {
-        this.loginTime = loginTime;
-    }
-
-    public String getIpaddr() {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr) {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation() {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation) {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser() {
-        return browser;
-    }
-
-    public void setBrowser(String browser) {
-        this.browser = browser;
-    }
-
-    public String getOs() {
-        return os;
-    }
-
-    public void setOs(String os) {
-        this.os = os;
-    }
-
-    public Long getExpireTime() {
-        return expireTime;
-    }
-
-    public void setExpireTime(Long expireTime) {
-        this.expireTime = expireTime;
-    }
-
-    public Set<String> getPermissions() {
-        return permissions;
-    }
-
-    public void setPermissions(Set<String> permissions) {
-        this.permissions = permissions;
-    }
-
-    public SysUser getUser() {
-        return user;
-    }
-
-    public void setUser(SysUser user) {
-        this.user = user;
-    }
-
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return null;
diff --git a/maibu-common/src/main/java/com/maibu/enums/CommonStatusEnum.java b/maibu-common/src/main/java/com/maibu/enums/CommonStatusEnum.java
deleted file mode 100644
index 37ace7a..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/CommonStatusEnum.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.maibu.enums;
-
-import com.maibu.core.text.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * 通用状态枚举
-
- */
-@Getter
-@AllArgsConstructor
-public enum CommonStatusEnum implements IntArrayValuable {
-
-    ENABLE(0, "开启"),
-    DISABLE(1, "关闭");
-
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CommonStatusEnum::getStatus).toArray();
-
-    /**
-     * 状态值
-     */
-    private final Integer status;
-    /**
-     * 状态名
-     */
-    private final String name;
-
-    @Override
-    public int[] array() {
-        return ARRAYS;
-    }
-
-}
diff --git a/maibu-common/src/main/java/com/maibu/enums/DataEnum.java b/maibu-common/src/main/java/com/maibu/enums/DataEnum.java
deleted file mode 100644
index 7825388..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/DataEnum.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author gsb
- * @date 2023/6/3 14:09
- */
-@Getter
-@AllArgsConstructor
-public enum DataEnum {
-
-    DECIMAL("decimal", "十进制"),
-    DOUBLE("double", "双精度"),
-    ENUM("enum","枚举"),
-    BOOLEAN("bool","布尔类型"),
-    INTEGER("integer","整形"),
-    OBJECT("object", "对象"),
-    STRING("string","字符串"),
-    ARRAY("array","数组");
-
-    String type;
-    String msg;
-
-    public static DataEnum convert(String type){
-        for (DataEnum value : DataEnum.values()) {
-            if (Objects.equals(value.type, type)){
-                return value;
-            }
-        }
-        return DataEnum.STRING;
-    }
-
-}
diff --git a/maibu-common/src/main/java/com/maibu/enums/DeviceDistributeTypeEnum.java b/maibu-common/src/main/java/com/maibu/enums/DeviceDistributeTypeEnum.java
deleted file mode 100644
index a1ebb0f..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/DeviceDistributeTypeEnum.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.maibu.enums;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @description:
- * @author admin
- * @date 2024-07-18 14:52
- * @version 1.0
- */
-@Getter
-@AllArgsConstructor
-public enum DeviceDistributeTypeEnum {
-
-    /**
-     * 确保唯一，不能重复
-     */
-    SELECT(1, "选择分配"),
-    IMPORT(2,"导入分配");
-
-    /**
-     * 渠道类型
-     */
-    private Integer type;
-
-    /**
-     * 描述
-     */
-    private String desc;
-
-    public static String getDesc(Integer type) {
-        for (DeviceDistributeTypeEnum item : DeviceDistributeTypeEnum.values()) {
-            if (item.getType().equals(type)) {
-                return item.getDesc();
-            }
-        }
-        return "";
-    }
-}
diff --git a/maibu-common/src/main/java/com/maibu/enums/DeviceLogTypeEnum.java b/maibu-common/src/main/java/com/maibu/enums/DeviceLogTypeEnum.java
deleted file mode 100644
index 01594a3..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/DeviceLogTypeEnum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 场景管理物模型、变量类型枚举
- * 注意：以下4张表下的variable_type相关字段统一用该枚举，保持一致
- * scene_model_tag表、scene_tag_points表、scene_model_device表、scene_model_data表
- * @author fastb
- * @date 2024-05-22 10:01
- * @version 1.0
- */
-@Getter
-@AllArgsConstructor
-public enum DeviceLogTypeEnum {
-
-    ATTRIBUTE_REPORT(1, "属性上报"),
-    INVOKE_FUNCTION(2, "调用功能"),
-    EVENT_REPORT(3, "事件上报"),
-    DEVICE_UPDATE(4, "设备升级"),
-    DEVICE_ONLINE(5, "设备上线"),
-    DEVICE_OFFLINE(6, "设备离线"),
-    SCENE_VARIABLE_REPORT(7, "场景录入、运算变量上报下发");
-
-    private final Integer type;
-
-    private final String desc;
-
-}
diff --git a/maibu-common/src/main/java/com/maibu/enums/DeviceRecordTypeEnum.java b/maibu-common/src/main/java/com/maibu/enums/DeviceRecordTypeEnum.java
deleted file mode 100644
index 2c093c7..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/DeviceRecordTypeEnum.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.maibu.enums;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @description:
- * @author admin
- * @date 2024-07-18 14:52
- * @version 1.0
- */
-@Getter
-@AllArgsConstructor
-public enum DeviceRecordTypeEnum {
-
-    /**
-     * 确保唯一，不能重复
-     */
-    IMPORT(1, "导入记录"),
-    RECOVERY(2,"回收记录"),
-    ASSIGNMENT(3,"分配记录"),
-    ASSIGNMENT_DETAIL(4,"分配详细记录");
-
-
-    /**
-     * 渠道类型
-     */
-    private Integer type;
-
-    /**
-     * 描述
-     */
-    private String desc;
-}
diff --git a/maibu-common/src/main/java/com/maibu/enums/JobType.java b/maibu-common/src/main/java/com/maibu/enums/JobType.java
deleted file mode 100644
index 2e6f0f4..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/JobType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-@Getter
-@AllArgsConstructor
-public enum JobType {
-    //1==设备定时，2=设备告警，3=场景联动 4=规则引擎
-    Device(1),
-    DeviceAlert(2),
-    Scene(3),
-    RuleEngine(4);
-    private final Integer value;
-
-    public static JobType fromValue(Integer value) {
-        for (JobType type : JobType.values()) {
-            if (Objects.equals(type.getValue(), value)) {
-                return type;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(Integer value) {
-        for (JobType type : JobType.values()) {
-            if (Objects.equals(type.getValue(), value)) {
-                return type.name();
-            }
-        }
-        return null;
-    }
-}
diff --git a/maibu-common/src/main/java/com/maibu/enums/PushType.java b/maibu-common/src/main/java/com/maibu/enums/PushType.java
deleted file mode 100644
index 3c6d629..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/PushType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 推送类型
- * @author bill
- */
-@Getter
-@AllArgsConstructor
-public enum PushType {
-
-    WECHAT_SERVER_PUSH("wechat_server_push","微信小程序服务号推送");
-
-
-    /**
-     * 业务编号
-     */
-    private String serviceCode;
-
-    private String desc;
-}
diff --git a/maibu-common/src/main/java/com/maibu/enums/ResultCode.java b/maibu-common/src/main/java/com/maibu/enums/ResultCode.java
deleted file mode 100644
index d770929..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/ResultCode.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.maibu.enums;
-
-import com.maibu.constant.HttpStatus;
-import lombok.AllArgsConstructor;
-
-/**
- * API返回对象
- */
-@AllArgsConstructor
-public enum ResultCode implements IErrorCode {
-
-    SUCCESS(HttpStatus.SUCCESS,"请求成功"),
-    FAILED(HttpStatus.ERROR,"系统内部错误"),
-    ACCEPTED(HttpStatus.ACCEPTED,"请求已接收"),
-    REDIRECT(HttpStatus.SEE_OTHER,"重定向"),
-    UNAUTHORIZED(HttpStatus.UNAUTHORIZED,"暂未登录或token过期"),
-    FORBIDDEN(HttpStatus.FORBIDDEN,"没有相关权限或授权过期"),
-    NOT_FOUND(HttpStatus.NOT_FOUND,"资源未找到"),
-    PARSE_MSG_EXCEPTION(4018, "解析协议异常"),
-    TIMEOUT(502, "响应超时！"),
-    FIRMWARE_VERSION_UNIQUE_ERROR(4022, "产品下已存在该版本固件"),
-    FIRMWARE_SEQ_UNIQUE_ERROR(4023, "产品下已存在该升级序列号"),
-    FIRMWARE_TASK_UNIQUE_ERROR(4024, "任务名已存在"),
-    REPLY_TIMEOUT(4001, "超时未回执"),
-    INVALID_USER_APP(4002, "用户信息不存在"),
-    INVALID_MQTT_USER(1003, "内部mqtt服务用户异常"),
-    DECODE_PROTOCOL_EXCEPTION(1000, "解析协议异常"),
-    MQTT_TOPIC_INVALID(1001, "MQTT订阅topic格式非法");
-
-    private int code;
-    private String message;
-
-    public int getCode(){return code;}
-
-    public String getMessage(){return message;}
-
-}
diff --git a/maibu-common/src/main/java/com/maibu/enums/StatusEnum.java b/maibu-common/src/main/java/com/maibu/enums/StatusEnum.java
deleted file mode 100644
index 186cb44..0000000
--- a/maibu-common/src/main/java/com/maibu/enums/StatusEnum.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 通用状态枚举
-
- */
-@Getter
-@AllArgsConstructor
-public enum StatusEnum {
-
-    SUCCESS(1, "成功"),
-    FAIL(0, "失败");
-
-
-    /**
-     * 状态值
-     */
-    private final Integer status;
-    /**
-     * 状态名
-     */
-    private final String name;
-
-}
diff --git a/maibu-common/src/main/java/com/maibu/exception/iot/MqttAuthorizationException.java b/maibu-common/src/main/java/com/maibu/exception/iot/MqttAuthorizationException.java
deleted file mode 100644
index e16d2d8..0000000
--- a/maibu-common/src/main/java/com/maibu/exception/iot/MqttAuthorizationException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.maibu.exception.iot;
-
-import com.maibu.exception.GlobalException;
-import lombok.NoArgsConstructor;
-
-/**
- * mqtt客户端权限校验异常
- * @author gsb
- * @date 2022/10/8 14:11
- */
-@NoArgsConstructor
-public class MqttAuthorizationException extends GlobalException {
-
-    public MqttAuthorizationException(String messageId){
-        super(messageId);
-    }
-}
diff --git a/maibu-common/src/main/java/com/maibu/exception/iot/MqttClientUserNameOrPassException.java b/maibu-common/src/main/java/com/maibu/exception/iot/MqttClientUserNameOrPassException.java
deleted file mode 100644
index c12aeb6..0000000
--- a/maibu-common/src/main/java/com/maibu/exception/iot/MqttClientUserNameOrPassException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.maibu.exception.iot;
-
-import com.maibu.exception.GlobalException;
-import lombok.NoArgsConstructor;
-
-/**
- * mqtt客户端校验 用户名或密码错误
- * @author gsb
- * @date 2022/10/8 14:15
- */
-@NoArgsConstructor
-public class MqttClientUserNameOrPassException extends GlobalException {
-
-    public MqttClientUserNameOrPassException(String message){
-        super(message);
-    }
-}
diff --git a/maibu-common/src/main/java/com/maibu/exception/job/TaskException.java b/maibu-common/src/main/java/com/maibu/exception/job/TaskException.java
deleted file mode 100644
index 04a5626..0000000
--- a/maibu-common/src/main/java/com/maibu/exception/job/TaskException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.maibu.exception.job;
-
-/**
- * 计划策略异常
- * 
- * @author ruoyi
- */
-public class TaskException extends Exception
-{
-    private static final long serialVersionUID = 1L;
-
-    private Code code;
-
-    public TaskException(String msg, Code code)
-    {
-        this(msg, code, null);
-    }
-
-    public TaskException(String msg, Code code, Exception nestedEx)
-    {
-        super(msg, nestedEx);
-        this.code = code;
-    }
-
-    public Code getCode()
-    {
-        return code;
-    }
-
-    public enum Code
-    {
-        TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
-    }
-}
\ No newline at end of file
diff --git a/maibu-common/src/main/java/com/maibu/utils/SecurityUtils.java b/maibu-common/src/main/java/com/maibu/utils/SecurityUtils.java
index 5419890..52827d5 100644
--- a/maibu-common/src/main/java/com/maibu/utils/SecurityUtils.java
+++ b/maibu-common/src/main/java/com/maibu/utils/SecurityUtils.java
@@ -127,13 +127,13 @@ public class SecurityUtils
         {
             String language = getLoginUser().getLanguage();
             if (StringUtils.isEmpty(language)){
-                return "en-US";
+                return "zh-CN";
             }
             return language;
         }
         catch (Exception e)
         {
-            return "en-US";
+            return "zh-CN";
         }
     }
 }
diff --git a/maibu-external/src/main/java/com/maibu/own/controller/CommonDeviceController.java b/maibu-external/src/main/java/com/maibu/own/controller/CommonDeviceController.java
index 091dea9..6c26cc9 100644
--- a/maibu-external/src/main/java/com/maibu/own/controller/CommonDeviceController.java
+++ b/maibu-external/src/main/java/com/maibu/own/controller/CommonDeviceController.java
@@ -3,7 +3,7 @@ package com.maibu.own.controller;
 import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.page.TableDataInfo;
-import com.maibu.domain.IoTCommonDevice;
+import com.maibu.core.business.IoTCommonDevice;
 import com.maibu.own.service.CommonDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/maibu-external/src/main/java/com/maibu/own/service/CommonDeviceService.java b/maibu-external/src/main/java/com/maibu/own/service/CommonDeviceService.java
index 9905bc2..9a9f793 100644
--- a/maibu-external/src/main/java/com/maibu/own/service/CommonDeviceService.java
+++ b/maibu-external/src/main/java/com/maibu/own/service/CommonDeviceService.java
@@ -1,8 +1,8 @@
 package com.maibu.own.service;
 
-import com.maibu.domain.IoTCommonDevice;
+import com.maibu.core.business.IoTCommonDevice;
 import com.maibu.mapper.IoTCommonDevicesMapper;
-import com.maibu.memory.CommonMemory;
+import com.maibu.memory.GlobalMemory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,11 +17,11 @@ public class CommonDeviceService {
 
 
     public List<IoTCommonDevice> unRegisterList() {
-        return (List<IoTCommonDevice>) CommonMemory.unRegisterCommonDeviceMap.values();
+        return (List<IoTCommonDevice>) GlobalMemory.unRegisterCommonDeviceMap.values();
     }
 
     public List<IoTCommonDevice> register() {
-        return (List<IoTCommonDevice>) CommonMemory.unRegisterCommonDeviceMap.values();
+        return (List<IoTCommonDevice>) GlobalMemory.unRegisterCommonDeviceMap.values();
     }
 
     public void save(IoTCommonDevice commonDevice) {
diff --git a/maibu-framework/pom.xml b/maibu-framework/pom.xml
index 4c0d1b2..3236e61 100644
--- a/maibu-framework/pom.xml
+++ b/maibu-framework/pom.xml
@@ -25,13 +25,19 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
-        <!-- 系统模块-->
+<!--         系统模块-->
         <dependency>
             <groupId>com.maibu</groupId>
             <artifactId>maibu-system-service</artifactId>
             <version>${maibu.version}</version>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>com.maibu</groupId>-->
+<!--            <artifactId>maibu-common</artifactId>-->
+<!--            <version>${maibu.version}</version>-->
+<!--        </dependency>-->
+
         <!-- 验证码 -->
         <dependency>
             <groupId>pro.fessional</groupId>
diff --git a/maibu-framework/src/main/java/com/maibu/mybatis/LambdaQueryWrapperX.java b/maibu-framework/src/main/java/com/maibu/mybatis/LambdaQueryWrapperX.java
deleted file mode 100644
index 784486f..0000000
--- a/maibu-framework/src/main/java/com/maibu/mybatis/LambdaQueryWrapperX.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.maibu.mybatis;
-
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.util.StringUtils;
-
-import java.util.Collection;
-
-/**
- * 拓展 MyBatis Plus QueryWrapper 类，主要增加如下功能：
- * <p>
- * 1. 拼接条件的方法，增加 xxxIfPresent 方法，用于判断值不存在的时候，不要拼接到条件中。
- *
- * @param <T> 数据类型
- */
-public class LambdaQueryWrapperX<T> extends LambdaQueryWrapper<T> {
-
-    public LambdaQueryWrapperX<T> likeIfPresent(SFunction<T, ?> column, String val) {
-        if (StringUtils.hasText(val)) {
-            return (LambdaQueryWrapperX<T>) super.like(column, val);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> inIfPresent(SFunction<T, ?> column, Collection<?> values) {
-        if (!CollectionUtils.isEmpty(values)) {
-            return (LambdaQueryWrapperX<T>) super.in(column, values);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> inIfPresent(SFunction<T, ?> column, Object... values) {
-        if (!ArrayUtil.isEmpty(values)) {
-            return (LambdaQueryWrapperX<T>) super.in(column, values);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> eqIfPresent(SFunction<T, ?> column, Object val) {
-        if (ObjectUtil.isNotEmpty(val)) {
-            return (LambdaQueryWrapperX<T>) super.eq(column, val);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> neIfPresent(SFunction<T, ?> column, Object val) {
-        if (ObjectUtil.isNotEmpty(val)) {
-            return (LambdaQueryWrapperX<T>) super.ne(column, val);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> gtIfPresent(SFunction<T, ?> column, Object val) {
-        if (val != null) {
-            return (LambdaQueryWrapperX<T>) super.gt(column, val);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> geIfPresent(SFunction<T, ?> column, Object val) {
-        if (val != null) {
-            return (LambdaQueryWrapperX<T>) super.ge(column, val);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> ltIfPresent(SFunction<T, ?> column, Object val) {
-        if (val != null) {
-            return (LambdaQueryWrapperX<T>) super.lt(column, val);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> leIfPresent(SFunction<T, ?> column, Object val) {
-        if (val != null) {
-            return (LambdaQueryWrapperX<T>) super.le(column, val);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> betweenIfPresent(SFunction<T, ?> column, Object val1, Object val2) {
-        if (val1 != null && val2 != null) {
-            return (LambdaQueryWrapperX<T>) super.between(column, val1, val2);
-        }
-        if (val1 != null) {
-            return (LambdaQueryWrapperX<T>) ge(column, val1);
-        }
-        if (val2 != null) {
-            return (LambdaQueryWrapperX<T>) le(column, val2);
-        }
-        return this;
-    }
-
-    public LambdaQueryWrapperX<T> betweenIfPresent(SFunction<T, ?> column, Object[] values) {
-        Object val1 = ArrayUtils.get(values, 0);
-        Object val2 = ArrayUtils.get(values, 1);
-        return betweenIfPresent(column, val1, val2);
-    }
-
-    // ========== 重写父类方法，方便链式调用 ==========
-
-    @Override
-    public LambdaQueryWrapperX<T> eq(boolean condition, SFunction<T, ?> column, Object val) {
-        super.eq(condition, column, val);
-        return this;
-    }
-
-    @Override
-    public LambdaQueryWrapperX<T> eq(SFunction<T, ?> column, Object val) {
-        super.eq(column, val);
-        return this;
-    }
-
-    @Override
-    public LambdaQueryWrapperX<T> orderByDesc(SFunction<T, ?> column) {
-        super.orderByDesc(true, column);
-        return this;
-    }
-
-    @Override
-    public LambdaQueryWrapperX<T> last(String lastSql) {
-        super.last(lastSql);
-        return this;
-    }
-
-    @Override
-    public LambdaQueryWrapperX<T> in(SFunction<T, ?> column, Collection<?> coll) {
-        super.in(column, coll);
-        return this;
-    }
-
-}
diff --git a/maibu-framework/src/main/java/com/maibu/mybatis/QueryWrapperX.java b/maibu-framework/src/main/java/com/maibu/mybatis/QueryWrapperX.java
deleted file mode 100644
index 468e813..0000000
--- a/maibu-framework/src/main/java/com/maibu/mybatis/QueryWrapperX.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.maibu.mybatis;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import java.util.Collection;
-
-/**
- * 拓展 MyBatis Plus QueryWrapper 类，主要增加如下功能：
- *
- * 1. 拼接条件的方法，增加 xxxIfPresent 方法，用于判断值不存在的时候，不要拼接到条件中。
- *
- * @param <T> 数据类型
- */
-public class QueryWrapperX<T> extends QueryWrapper<T> {
-
-    public QueryWrapperX<T> likeIfPresent(String column, String val) {
-        if (StringUtils.hasText(val)) {
-            return (QueryWrapperX<T>) super.like(column, val);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> inIfPresent(String column, Collection<?> values) {
-        if (!CollectionUtils.isEmpty(values)) {
-            return (QueryWrapperX<T>) super.in(column, values);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> inIfPresent(String column, Object... values) {
-        if (!ArrayUtils.isEmpty(values)) {
-            return (QueryWrapperX<T>) super.in(column, values);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> eqIfPresent(String column, Object val) {
-        if (val != null) {
-            return (QueryWrapperX<T>) super.eq(column, val);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> neIfPresent(String column, Object val) {
-        if (val != null) {
-            return (QueryWrapperX<T>) super.ne(column, val);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> gtIfPresent(String column, Object val) {
-        if (val != null) {
-            return (QueryWrapperX<T>) super.gt(column, val);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> geIfPresent(String column, Object val) {
-        if (val != null) {
-            return (QueryWrapperX<T>) super.ge(column, val);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> ltIfPresent(String column, Object val) {
-        if (val != null) {
-            return (QueryWrapperX<T>) super.lt(column, val);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> leIfPresent(String column, Object val) {
-        if (val != null) {
-            return (QueryWrapperX<T>) super.le(column, val);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> betweenIfPresent(String column, Object val1, Object val2) {
-        if (val1 != null && val2 != null) {
-            return (QueryWrapperX<T>) super.between(column, val1, val2);
-        }
-        if (val1 != null) {
-            return (QueryWrapperX<T>) ge(column, val1);
-        }
-        if (val2 != null) {
-            return (QueryWrapperX<T>) le(column, val2);
-        }
-        return this;
-    }
-
-    public QueryWrapperX<T> betweenIfPresent(String column, Object[] values) {
-        if (values!= null && values.length != 0 && values[0] != null && values[1] != null) {
-            return (QueryWrapperX<T>) super.between(column, values[0], values[1]);
-        }
-        if (values!= null && values.length != 0 && values[0] != null) {
-            return (QueryWrapperX<T>) ge(column, values[0]);
-        }
-        if (values!= null && values.length != 0 && values[1] != null) {
-            return (QueryWrapperX<T>) le(column, values[1]);
-        }
-        return this;
-    }
-
-    // ========== 重写父类方法，方便链式调用 ==========
-
-    @Override
-    public QueryWrapperX<T> eq(boolean condition, String column, Object val) {
-        super.eq(condition, column, val);
-        return this;
-    }
-
-    @Override
-    public QueryWrapperX<T> eq(String column, Object val) {
-        super.eq(column, val);
-        return this;
-    }
-
-    @Override
-    public QueryWrapperX<T> orderByDesc(String column) {
-        super.orderByDesc(true, column);
-        return this;
-    }
-
-    @Override
-    public QueryWrapperX<T> last(String lastSql) {
-        super.last(lastSql);
-        return this;
-    }
-
-    @Override
-    public QueryWrapperX<T> in(String column, Collection<?> coll) {
-        super.in(column, coll);
-        return this;
-    }
-
-}
diff --git a/maibu-framework/src/main/java/com/maibu/mybatis/mapper/BaseMapperX.java b/maibu-framework/src/main/java/com/maibu/mybatis/mapper/BaseMapperX.java
deleted file mode 100644
index bded7b0..0000000
--- a/maibu-framework/src/main/java/com/maibu/mybatis/mapper/BaseMapperX.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.maibu.mybatis.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.baomidou.mybatisplus.extension.toolkit.Db;
-import com.maibu.core.domain.PageParam;
-import com.maibu.core.domain.PageResult;
-import com.maibu.mybatis.utils.MyBatisUtils;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 在 MyBatis Plus 的 BaseMapper 的基础上拓展，提供更多的能力
- * <p>
- * 为什么继承 MPJBaseMapper 接口？支持 MyBatis Plus 多表 Join 的能力。
- */
-public interface BaseMapperX<T> extends BaseMapper<T> {
-
-    default PageResult<T> selectPage(PageParam pageParam, @Param("ew") Wrapper<T> queryWrapper) {
-        // MyBatis Plus 查询
-        IPage<T> mpPage = MyBatisUtils.buildPage(pageParam);
-        selectPage(mpPage, queryWrapper);
-        // 转换返回
-        return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
-    }
-
-    default T selectOne(String field, Object value) {
-        return selectOne(new QueryWrapper<T>().eq(field, value));
-    }
-
-    default T selectOne(SFunction<T, ?> field, Object value) {
-        return selectOne(new LambdaQueryWrapper<T>().eq(field, value));
-    }
-
-    default T selectOne(String field1, Object value1, String field2, Object value2) {
-        return selectOne(new QueryWrapper<T>().eq(field1, value1).eq(field2, value2));
-    }
-
-    default T selectOne(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
-        return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
-    }
-
-    default Long selectCount() {
-        return selectCount(new QueryWrapper<T>());
-    }
-
-    default Long selectCount(String field, Object value) {
-        return selectCount(new QueryWrapper<T>().eq(field, value));
-    }
-
-    default Long selectCount(SFunction<T, ?> field, Object value) {
-        return selectCount(new LambdaQueryWrapper<T>().eq(field, value));
-    }
-
-    default List<T> selectList() {
-        return selectList(new QueryWrapper<>());
-    }
-
-    default List<T> selectList(String field, Object value) {
-        return selectList(new QueryWrapper<T>().eq(field, value));
-    }
-
-    default List<T> selectList(SFunction<T, ?> field, Object value) {
-        return selectList(new LambdaQueryWrapper<T>().eq(field, value));
-    }
-
-    default List<T> selectList(String field, Collection<?> values) {
-        return selectList(new QueryWrapper<T>().in(field, values));
-    }
-
-    default List<T> selectList(SFunction<T, ?> field, Collection<?> values) {
-        return selectList(new LambdaQueryWrapper<T>().in(field, values));
-    }
-
-    default List<T> selectList(SFunction<T, ?> leField, SFunction<T, ?> geField, Object value) {
-        return selectList(new LambdaQueryWrapper<T>().le(leField, value).ge(geField, value));
-    }
-
-    /**
-     * 批量插入，适合大量数据插入
-     *
-     * @param entities 实体们
-     */
-    default void insertBatch(Collection<T> entities) {
-        Db.saveBatch(entities);
-    }
-
-    /**
-     * 批量插入，适合大量数据插入
-     *
-     * @param entities 实体们
-     * @param size     插入数量 Db.saveBatch 默认为 1000
-     */
-    default void insertBatch(Collection<T> entities, int size) {
-        Db.saveBatch(entities, size);
-    }
-
-    default void updateBatch(T update) {
-        update(update, new QueryWrapper<>());
-    }
-
-    default void updateBatch(Collection<T> entities, int size) {
-        Db.updateBatchById(entities, size);
-    }
-
-    /**
-     * 保存或更新
-     * @param entity 实体
-     * @return 是否成功
-     */
-    default boolean saveOrUpdate(T entity) {
-        return Db.saveOrUpdate(entity);
-    }
-
-    /**
-     * 批量保存或更新
-     * @param entities 实体集合
-     * @return 是否成功
-     */
-    default boolean saveOrUpdateBatch(Collection<T> entities) {
-        return Db.saveOrUpdateBatch(entities);
-    }
-
-
-}
diff --git a/maibu-framework/src/main/java/com/maibu/mybatis/utils/MyBatisUtils.java b/maibu-framework/src/main/java/com/maibu/mybatis/utils/MyBatisUtils.java
deleted file mode 100644
index 0d327ed..0000000
--- a/maibu-framework/src/main/java/com/maibu/mybatis/utils/MyBatisUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.maibu.mybatis.utils;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.maibu.core.domain.PageParam;
-import com.maibu.core.domain.SortingField;
-import net.sf.jsqlparser.expression.Alias;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.schema.Table;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * MyBatis 工具类
- */
-public class MyBatisUtils {
-
-    private static final String MYSQL_ESCAPE_CHARACTER = "`";
-
-    public static <T> Page<T> buildPage(PageParam pageParam) {
-        return buildPage(pageParam, null);
-    }
-
-    public static <T> Page<T> buildPage(PageParam pageParam, Collection<SortingField> sortingFields) {
-        // 页码 + 数量
-        Page<T> page = new Page<>(pageParam.getPageNo(), pageParam.getPageSize());
-        // 排序字段
-        if (!CollectionUtil.isEmpty(sortingFields)) {
-            page.addOrder(sortingFields.stream().map(sortingField -> SortingField.ORDER_ASC.equals(sortingField.getOrder()) ?
-                    OrderItem.asc(sortingField.getField()) : OrderItem.desc(sortingField.getField()))
-                    .collect(Collectors.toList()));
-        }
-        return page;
-    }
-
-    /**
-     * 将拦截器添加到链中
-     * 由于 MybatisPlusInterceptor 不支持添加拦截器，所以只能全量设置
-     *
-     * @param interceptor 链
-     * @param inner 拦截器
-     * @param index 位置
-     */
-    public static void addInterceptor(MybatisPlusInterceptor interceptor, InnerInterceptor inner, int index) {
-        List<InnerInterceptor> inners = new ArrayList<>(interceptor.getInterceptors());
-        inners.add(index, inner);
-        interceptor.setInterceptors(inners);
-    }
-
-    /**
-     * 获得 Table 对应的表名
-     *
-     * 兼容 MySQL 转义表名 `t_xxx`
-     *
-     * @param table 表
-     * @return 去除转移字符后的表名
-     */
-    public static String getTableName(Table table) {
-        String tableName = table.getName();
-        if (tableName.startsWith(MYSQL_ESCAPE_CHARACTER) && tableName.endsWith(MYSQL_ESCAPE_CHARACTER)) {
-            tableName = tableName.substring(1, tableName.length() - 1);
-        }
-        return tableName;
-    }
-
-    /**
-     * 构建 Column 对象
-     *
-     * @param tableName 表名
-     * @param tableAlias 别名
-     * @param column 字段名
-     * @return Column 对象
-     */
-    public static Column buildColumn(String tableName, Alias tableAlias, String column) {
-        if (tableAlias != null) {
-            tableName = tableAlias.getName();
-        }
-        return new Column(tableName + StringPool.DOT + column);
-    }
-
-}
diff --git a/maibu-framework/src/main/java/com/maibu/web/service/SysLoginService.java b/maibu-framework/src/main/java/com/maibu/web/service/SysLoginService.java
index afb6a0d..3d52753 100644
--- a/maibu-framework/src/main/java/com/maibu/web/service/SysLoginService.java
+++ b/maibu-framework/src/main/java/com/maibu/web/service/SysLoginService.java
@@ -34,6 +34,7 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
@@ -171,61 +172,7 @@ public class SysLoginService {
         return tokenService.createToken(loginUser);
     }
 
-    /**
-     * 三方跳转登录认证方法
-     *
-     * @param username  系统用户名
-     * @param encodePwd 系统用户密码
-     * @return
-     */
-    public String redirectLogin(String username, String encodePwd, String language) {
-//        UserDetails userDetails=userDetailsServiceImpl.loadUserByUsername(username);
-        SysUser user = userService.selectUserByUserName(username);
-        if (StringUtils.isNull(user)) {
-            throw new ServiceException("登录用户：" + username + " 不存在");
-        } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
-        } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
-        }
-        // 重写验证方法
-        passwordService.socialValidate(user, encodePwd);
-        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
-        UserDetails userDetails = userDetailsServiceImpl.createLoginUser(user);
-        LoginUser loginUser = (LoginUser) userDetails;
-        recordLoginInfo(loginUser.getUserId());
-        loginUser.setLanguage(language);
-        // 生成token
-        return tokenService.createToken(loginUser);
 
-    }
-
-    /**
-     * 组态分享页面生成token
-     *
-     * @param username 系统用户名
-     * @return
-     */
-    public String shareUserLogin(String username, String language) {
-        SysUser user = userService.selectUserByUserName(username);
-        if (StringUtils.isNull(user)) {
-            throw new ServiceException("分享用户：" + username + " 不存在");
-        } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-            throw new ServiceException("对不起，您的分享账号：" + username + " 已被删除");
-        } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-            throw new ServiceException("对不起，您的分享账号：" + username + " 已停用");
-        }
-        // 重写验证方法
-        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
-        UserDetails userDetails = userDetailsServiceImpl.createLoginUser(user);
-        LoginUser loginUser = (LoginUser) userDetails;
-        recordLoginInfo(loginUser.getUserId());
-        loginUser.setLanguage(language);
-        loginUser.setNeverExpire(Boolean.TRUE);
-        // 生成token
-        return tokenService.createToken(loginUser);
-
-    }
 
     /**
      * 校验验证码
@@ -387,7 +334,7 @@ public class SysLoginService {
                         sysUser = userMapper.selectUserByOpenId(openId);
                         if (sysUser != null) {
                             sysUser.setAiChatNum(-1);
-                            sysUser.setUpdateTime(new Date());
+                            sysUser.setUpdateTime(LocalDateTime.now());
                             sysUser.setPhonenumber(phoneParam);
                             userMapper.updateUser(sysUser);
                         } else {
@@ -405,7 +352,7 @@ public class SysLoginService {
                             sysUser = userMapper.selectUserById(userId);
                             if (sysUser != null) {
                                 sysUser.setAiChatNum(-1);
-                                sysUser.setUpdateTime(new Date());
+                                sysUser.setUpdateTime(LocalDateTime.now());
                                 sysUser.setPhonenumber(phoneParam);
                                 userMapper.updateUser(sysUser);
                             } else {
@@ -444,7 +391,7 @@ public class SysLoginService {
                     }
                     if (sysUser.getAiChatNum() != -1) {
                         sysUser.setAiChatNum(-1);
-                        sysUser.setUpdateTime(new Date());
+                        sysUser.setUpdateTime(LocalDateTime.now());
                         userMapper.updateUser(sysUser);
                     }
                     dto.setSuccess(true);
diff --git a/maibu-framework/src/main/java/com/maibu/web/service/UserDetailsServiceImpl.java b/maibu-framework/src/main/java/com/maibu/web/service/UserDetailsServiceImpl.java
index 271bf74..d8e9b4b 100644
--- a/maibu-framework/src/main/java/com/maibu/web/service/UserDetailsServiceImpl.java
+++ b/maibu-framework/src/main/java/com/maibu/web/service/UserDetailsServiceImpl.java
@@ -60,6 +60,6 @@ public class UserDetailsServiceImpl implements UserDetailsService
 
     public UserDetails createLoginUser(SysUser user)
     {
-        return new LoginUser(user.getUserId(), user.getDeptId(), user.getLanguage(), user, permissionService.getMenuPermission(user));
+        return new LoginUser(user.getUserId(), user.getDeptId(), user.getOrgId(),user.getSiteId(),user.getLanguage(), user, permissionService.getMenuPermission(user));
     }
 }
diff --git a/maibu-iotDA/src/main/java/com/maibu/utils/IoTDAMqttClient.java b/maibu-iotDA/src/main/java/com/maibu/utils/IoTDAMqttClient.java
index 2badedb..5981d64 100644
--- a/maibu-iotDA/src/main/java/com/maibu/utils/IoTDAMqttClient.java
+++ b/maibu-iotDA/src/main/java/com/maibu/utils/IoTDAMqttClient.java
@@ -7,10 +7,10 @@ import com.huaweicloud.sdk.iot.device.client.requests.DeviceMessage;
 import com.huaweicloud.sdk.iot.device.client.requests.ServiceProperty;
 import com.huaweicloud.sdk.iot.device.transport.ActionListener;
 import com.maibu.common.NettyCacheKey;
+import com.maibu.core.business.DeviceRunningStatusHistory;
+import com.maibu.core.business.DeviceStatusRecordDTO;
 import com.maibu.core.redis.RedisCache;
-import com.maibu.domain.DeviceRunningStatusHistory;
-import com.maibu.domain.DeviceStatusRecordDTO;
-import com.maibu.dto.NettyDevice;
+import com.maibu.core.business.device.NettyDevice;
 import com.maibu.manager.DeviceSessionManager;
 import com.maibu.utils.spring.SpringUtils;
 import org.slf4j.Logger;
diff --git a/maibu-netty-server/src/main/java/com/maibu/common/Constant.java b/maibu-netty-server/src/main/java/com/maibu/common/Constant.java
index 7305ee2..81ce1c7 100644
--- a/maibu-netty-server/src/main/java/com/maibu/common/Constant.java
+++ b/maibu-netty-server/src/main/java/com/maibu/common/Constant.java
@@ -1,5 +1,6 @@
 package com.maibu.common;
 
+import com.maibu.core.enums.ConnectionCloseReason;
 import io.netty.util.AttributeKey;
 import lombok.Data;
 
@@ -8,4 +9,9 @@ public class Constant {
 
     public static final AttributeKey<String> ATT_DEVICE_ID = AttributeKey.valueOf("deviceId");
 
+    public static final AttributeKey<ConnectionCloseReason> ATT_CLOSE_REASON = AttributeKey.valueOf("closeReason");
+
+    public static final AttributeKey<String> ATT_ORG_ID = AttributeKey.valueOf("orgId");
+
+    public static final AttributeKey<String> ATT_SITE_ID = AttributeKey.valueOf("siteId");
 }
diff --git a/maibu-netty-server/src/main/java/com/maibu/controller/DeviceExternalApiController.java b/maibu-netty-server/src/main/java/com/maibu/controller/DeviceExternalApiController.java
index a547729..834a85f 100644
--- a/maibu-netty-server/src/main/java/com/maibu/controller/DeviceExternalApiController.java
+++ b/maibu-netty-server/src/main/java/com/maibu/controller/DeviceExternalApiController.java
@@ -3,7 +3,7 @@ package com.maibu.controller;
 import com.maibu.common.CommandConstant;
 import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
-import com.maibu.dto.NettyDevice;
+import com.maibu.core.business.device.NettyDevice;
 import com.maibu.dto.ObstacleData;
 import com.maibu.manager.DeviceSessionManager;
 import com.maibu.utils.CommandUtils;
@@ -11,7 +11,6 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.util.CharsetUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.java_websocket.WebSocket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
diff --git a/maibu-netty-server/src/main/java/com/maibu/controller/DeviceTaskController.java b/maibu-netty-server/src/main/java/com/maibu/controller/DeviceTaskController.java
index 8f15292..1773a85 100644
--- a/maibu-netty-server/src/main/java/com/maibu/controller/DeviceTaskController.java
+++ b/maibu-netty-server/src/main/java/com/maibu/controller/DeviceTaskController.java
@@ -1,9 +1,9 @@
 package com.maibu.controller;
 
+import com.maibu.core.business.DevicePlan;
 import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.domain.model.LoginUser;
-import com.maibu.domain.DevicePlan;
 import com.maibu.dto.DeviceTaskQueryDTO;
 import com.maibu.service.DeviceTaskService;
 import com.maibu.utils.SecurityUtils;
diff --git a/maibu-netty-server/src/main/java/com/maibu/controller/NettyDeviceController.java b/maibu-netty-server/src/main/java/com/maibu/controller/NettyDeviceController.java
index 61b95b1..fcf041d 100644
--- a/maibu-netty-server/src/main/java/com/maibu/controller/NettyDeviceController.java
+++ b/maibu-netty-server/src/main/java/com/maibu/controller/NettyDeviceController.java
@@ -1,10 +1,10 @@
 package com.maibu.controller;
 
+import com.maibu.core.business.DeviceRunningStatusHistory;
 import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.page.TableDataInfo;
-import com.maibu.domain.DeviceRunningStatusHistory;
-import com.maibu.entity.ErrorIdentificationStandard;
+import com.maibu.core.business.ErrorIdentificationStandard;
 import com.maibu.service.NettyDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceErrorPushDTO.java b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceErrorPushDTO.java
index 7f41c38..f49b2c3 100644
--- a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceErrorPushDTO.java
+++ b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceErrorPushDTO.java
@@ -1,6 +1,6 @@
 package com.maibu.dto;
 
-import com.maibu.enums.RespondCode;
+import com.maibu.core.enums.RespondCode;
 import lombok.Data;
 
 import java.util.List;
diff --git a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceLoginResponseDTO.java b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceLoginResponseDTO.java
index 65904bf..65efef8 100644
--- a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceLoginResponseDTO.java
+++ b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceLoginResponseDTO.java
@@ -1,6 +1,6 @@
 package com.maibu.dto;
 
-import com.maibu.enums.RespondCode;
+import com.maibu.core.enums.RespondCode;
 import lombok.Data;
 
 @Data
diff --git a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceRequestDTO.java b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceRequestDTO.java
index bd44347..9d32b7e 100644
--- a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceRequestDTO.java
+++ b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceRequestDTO.java
@@ -1,6 +1,6 @@
 package com.maibu.dto;
 
-import com.maibu.enums.CommandRequestType;
+import com.maibu.core.enums.CommandRequestType;
 import lombok.Data;
 
 @Data
diff --git a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceStatusChangeDTO.java b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceStatusChangeDTO.java
index 562fb00..222d00d 100644
--- a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceStatusChangeDTO.java
+++ b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceStatusChangeDTO.java
@@ -1,6 +1,6 @@
 package com.maibu.dto;
 
-import com.maibu.enums.RespondCode;
+import com.maibu.core.enums.RespondCode;
 import lombok.Data;
 
 @Data
diff --git a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceTaskQueryDTO.java b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceTaskQueryDTO.java
index fba3285..2300b93 100644
--- a/maibu-netty-server/src/main/java/com/maibu/dto/DeviceTaskQueryDTO.java
+++ b/maibu-netty-server/src/main/java/com/maibu/dto/DeviceTaskQueryDTO.java
@@ -1,6 +1,6 @@
 package com.maibu.dto;
 
-import com.maibu.enums.DeviceTaskStaus;
+import com.maibu.core.enums.DeviceTaskStaus;
 import lombok.Data;
 
 import java.time.LocalDateTime;
diff --git a/maibu-netty-server/src/main/java/com/maibu/enums/CommandRequestType.java b/maibu-netty-server/src/main/java/com/maibu/enums/CommandRequestType.java
deleted file mode 100644
index d762e59..0000000
--- a/maibu-netty-server/src/main/java/com/maibu/enums/CommandRequestType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.maibu.enums;
-
-public enum CommandRequestType {
-    switch_control
-}
diff --git a/maibu-netty-server/src/main/java/com/maibu/enums/CompareEnum.java b/maibu-netty-server/src/main/java/com/maibu/enums/CompareEnum.java
deleted file mode 100644
index bde3b31..0000000
--- a/maibu-netty-server/src/main/java/com/maibu/enums/CompareEnum.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 比较操作符枚举类
- * 用于标准化管理比较类型，如>、<、between等
- * 基于项目现有的使用模式实现
- */
-@Getter
-@AllArgsConstructor
-public enum CompareEnum {
-
-    /** 等于 */
-    EQ("=", "等于", "=", true),
-
-    /** 不等于 */
-    NEQ("!=", "不等于", "!=", true),
-
-    /** 大于 */
-    GT(">", "大于", ">", true),
-
-    /** 小于 */
-    LT("<", "小于", "<", true),
-
-    /** 大于等于 */
-    GTE(">=", "大于等于", ">=", true),
-
-    /** 小于等于 */
-    LTE("<=", "小于等于", "<=", true),
-
-    /** 在之间 */
-    BETWEEN("between", "在之间", "between", false),
-
-    /** 不在之间 */
-    NOT_BETWEEN("notBetween", "不在之间", "notBetween", false),
-
-    /** 包含 */
-    CONTAIN("contain", "包含", "contain", true),
-
-    /** 不包含 */
-    NOT_CONTAIN("notContain", "不包含", "notContain", true);
-
-    /** 操作符值（存储在数据库中） */
-    private final String value;
-
-    /** 操作符名称（用于前端显示） */
-    private final String name;
-
-    /** 表达式符号（用于计算表达式） */
-    private final String symbol;
-
-    /** 是否为单值比较（true:单值, false:范围值） */
-    private final boolean singleValue;
-
-    /**
-     * 根据值获取比较操作符枚举
-     * @param value 操作符值
-     * @return 比较操作符枚举
-     */
-    public static CompareEnum getByValue(String value) {
-        if (value == null) {
-            return null;
-        }
-        for (CompareEnum operator : CompareEnum.values()) {
-            if (operator.getValue().equals(value)) {
-                return operator;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 获取所有比较操作符列表
-     * @return 比较操作符列表
-     */
-    public static List<CompareEnum> getAll() {
-        return Arrays.asList(CompareEnum.values());
-    }
-
-    /**
-     * 判断是否为范围比较操作符
-     * @param value 操作符值
-     * @return 是否为范围比较
-     */
-    public static boolean isRangeOperator(String value) {
-        CompareEnum operator = getByValue(value);
-        return operator != null && !operator.isSingleValue();
-    }
-}
diff --git a/maibu-netty-server/src/main/java/com/maibu/enums/ConnectionCloseReason.java b/maibu-netty-server/src/main/java/com/maibu/enums/ConnectionCloseReason.java
deleted file mode 100644
index d437b5a..0000000
--- a/maibu-netty-server/src/main/java/com/maibu/enums/ConnectionCloseReason.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.maibu.enums;
-
-public enum ConnectionCloseReason {
-    NROMAL,
-    TIMEOUT,
-    REPEAT
-}
diff --git a/maibu-netty-server/src/main/java/com/maibu/enums/ConnectorStatus.java b/maibu-netty-server/src/main/java/com/maibu/enums/ConnectorStatus.java
deleted file mode 100644
index 039cb0b..0000000
--- a/maibu-netty-server/src/main/java/com/maibu/enums/ConnectorStatus.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.maibu.enums;
-
-public enum ConnectorStatus {
-    ACTIVE,    // 完全可用
-    RECEIVER,  // 禁言（不可发送但可以接收）
-    DISABLED   // 完全不可用
-}
diff --git a/maibu-netty-server/src/main/java/com/maibu/enums/ConnectorType.java b/maibu-netty-server/src/main/java/com/maibu/enums/ConnectorType.java
deleted file mode 100644
index a06f733..0000000
--- a/maibu-netty-server/src/main/java/com/maibu/enums/ConnectorType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.maibu.enums;
-
-public enum ConnectorType {
-    MASTER, // 上位机（主动绑定别人）
-    SLAVE,  // 下位机（只能被动绑定）
-    GENERAL // 不区分角色（将来扩展用）
-}
diff --git a/maibu-netty-server/src/main/java/com/maibu/enums/DeviceStatus.java b/maibu-netty-server/src/main/java/com/maibu/enums/DeviceStatus.java
deleted file mode 100644
index 3458d45..0000000
--- a/maibu-netty-server/src/main/java/com/maibu/enums/DeviceStatus.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum DeviceStatus {
-
-
-    online(1, "online", "在线"),
-    offline(0, "offline", "离线");
-
-    private int type;
-    private String code;
-    private String description;
-
-    public static DeviceStatus convert(int type) {
-        for (DeviceStatus value : DeviceStatus.values()) {
-            if (value.type == type) {
-                return value;
-            }
-        }
-        return null;
-    }
-
-    public static DeviceStatus convert(String code) {
-        for (DeviceStatus value : DeviceStatus.values()) {
-            if (value.code.equals(code)) {
-                return value;
-            }
-        }
-        return null;
-    }
-}
diff --git a/maibu-netty-server/src/main/java/com/maibu/enums/RespondCode.java b/maibu-netty-server/src/main/java/com/maibu/enums/RespondCode.java
deleted file mode 100644
index 2287cea..0000000
--- a/maibu-netty-server/src/main/java/com/maibu/enums/RespondCode.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.maibu.enums;
-
-public enum RespondCode {
-    /**
-     * 账号已登录
-     */
-    have_logged_in,
-
-    /**
-     * 设备状态改变
-     */
-    device_status_changed,
-    /**
-     * 设备错误推送
-     */
-    device_error_push
-}
diff --git a/maibu-netty-server/src/main/java/com/maibu/init/InitThread.java b/maibu-netty-server/src/main/java/com/maibu/init/InitThread.java
index 608f8ac..b83b8d5 100644
--- a/maibu-netty-server/src/main/java/com/maibu/init/InitThread.java
+++ b/maibu-netty-server/src/main/java/com/maibu/init/InitThread.java
@@ -1,11 +1,11 @@
 package com.maibu.init;
 
 import com.maibu.constant.FastBeeConstant;
-import com.maibu.domain.DevicePlan;
-import com.maibu.enums.DeviceTaskStaus;
+import com.maibu.core.business.DevicePlan;
+import com.maibu.core.enums.DeviceTaskStaus;
 import com.maibu.mapper.DevicePlanMapper;
 import com.maibu.mapper.SysUserClientMapper;
-import com.maibu.memory.GlobalMemory;
+import com.maibu.memory.SiteMemory;
 import com.maibu.mybatis.LambdaQueryWrapperX;
 import com.maibu.service.DevicePlanTaskMonitorService;
 import com.maibu.service.DeviceThreadService;
@@ -92,7 +92,7 @@ public class InitThread implements ApplicationRunner {
         query.in(DevicePlan::getTaskStaus, list);
         List<DevicePlan> devicePlanList = devicePlanMapper.selectList(query);
         if(!CollectionUtils.isEmpty(devicePlanList)){
-            devicePlanList.forEach(GlobalMemory::addDevicePlan);
+            devicePlanList.forEach(SiteMemory::addDevicePlan);
         }
     }
 }
diff --git a/maibu-netty-server/src/main/java/com/maibu/manager/DeviceSessionManager.java b/maibu-netty-server/src/main/java/com/maibu/manager/DeviceSessionManager.java
index a60919b..f127045 100644
--- a/maibu-netty-server/src/main/java/com/maibu/manager/DeviceSessionManager.java
+++ b/maibu-netty-server/src/main/java/com/maibu/manager/DeviceSessionManager.java
@@ -2,10 +2,10 @@ package com.maibu.manager;
 
 
 import cn.hutool.core.util.ObjectUtil;
-import com.maibu.dto.Connector;
-import com.maibu.dto.NettyDevice;
-import com.maibu.enums.ConnectorStatus;
-import com.maibu.enums.ConnectorType;
+import com.maibu.core.enums.ConnectorStatus;
+import com.maibu.core.enums.ConnectorType;
+import com.maibu.core.business.device.Connector;
+import com.maibu.core.business.device.NettyDevice;
 import io.netty.channel.Channel;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
diff --git a/maibu-netty-server/src/main/java/com/maibu/mapper/ErrorIdentificationStandardMapper.java b/maibu-netty-server/src/main/java/com/maibu/mapper/ErrorIdentificationStandardMapper.java
index ecede06..d665c1a 100644
--- a/maibu-netty-server/src/main/java/com/maibu/mapper/ErrorIdentificationStandardMapper.java
+++ b/maibu-netty-server/src/main/java/com/maibu/mapper/ErrorIdentificationStandardMapper.java
@@ -1,6 +1,6 @@
 package com.maibu.mapper;
 
-import com.maibu.entity.ErrorIdentificationStandard;
+import com.maibu.core.business.ErrorIdentificationStandard;
 import com.maibu.mybatis.mapper.BaseMapperX;
 import org.springframework.stereotype.Repository;
 
diff --git a/maibu-netty-server/src/main/java/com/maibu/memory/GlobalMemory.java b/maibu-netty-server/src/main/java/com/maibu/memory/GlobalMemory.java
deleted file mode 100644
index ff9d5f2..0000000
--- a/maibu-netty-server/src/main/java/com/maibu/memory/GlobalMemory.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.maibu.memory;
-
-import com.maibu.domain.DevicePlan;
-import com.maibu.domain.DevicePlanTask;
-import com.maibu.entity.ErrorIdentificationStandard;
-import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Component
-@Data
-public class GlobalMemory {
-
-    public List<ErrorIdentificationStandard> standard = null;
-
-    //key  deviceId
-    public static ConcurrentHashMap<String, List<DevicePlan>> devicePlanMap = new ConcurrentHashMap<>();
-    //key  deviceId  prepare
-    public static ConcurrentHashMap<String, List<DevicePlanTask>> devicePlanTaskPrepareMap = new ConcurrentHashMap<>();
-    //key  deviceId execute
-    public static ConcurrentHashMap<String, DevicePlanTask> devicePlanTaskExecuteMap = new ConcurrentHashMap<>();
-
-    // 设备当前控制权在哪里key->deviceId  value:userName:app/web/pc:token
-//    public static final ConcurrentHashMap<String, String> controlLockMap = new ConcurrentHashMap<>();
-
-
-    public static void addDevicePlan(DevicePlan devicePlan) {
-        if (devicePlan != null && !StringUtils.isEmpty(devicePlan.getDeviceId())) {
-            String deviceId = devicePlan.getDeviceId();
-            List<DevicePlan> list = devicePlanMap.get(deviceId);
-            if (CollectionUtils.isEmpty(list)) {
-                list = new ArrayList<>();
-            }
-            boolean exists = list.stream()
-                    .anyMatch(l -> Objects.equals(l.getId(), devicePlan.getId()));
-            if (!exists) {
-                list.add(devicePlan);
-            }
-            devicePlanMap.put(deviceId, list);
-        }
-    }
-
-
-    public static void removeDevicePlan(DevicePlan devicePlan) {
-        if (devicePlan != null && !StringUtils.isEmpty(devicePlan.getDeviceId())) {
-            String deviceId = devicePlan.getDeviceId();
-            List<DevicePlan> list = devicePlanMap.get(deviceId);
-            if (!CollectionUtils.isEmpty(list)) {
-                list.removeIf(x -> x.getId().equals(devicePlan.getId()));
-            }
-        }
-    }
-
-    public static void addDevicePlanPrepare(DevicePlanTask devicePlanTask) {
-        if (devicePlanTask != null && !StringUtils.isEmpty(devicePlanTask.getDeviceId())) {
-            String deviceId = devicePlanTask.getDeviceId();
-            List<DevicePlanTask> list = devicePlanTaskPrepareMap.get(deviceId);
-            if (CollectionUtils.isEmpty(list)) {
-                list = new ArrayList<>();
-            }
-            list.add(devicePlanTask);
-            devicePlanTaskPrepareMap.put(deviceId, list);
-        }
-    }
-
-    public static void removeDevicePlanPrepare(DevicePlanTask devicePlanTask) {
-        if (devicePlanTask != null && !StringUtils.isEmpty(devicePlanTask.getDeviceId())) {
-            String deviceId = devicePlanTask.getDeviceId();
-            List<DevicePlanTask> list = devicePlanTaskPrepareMap.get(deviceId);
-            if (!CollectionUtils.isEmpty(list)) {
-                list.removeIf(x -> x.getId().equals(devicePlanTask.getId()));
-            }
-        }
-    }
-
-
-    public static void addDevicePlanExecute(DevicePlanTask devicePlanTask) {
-        if (devicePlanTask != null && !StringUtils.isEmpty(devicePlanTask.getDeviceId())) {
-            String deviceId = devicePlanTask.getDeviceId();
-            devicePlanTaskExecuteMap.put(deviceId, devicePlanTask);
-        }
-    }
-
-    public static void removeDevicePlanExecute(String deviceId) {
-        if (!StringUtils.isEmpty(deviceId)) {
-            devicePlanTaskExecuteMap.remove(deviceId);
-        }
-    }
-
-}
diff --git a/maibu-netty-server/src/main/java/com/maibu/netty/handler/CommandForwardHandler.java b/maibu-netty-server/src/main/java/com/maibu/netty/handler/CommandForwardHandler.java
index 5dbcb05..e6ed5e1 100644
--- a/maibu-netty-server/src/main/java/com/maibu/netty/handler/CommandForwardHandler.java
+++ b/maibu-netty-server/src/main/java/com/maibu/netty/handler/CommandForwardHandler.java
@@ -1,10 +1,11 @@
 package com.maibu.netty.handler;
 
 import com.maibu.common.CommandConstant;
-import com.maibu.dto.Connector;
-import com.maibu.dto.NettyDevice;
-import com.maibu.enums.ConnectorType;
+import com.maibu.core.enums.ConnectorType;
+import com.maibu.core.business.device.Connector;
+import com.maibu.core.business.device.NettyDevice;
 import com.maibu.manager.DeviceSessionManager;
+import com.maibu.memory.GlobalMemory;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
@@ -35,6 +36,7 @@ public class CommandForwardHandler extends SimpleChannelInboundHandler<String> {
         Channel currentChannel = ctx.channel();
         byte[] bytes = Hex.decodeHex(msg.toCharArray());
         if (bytes.length > 3 && (bytes[2] == CommandConstant.remoteControl || bytes[2] == CommandConstant.path || bytes[2] == CommandConstant.status)) {
+
             String senderDeviceId = deviceSessionManager.getDeviceIdByChannel(currentChannel);
             NettyDevice senderNettyDevice =
                     senderDeviceId != null ? deviceSessionManager.getDevice(senderDeviceId) : null;
diff --git a/maibu-netty-server/src/main/java/com/maibu/netty/handler/DataToDataBaseHandler.java b/maibu-netty-server/src/main/java/com/maibu/netty/handler/DataToDataBaseHandler.java
index 2d1cdf4..9862891 100644
--- a/maibu-netty-server/src/main/java/com/maibu/netty/handler/DataToDataBaseHandler.java
+++ b/maibu-netty-server/src/main/java/com/maibu/netty/handler/DataToDataBaseHandler.java
@@ -2,11 +2,11 @@ package com.maibu.netty.handler;
 
 import com.maibu.common.CommandConstant;
 import com.maibu.common.NettyCacheKey;
+import com.maibu.core.business.DeviceRunStatistics;
+import com.maibu.core.business.DeviceRunningStatusHistory;
+import com.maibu.core.business.DeviceStatusRecordDTO;
 import com.maibu.core.redis.RedisCache;
-import com.maibu.domain.DeviceRunStatistics;
-import com.maibu.domain.DeviceRunningStatusHistory;
-import com.maibu.domain.DeviceStatusRecordDTO;
-import com.maibu.dto.NettyDevice;
+import com.maibu.core.business.device.NettyDevice;
 import com.maibu.manager.DeviceSessionManager;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
diff --git a/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java b/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java
index 11dcaf8..e089691 100644
--- a/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java
+++ b/maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java
@@ -1,11 +1,14 @@
 package com.maibu.netty.handler;
 
 import com.maibu.common.CommandConstant;
+import com.maibu.common.Constant;
+import com.maibu.core.business.Device;
+import com.maibu.core.business.device.NettyDevice;
 import com.maibu.core.domain.entity.SysUser;
 import com.maibu.core.domain.entity.UserClient;
-import com.maibu.domain.Device;
+import com.maibu.core.enums.*;
+import com.maibu.core.enums.DeviceStatus;
 import com.maibu.dto.*;
-import com.maibu.enums.*;
 import com.maibu.manager.DeviceSessionManager;
 import com.maibu.mapper.DeviceRunStatisticsMapper;
 import com.maibu.service.IDeviceService;
@@ -32,9 +35,7 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
-import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Component
@@ -43,9 +44,6 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler<String> {
 
     private static final Logger logger = LoggerFactory.getLogger(DeviceConnectHandler.class);
 
-    public static final AttributeKey<String> ATT_DEVICE_ID = AttributeKey.valueOf("deviceId");
-    public static final AttributeKey<ConnectionCloseReason> ATT_CLOSE_REASON = AttributeKey.valueOf("closeReason");
-
     //记录切换控制权请求来源 key 是请求的masterId,value是控制当前设备的主机
     private final ConcurrentHashMap<String, String> controlRequestMap = new ConcurrentHashMap<>();
 
@@ -80,8 +78,8 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler<String> {
     @Override
     public void channelInactive(ChannelHandlerContext ctx) {
         Channel channel = ctx.channel();
-        ConnectionCloseReason reason = channel.attr(ATT_CLOSE_REASON).get();
-        String deviceId = channel.attr(ATT_DEVICE_ID).get();
+        ConnectionCloseReason reason = channel.attr(Constant.ATT_CLOSE_REASON).get();
+        String deviceId = channel.attr(Constant.ATT_DEVICE_ID).get();
 
         if (reason == ConnectionCloseReason.REPEAT) {
             logger.warn("重复连接断开: {}", channel.remoteAddress());
@@ -120,7 +118,7 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler<String> {
                 Device device = deviceService.selectDeviceBySerialNumber(deviceId);
                 if (device != null) {
                     device.setOnlineStatus(DeviceStatus.offline.getType());
-                    device.setUpdateTime(new Date());
+                    device.setUpdateTime(LocalDateTime.now());
                     deviceService.updateDeviceBySelf(device);
                     //todo 更新历史作业消息
                 }
@@ -253,13 +251,13 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler<String> {
                             device.setTenantId(-1L);
                             device.setFirmwareVersion(BigDecimal.valueOf(1.0));
                             device.setProductName("割草机产品MC700");
-                            device.setCreateTime(new Date());
-                            device.setUpdateTime(new Date());
+                            device.setCreateTime(LocalDateTime.now());
+                            device.setUpdateTime(LocalDateTime.now());
                             deviceService.insertDeviceBySelf(device);
                         } else {
                             device.setStatus(3);
                             device.setOnlineStatus(DeviceStatus.online.getType());
-                            device.setUpdateTime(new Date());
+                            device.setUpdateTime(LocalDateTime.now());
                             deviceService.updateDeviceBySelf(device);
                         }
                         NettyDevice slaveDevice = sessionManager.getDevice(data);
@@ -444,12 +442,12 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler<String> {
     }
 
     private void handleSlaveConnect(ChannelHandlerContext ctx, String slaveId) {
-        ctx.channel().attr(ATT_DEVICE_ID).set(slaveId);
+        ctx.channel().attr(Constant.ATT_DEVICE_ID).set(slaveId);
         sessionManager.registerDevice(slaveId, ctx.channel(), ConnectorType.SLAVE, ConnectorStatus.ACTIVE, null);
     }
 
     private void handleMasterConnect(ChannelHandlerContext ctx, String masterId, String slaveId, ConnectorStatus status) {
-        ctx.channel().attr(ATT_DEVICE_ID).set(masterId);
+        ctx.channel().attr(Constant.ATT_DEVICE_ID).set(masterId);
         sessionManager.registerDevice(masterId, ctx.channel(), ConnectorType.MASTER, status, slaveId);
 //        sessionManager.bindConnector(masterId, slaveId);
     }
@@ -457,7 +455,7 @@ public class DeviceConnectHandler extends SimpleChannelInboundHandler<String> {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        String deviceId = ctx.channel().attr(ATT_DEVICE_ID).get();
+        String deviceId = ctx.channel().attr(Constant.ATT_DEVICE_ID).get();
         logger.error("异常设备 {} 出现错误: {}", deviceId, cause.getMessage(), cause);
         ctx.close();
     }
diff --git a/maibu-netty-server/src/main/java/com/maibu/scheduled/ScheduledTask.java b/maibu-netty-server/src/main/java/com/maibu/scheduled/ScheduledTask.java
index 7beb599..4645a35 100644
--- a/maibu-netty-server/src/main/java/com/maibu/scheduled/ScheduledTask.java
+++ b/maibu-netty-server/src/main/java/com/maibu/scheduled/ScheduledTask.java
@@ -1,11 +1,11 @@
 package com.maibu.scheduled;
 
 import com.maibu.common.NettyCacheKey;
+import com.maibu.core.business.DevicePlan;
+import com.maibu.core.business.DeviceStatusRecordDTO;
 import com.maibu.core.redis.RedisCache;
-import com.maibu.domain.DevicePlan;
-import com.maibu.domain.DeviceStatusRecordDTO;
 import com.maibu.mapper.DeviceStatusHistoryMapper;
-import com.maibu.memory.GlobalMemory;
+import com.maibu.memory.SiteMemory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -57,7 +57,7 @@ public class ScheduledTask {
     @Scheduled(cron = "0 0 0 * * ?")
     public void refreshDevicePlanTask() {
         System.out.println("0点定时刷新状态");
-        Map<String, List<DevicePlan>> map = GlobalMemory.devicePlanMap;
+        Map<String, List<DevicePlan>> map = SiteMemory.devicePlanMap;
         if (!CollectionUtils.isEmpty(map.keySet())) {
             map.values().forEach(x -> {
                 if (!CollectionUtils.isEmpty(x)) {
diff --git a/maibu-netty-server/src/main/java/com/maibu/service/DevicePlanTaskMonitorService.java b/maibu-netty-server/src/main/java/com/maibu/service/DevicePlanTaskMonitorService.java
index 3711c96..24c2c52 100644
--- a/maibu-netty-server/src/main/java/com/maibu/service/DevicePlanTaskMonitorService.java
+++ b/maibu-netty-server/src/main/java/com/maibu/service/DevicePlanTaskMonitorService.java
@@ -1,18 +1,18 @@
 package com.maibu.service;
 
 
-import com.maibu.domain.DevicePlan;
-import com.maibu.domain.DevicePlanTask;
-import com.maibu.domain.DeviceTaskPlanRule;
-import com.maibu.dto.NettyDevice;
-import com.maibu.enums.DeviceTaskPlanRepeatType;
-import com.maibu.enums.DeviceTaskStaus;
+import com.maibu.core.business.DevicePlan;
+import com.maibu.core.business.DevicePlanTask;
+import com.maibu.core.business.DeviceTaskPlanRule;
+import com.maibu.core.business.WorkRecord;
+import com.maibu.core.enums.DeviceTaskPlanRepeatType;
+import com.maibu.core.enums.DeviceTaskStaus;
+import com.maibu.core.business.device.NettyDevice;
 import com.maibu.manager.DeviceSessionManager;
 import com.maibu.mapper.DevicePlanMapper;
 import com.maibu.mapper.DevicePlanTaskMapper;
 import com.maibu.mapper.WorkRecordMapper;
-import com.maibu.memory.GlobalMemory;
-import com.maibu.model.WorkRecord;
+import com.maibu.memory.SiteMemory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +34,7 @@ public class DevicePlanTaskMonitorService {
 
 
     @Autowired
-    private GlobalMemory globalMemory;
+    private SiteMemory siteMemory;
 
     @Autowired
     private DevicePlanTaskMapper devicePlanTaskMapper;
@@ -57,7 +57,7 @@ public class DevicePlanTaskMonitorService {
         ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
         executor.scheduleWithFixedDelay(() -> {
             try {
-                Map<String, List<DevicePlan>> planMap = GlobalMemory.devicePlanMap;
+                Map<String, List<DevicePlan>> planMap = SiteMemory.devicePlanMap;
                 if (!CollectionUtils.isEmpty(planMap.values())) {
                     Iterator<String> iterator = planMap.keySet().iterator();
                     while (iterator.hasNext()) {
@@ -109,7 +109,7 @@ public class DevicePlanTaskMonitorService {
             devicePlanTask.setCreateTime(LocalDateTime.now());
             devicePlanTask.setTaskType("");//待拓展任务类型
             devicePlanTaskMapper.insert(devicePlanTask);
-            globalMemory.addDevicePlanPrepare(devicePlanTask);
+            siteMemory.addDevicePlanPrepare(devicePlanTask);
             //啥时候重置？每日0点？
             devicePlan.setDayTriggerFlag(true);
             devicePlan.setUpdateTime(LocalDateTime.now());
@@ -120,7 +120,7 @@ public class DevicePlanTaskMonitorService {
             if (endTime != null && endTime.isEqual(today)) {
                 devicePlan.setFinishTime(LocalDateTime.now());
                 devicePlan.setTaskStaus(DeviceTaskStaus.FINISH);
-                GlobalMemory.removeDevicePlan(devicePlan);
+                SiteMemory.removeDevicePlan(devicePlan);
             }
             devicePlanMapper.updateById(devicePlan);
         }
@@ -143,7 +143,7 @@ public class DevicePlanTaskMonitorService {
             devicePlanTask.setCreateTime(LocalDateTime.now());
             devicePlanTask.setTaskType("");//待拓展任务类型
             devicePlanTaskMapper.insert(devicePlanTask);
-            globalMemory.addDevicePlanPrepare(devicePlanTask);
+            siteMemory.addDevicePlanPrepare(devicePlanTask);
             //啥时候重置？每日0点？
             devicePlan.setDayTriggerFlag(true);
             devicePlan.setUpdateTime(LocalDateTime.now());
@@ -153,7 +153,7 @@ public class DevicePlanTaskMonitorService {
             if (endTime != null && endTime.isEqual(today)) {
                 devicePlan.setFinishTime(LocalDateTime.now());
                 devicePlan.setTaskStaus(DeviceTaskStaus.FINISH);
-                GlobalMemory.removeDevicePlan(devicePlan);
+                SiteMemory.removeDevicePlan(devicePlan);
             }
             devicePlanMapper.updateById(devicePlan);
         }
@@ -175,7 +175,7 @@ public class DevicePlanTaskMonitorService {
             devicePlanTask.setCreateTime(LocalDateTime.now());
             devicePlanTask.setTaskType("");//待拓展任务类型
             devicePlanTaskMapper.insert(devicePlanTask);
-            globalMemory.addDevicePlanPrepare(devicePlanTask);
+            siteMemory.addDevicePlanPrepare(devicePlanTask);
             //啥时候重置？每日0点？
             devicePlan.setDayTriggerFlag(true);
             devicePlan.setUpdateTime(LocalDateTime.now());
@@ -185,7 +185,7 @@ public class DevicePlanTaskMonitorService {
             if (endTime != null && endTime.isEqual(today)) {
                 devicePlan.setFinishTime(LocalDateTime.now());
                 devicePlan.setTaskStaus(DeviceTaskStaus.FINISH);
-                GlobalMemory.removeDevicePlan(devicePlan);
+                SiteMemory.removeDevicePlan(devicePlan);
             }
             devicePlanMapper.updateById(devicePlan);
         }
@@ -202,7 +202,7 @@ public class DevicePlanTaskMonitorService {
         ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
         executor.scheduleWithFixedDelay(() -> {
             try {
-                Map<String, List<DevicePlanTask>> planMap = GlobalMemory.devicePlanTaskPrepareMap;
+                Map<String, List<DevicePlanTask>> planMap = SiteMemory.devicePlanTaskPrepareMap;
                 if (!CollectionUtils.isEmpty(planMap.keySet())) {
                     planMap.keySet().forEach(key -> {
                         NettyDevice device = deviceSessionManager.getDevice(key);
@@ -221,9 +221,9 @@ public class DevicePlanTaskMonitorService {
                                     DevicePlanTask devicePlanTask = list.get(0);
                                     String deviceId = devicePlanTask.getDeviceId();
                                     if (!StringUtils.isEmpty(deviceId) && deviceId.equals(key)) {
-                                        GlobalMemory.addDevicePlanExecute(devicePlanTask);
+                                        SiteMemory.addDevicePlanExecute(devicePlanTask);
                                         device.setCurrentTaskId(devicePlanTask.getId());
-                                        GlobalMemory.removeDevicePlanPrepare(devicePlanTask);
+                                        SiteMemory.removeDevicePlanPrepare(devicePlanTask);
                                     }
                                 }
                             }
@@ -241,7 +241,7 @@ public class DevicePlanTaskMonitorService {
         ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
         executor.scheduleWithFixedDelay(() -> {
             try {
-                Map<String, DevicePlanTask> planMap = GlobalMemory.devicePlanTaskExecuteMap;
+                Map<String, DevicePlanTask> planMap = SiteMemory.devicePlanTaskExecuteMap;
                 if (!CollectionUtils.isEmpty(planMap.keySet())) {
                     planMap.keySet().forEach(key -> {
                         NettyDevice device = deviceSessionManager.getDevice(key);
diff --git a/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java b/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java
index e2fcc75..78989c4 100644
--- a/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java
+++ b/maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java
@@ -1,22 +1,18 @@
 package com.maibu.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.maibu.core.business.*;
 import com.maibu.core.domain.model.LoginUser;
-import com.maibu.domain.Device;
-import com.maibu.domain.DevicePlan;
-import com.maibu.domain.DevicePlanTask;
-import com.maibu.domain.DeviceTaskPlanRule;
+import com.maibu.core.enums.DeviceTaskStaus;
 import com.maibu.dto.DevicePlanStatisticsDTO;
 import com.maibu.dto.DevicePlanTaskStatisticsDTO;
 import com.maibu.dto.DeviceTaskQueryDTO;
 import com.maibu.dto.DeviceWorkStatisticsDTO;
-import com.maibu.enums.DeviceTaskStaus;
 import com.maibu.mapper.DeviceMapper;
 import com.maibu.mapper.DevicePlanMapper;
 import com.maibu.mapper.DevicePlanTaskMapper;
 import com.maibu.mapper.WorkRecordMapper;
-import com.maibu.memory.GlobalMemory;
-import com.maibu.model.WorkRecord;
+import com.maibu.memory.SiteMemory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +51,7 @@ public class DeviceTaskService {
             devicePlan.setUpdateTime(LocalDateTime.now());
             transferDays(devicePlan);
             int i = devicePlanMapper.updateById(devicePlan);
-            GlobalMemory.addDevicePlan(devicePlan);
+            SiteMemory.addDevicePlan(devicePlan);
             return i;
         } else {
             devicePlan.setTaskStaus(DeviceTaskStaus.NEW);
@@ -63,7 +59,7 @@ public class DeviceTaskService {
             devicePlan.setCreateBy(loginUser.getUsername());
             transferDays(devicePlan);
             int i = devicePlanMapper.insert(devicePlan);
-            GlobalMemory.addDevicePlan(devicePlan);
+            SiteMemory.addDevicePlan(devicePlan);
             return i;
         }
     }
@@ -148,7 +144,7 @@ public class DeviceTaskService {
         DevicePlan planTask = devicePlanMapper.selectById(id);
         if (planTask != null) {
             planTask.setDelFlag(1);
-            GlobalMemory.removeDevicePlan(planTask);
+            SiteMemory.removeDevicePlan(planTask);
             return devicePlanMapper.updateById(planTask);
         }
         return 0;
@@ -308,8 +304,8 @@ public class DeviceTaskService {
 
     public List<DevicePlanTask> deviceTaskPool(DeviceTaskQueryDTO dto) {
         List<DevicePlanTask> list = new ArrayList<>();
-        GlobalMemory.devicePlanTaskPrepareMap.values().forEach(list::addAll);
-        list.addAll(GlobalMemory.devicePlanTaskExecuteMap.values());
+        SiteMemory.devicePlanTaskPrepareMap.values().forEach(list::addAll);
+        list.addAll(SiteMemory.devicePlanTaskExecuteMap.values());
         if (dto != null) {
             if (dto.getTaskStaus() != null) {
                 list = list.stream().filter(x -> x.getTaskStaus().equals(dto.getTaskStaus())).collect(Collectors.toList());
diff --git a/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java b/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java
index 424aa14..223901e 100644
--- a/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java
+++ b/maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java
@@ -5,18 +5,18 @@ import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson2.JSON;
 import com.maibu.common.CommandConstant;
 import com.maibu.common.NettyCacheKey;
+import com.maibu.core.business.DeviceRunningStatusHistory;
+import com.maibu.core.business.DeviceStatusRecordDTO;
+import com.maibu.core.enums.CompareEnum;
+import com.maibu.core.enums.RespondCode;
 import com.maibu.core.redis.RedisCache;
-import com.maibu.domain.DeviceRunningStatusHistory;
-import com.maibu.domain.DeviceStatusRecordDTO;
 import com.maibu.dto.DeviceErrorPushDTO;
 import com.maibu.dto.DeviceErrorPushDetail;
-import com.maibu.dto.NettyDevice;
-import com.maibu.entity.ErrorIdentificationStandard;
-import com.maibu.enums.CompareEnum;
-import com.maibu.enums.RespondCode;
+import com.maibu.core.business.device.NettyDevice;
+import com.maibu.core.business.ErrorIdentificationStandard;
 import com.maibu.manager.DeviceSessionManager;
 import com.maibu.mapper.ErrorIdentificationStandardMapper;
-import com.maibu.memory.GlobalMemory;
+import com.maibu.memory.SiteMemory;
 import com.maibu.utils.CommandUtils;
 import com.maibu.utils.CompareUtils;
 import io.netty.buffer.ByteBuf;
@@ -47,7 +47,7 @@ public class DeviceThreadService {
     private ResourceLoader resourceLoader;
 
     @Autowired
-    private GlobalMemory globalMemory;
+    private SiteMemory siteMemory;
 
     @Autowired
     private RedisCache redisCache;
@@ -73,7 +73,7 @@ public class DeviceThreadService {
                         if (recordDTO != null && !CollectionUtils.isEmpty(recordDTO.getHistories())) {
                             recordDTO.getHistories().sort(Comparator.comparing(DeviceRunningStatusHistory::getCreateTime).reversed());
                             DeviceRunningStatusHistory history = recordDTO.getHistories().get(0);
-                            List<DeviceErrorPushDetail> compared = compareErrorStandard(history, globalMemory.standard);
+                            List<DeviceErrorPushDetail> compared = compareErrorStandard(history, siteMemory.standard);
 
                             String[] parts = k.split(":");
                             String deviceId = parts[1];
@@ -95,16 +95,16 @@ public class DeviceThreadService {
     }
 
     public void initStandard() throws IOException {
-        if (globalMemory.standard == null) {
+        if (siteMemory.standard == null) {
             List<ErrorIdentificationStandard> standards = standardMapper.selectList();
             if (CollectionUtils.isEmpty(standards)) {
                 // 读取resource目录下的device-config.json文件
                 Resource resource = resourceLoader.getResource("classpath:errorStandard.json");
                 // 使用fastjson2转换为DeviceConfig对象
                 String jsonContent = IoUtil.readUtf8(resource.getInputStream());
-                globalMemory.standard = JSON.parseArray(jsonContent, ErrorIdentificationStandard.class);
+                siteMemory.standard = JSON.parseArray(jsonContent, ErrorIdentificationStandard.class);
             } else {
-                globalMemory.standard = standards;
+                siteMemory.standard = standards;
             }
         }
     }
diff --git a/maibu-netty-server/src/main/java/com/maibu/service/NettyDeviceService.java b/maibu-netty-server/src/main/java/com/maibu/service/NettyDeviceService.java
index 2f499d6..b020c50 100644
--- a/maibu-netty-server/src/main/java/com/maibu/service/NettyDeviceService.java
+++ b/maibu-netty-server/src/main/java/com/maibu/service/NettyDeviceService.java
@@ -1,8 +1,8 @@
 package com.maibu.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.maibu.domain.DeviceRunningStatusHistory;
-import com.maibu.entity.ErrorIdentificationStandard;
+import com.maibu.core.business.DeviceRunningStatusHistory;
+import com.maibu.core.business.ErrorIdentificationStandard;
 import com.maibu.mapper.DeviceStatusHistoryMapper;
 import com.maibu.mapper.ErrorIdentificationStandardMapper;
 import lombok.extern.slf4j.Slf4j;
diff --git a/maibu-netty-server/src/main/java/com/maibu/service/TransferDeviceService.java b/maibu-netty-server/src/main/java/com/maibu/service/TransferDeviceService.java
index fee082c..07cd185 100644
--- a/maibu-netty-server/src/main/java/com/maibu/service/TransferDeviceService.java
+++ b/maibu-netty-server/src/main/java/com/maibu/service/TransferDeviceService.java
@@ -1,21 +1,22 @@
 package com.maibu.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.maibu.core.business.Device;
+import com.maibu.core.business.device.NettyDevice;
 import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.domain.entity.UserClient;
 import com.maibu.core.domain.model.LoginUser;
-import com.maibu.domain.Device;
-import com.maibu.dto.*;
-import com.maibu.enums.ConnectorStatus;
+import com.maibu.core.enums.ConnectorStatus;
 import com.maibu.manager.DeviceSessionManager;
 import com.maibu.mapper.DeviceMapper;
 import com.maibu.mapper.SysUserClientMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import com.maibu.dto.*;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -57,7 +58,7 @@ public class TransferDeviceService {
                 }
                 device.setTenantId(user.getUserId());
                 device.setTenantName(user.getUsername());
-                device.setUpdateTime(new Date());
+                device.setUpdateTime(LocalDateTime.now());
                 device.setDeviceAlias(deviceAlias);
                 device.setActiveTime(new Date());
                 iDeviceService.updateDeviceBySelf(device);
@@ -87,7 +88,7 @@ public class TransferDeviceService {
                 }
                 device.setTenantId(-1L);
                 device.setTenantName("");
-                device.setUpdateTime(new Date());
+                device.setUpdateTime(LocalDateTime.now());
                 device.setDeviceAlias("");
 //                deviceMapper.updateById(device);
                 iDeviceService.updateDeviceBySelf(device);
@@ -109,7 +110,7 @@ public class TransferDeviceService {
                                 //删除从的连接关系
                                 NettyDevice oldSlaveDevice = sessionManager.getDevice(oldSlave);
                                 if (oldSlaveDevice != null && !CollectionUtils.isEmpty(oldSlaveDevice.getConnectedConnectors())) {
-                                    Set<Connector> connectedDevices = oldSlaveDevice.getConnectedConnectors();
+                                    Set<com.maibu.core.business.device.Connector> connectedDevices = oldSlaveDevice.getConnectedConnectors();
                                     connectedDevices.removeIf(x -> x.getConnectorId().equals(masterId));
                                 }
                             }
@@ -143,7 +144,7 @@ public class TransferDeviceService {
                     return AjaxResult.error("无操作权限");
                 }
                 device.setDeviceAlias(bindDTO.getDeviceAlias());
-                device.setUpdateTime(new Date());
+                device.setUpdateTime(LocalDateTime.now());
                 device.setCreateBy(user.getUsername());
                 iDeviceService.updateDeviceBySelf(device);
                 return AjaxResult.success(true);
diff --git a/maibu-netty-server/src/main/java/com/maibu/utils/CompareUtils.java b/maibu-netty-server/src/main/java/com/maibu/utils/CompareUtils.java
index 4cd8d31..84637a6 100644
--- a/maibu-netty-server/src/main/java/com/maibu/utils/CompareUtils.java
+++ b/maibu-netty-server/src/main/java/com/maibu/utils/CompareUtils.java
@@ -1,6 +1,6 @@
 package com.maibu.utils;
 
-import com.maibu.enums.CompareEnum;
+import com.maibu.core.enums.CompareEnum;
 import lombok.extern.slf4j.Slf4j;
 
 /**
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java
index 9bff0c9..0bde849 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/DeviceController.java
@@ -1,11 +1,11 @@
 package com.maibu.controller;
 
 import com.maibu.annotation.Log;
+import com.maibu.core.business.Device;
+import com.maibu.core.business.DeviceRunStatistics;
 import com.maibu.core.controller.BaseController;
 import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.page.TableDataInfo;
-import com.maibu.domain.Device;
-import com.maibu.domain.DeviceRunStatistics;
 import com.maibu.enums.BusinessType;
 import com.maibu.mapper.DeviceRunStatisticsMapper;
 import com.maibu.mybatis.LambdaQueryWrapperX;
@@ -59,19 +59,12 @@ public class DeviceController extends BaseController {
     @ApiOperation("设备分页列表")
     public TableDataInfo list(Device device) {
         startPage();
-        // 限制当前用户机构
-        if (null == device.getDeptId()) {
-            device.setDeptId(getLoginUser().getDeptId());
-        }
         return getDataTable(deviceService.selectDeviceList(device));
     }
 
 
     @GetMapping("/userDevice")
     public AjaxResult userDevice(Device device) {
-        if (null == device.getDeptId()) {
-            device.setDeptId(100L);
-        }
         return AjaxResult.success(deviceService.selectDeviceList(device));
     }
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Category.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Category.java
deleted file mode 100644
index d15c18e..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Category.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.maibu.domain;
-
-import com.maibu.annotation.Excel;
-import com.maibu.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 产品分类对象 iot_category
- *
- * @author kerwincui
- * @date 2021-12-16
- */
-@ApiModel(value = "Category", description = "产品分类对象 iot_category")
-public class Category extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 产品分类ID */
-    @ApiModelProperty("产品分类ID")
-    private Long categoryId;
-
-    /** 产品分类名称 */
-    @ApiModelProperty("产品分类名称")
-    @Excel(name = "产品分类名称")
-    private String categoryName;
-
-    /** 租户ID */
-    @ApiModelProperty("租户ID")
-    @Excel(name = "租户ID")
-    private Long tenantId;
-
-    /** 租户名称 */
-    @ApiModelProperty("租户名称")
-    @Excel(name = "租户名称")
-    private String tenantName;
-
-    /** 是否系统通用（0-否，1-是） */
-    @ApiModelProperty("是否系统通用（0-否，1-是）")
-    @Excel(name = "是否系统通用", readConverterExp = "0=-否，1-是")
-    private Integer isSys;
-
-    /** 显示顺序 */
-    @ApiModelProperty("显示顺序")
-    @Excel(name = "显示顺序")
-    private Integer orderNum;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    @ApiModelProperty("删除标志（0代表存在 2代表删除）")
-    private String delFlag;
-
-    @ApiModelProperty("是否显示上级品类")
-    private Boolean showSenior;
-
-    @ApiModelProperty("是否是总账号")
-    private Boolean isAdmin;
-
-    @ApiModelProperty("机构ID")
-    private Long deptId;
-
-    public Boolean getShowSenior() {
-        return showSenior;
-    }
-
-    public void setShowSenior(Boolean showSenior) {
-        this.showSenior = showSenior;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Boolean getAdmin() {
-        return isAdmin;
-    }
-
-    public void setAdmin(Boolean admin) {
-        isAdmin = admin;
-    }
-
-    public void setCategoryId(Long categoryId)
-    {
-        this.categoryId = categoryId;
-    }
-
-    public Long getCategoryId()
-    {
-        return categoryId;
-    }
-    public void setCategoryName(String categoryName)
-    {
-        this.categoryName = categoryName;
-    }
-
-    public String getCategoryName()
-    {
-        return categoryName;
-    }
-    public void setTenantId(Long tenantId)
-    {
-        this.tenantId = tenantId;
-    }
-
-    public Long getTenantId()
-    {
-        return tenantId;
-    }
-    public void setTenantName(String tenantName)
-    {
-        this.tenantName = tenantName;
-    }
-
-    public String getTenantName()
-    {
-        return tenantName;
-    }
-    public void setIsSys(Integer isSys)
-    {
-        this.isSys = isSys;
-    }
-    public Integer getIsSys()
-    {
-        return isSys;
-    }
-
-    public void setOrderNum(Integer orderNum)
-    {
-        this.orderNum = orderNum;
-    }
-    public Integer getOrderNum()
-    {
-        return orderNum;
-    }
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("categoryId", getCategoryId())
-            .append("categoryName", getCategoryName())
-            .append("tenantId", getTenantId())
-            .append("tenantName", getTenantName())
-            .append("isSys", getIsSys())
-            .append("orderNum", getOrderNum())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Device.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Device.java
deleted file mode 100644
index b14f88d..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/Device.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package com.maibu.domain;
-
-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.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.maibu.annotation.Excel;
-import com.maibu.core.domain.BaseDO;
-import com.maibu.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Transient;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 设备对象 iot_device
- *
- * @author kerwincui
- * @date 2021-12-16
- */
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "Device", description = "设备对象 iot_device")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@Data
-@TableName("iot_device")
-public class Device extends BaseDO {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 设备编号
-     */
-    @ApiModelProperty("设备编号")
-    @Excel(name = "设备编号")
-    private String serialNumber;
-
-    /**
-     * 设备名称
-     */
-    @ApiModelProperty("设备名称")
-    @Excel(name = "设备名称")
-    private String deviceName;
-
-    /**
-     * 设备别名
-     */
-    @ApiModelProperty("设备别名")
-    @Excel(name = "设备别名")
-    private String deviceAlias;
-
-    /**
-     * 产品ID
-     */
-    @ApiModelProperty("产品ID")
-    @Excel(name = "产品ID")
-    private Long productId;
-
-    /**
-     * 产品名称
-     */
-    @ApiModelProperty("产品名称")
-    @Excel(name = "产品名称")
-    private String productName;
-
-
-    /**
-     * 租户ID
-     */
-    @ApiModelProperty("租户ID")
-    @Excel(name = "租户ID")
-    private Long tenantId;
-
-    /**
-     * 租户名称
-     */
-    @ApiModelProperty("租户名称")
-    @Excel(name = "租户名称")
-    private String tenantName;
-
-    /**
-     * 固件版本
-     */
-    @ApiModelProperty("固件版本")
-    @Excel(name = "固件版本")
-    private BigDecimal firmwareVersion;
-
-
-    /**
-     * WIFI固件版本
-     */
-    @ApiModelProperty("HTTP推送固件版本")
-    @Excel(name = "HTTP推送固件版本")
-    private BigDecimal wirelessVersion;
-
-    /**
-     * 设备类型（1-直连设备、2-网关设备、3-监控设备）
-     */
-    @ApiModelProperty("设备类型（1-直连设备、2-网关设备、3-监控设备 4-网关子设备）")
-    private Integer deviceType;
-
-    /**
-     * 设备状态（1-未激活，2-禁用，3-在线，4-离线）
-     */
-    @ApiModelProperty("设备状态（1-未激活，2-禁用，3-在线，4-离线）")
-    @Excel(name = "设备状态")
-    private Integer status;
-
-    /**
-     * 设备在线状态（1-在线，2-离线）
-     */
-    @ApiModelProperty("设备状态（1-在线，2-离线）")
-    @Excel(name = "设备在线状态")
-    private Integer onlineStatus;
-
-    @TableField(exist = false)
-    private Integer feStatus; //前端大屏显示 1任务中/2空闲/3离线
-
-    /**
-     * wifi信号强度（信号极好4格[-55— 0]，信号好3格[-70— -55]，信号一般2格[-85— -70]，信号差1格[-100— -85]）
-     */
-    @ApiModelProperty("wifi信号强度（信号极好4格[-55— 0]，信号好3格[-70— -55]，信号一般2格[-85— -70]，信号差1格[-100— -85]）")
-    @Excel(name = "wifi信号强度")
-    private Integer rssi;
-
-    /**
-     * 设备影子
-     */
-    @ApiModelProperty("是否启用设备影子(0=禁用，1=启用)")
-    private Integer isShadow;
-
-    /**
-     * 设备所在地址
-     */
-    @ApiModelProperty("设备所在地址")
-    @Excel(name = "设备所在地址")
-    private String networkAddress;
-
-    /**
-     * 设备入网IP
-     */
-    @ApiModelProperty("设备入网IP")
-    @Excel(name = "设备入网IP")
-    private String networkIp;
-
-    /**
-     * 设备经度
-     */
-    @ApiModelProperty("设备经度")
-    @Excel(name = "设备经度")
-    private BigDecimal longitude;
-
-    /**
-     * 设备纬度
-     */
-    @ApiModelProperty("设备纬度")
-    @Excel(name = "设备纬度")
-    private BigDecimal latitude;
-
-    /**
-     * 激活时间
-     */
-    @ApiModelProperty("激活时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "激活时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date activeTime;
-
-    /**
-     * 子设备网关编号
-     */
-    @ApiModelProperty("子设备网关编号")
-    @Excel(name = "网关设备编号(子设备使用)")
-    private String gwDevCode;
-
-    /**
-     * 物模型值
-     */
-    @ApiModelProperty("物模型值")
-    @Excel(name = "物模型")
-    private String thingsModelValue;
-
-    /**
-     * 图片地址
-     */
-    @ApiModelProperty("图片地址")
-    private String imgUrl;
-
-    /**
-     * 是否自定义位置
-     **/
-    @ApiModelProperty("定位方式(1=ip自动定位，2=设备定位，3=自定义)")
-    private Integer locationWay;
-
-    /**
-     * 设备摘要
-     **/
-    @ApiModelProperty("设备摘要")
-    private String summary;
-
-    /**
-     * 分组ID，用于分组查询
-     **/
-    @ApiModelProperty("分组ID，用于分组查询")
-    private Long groupId;
-
-    /**
-     * 是否设备所有者，用于查询
-     **/
-    @ApiModelProperty("是否设备所有者，用于查询")
-    private Integer isOwner;
-    /**
-     * 子设备数量
-     */
-    @ApiModelProperty("子设备数量")
-    private Integer subDeviceCount;
-    /**
-     * 是否是模拟设备
-     */
-    @ApiModelProperty("是否是模拟设备")
-    private Integer isSimulate;
-    /**
-     * 子设备地址
-     */
-    @ApiModelProperty("子设备地址")
-    private Integer slaveId;
-    /**
-     * 设备传输协议
-     */
-    @ApiModelProperty("设备传输协议")
-    private String transport;
-
-    @Transient
-    @ApiModelProperty("机构id")
-    private Long deptId;
-
-    @Transient
-    @ApiModelProperty("是否显示下级")
-    private Boolean showChild;
-
-    private List<Device> subDeviceList;
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    @ApiModelProperty("删除标志")
-    private String delFlag;
-
-    @Transient
-    @ApiModelProperty("用户id")
-    private Long userId;
-
-    /**
-     * 协议
-     */
-    private String protocolCode;
-
-    @TableField(exist = false)
-    private DeviceRunningStatusHistory lastRunningStatus;
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DevicePlan.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DevicePlan.java
deleted file mode 100644
index 9c224cc..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DevicePlan.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.maibu.domain;
-
-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.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.maibu.enums.DeviceTaskStaus;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName(value = "iot_device_plan", autoResultMap = true)
-public class DevicePlan {
-
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    private String deviceId;
-
-    @TableField(exist = false)
-    private String deviceAlias;
-
-    @TableField(exist = false)
-    private String taskStausTranslate; //任务状态
-
-    private String planName;
-
-    private DeviceTaskStaus taskStaus; //任务状态
-
-    private Long routeId; // 线路id
-
-    private Long userId; // 用户id
-
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private DeviceTaskPlanRule deviceTaskPlanRules;  //计划
-
-    private LocalDateTime createTime;
-
-    private String createBy;
-
-    private LocalDateTime updateTime;
-
-    private String updateBy;
-
-    private LocalDateTime finishTime;
-
-    private LocalDateTime startTime; //开始时间 时分秒
-
-    private int delFlag = 0; //删除状态 1删除
-
-    @TableField(exist = false)
-    private boolean dayTriggerFlag = false; //当天的任务是否已经生成
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DevicePlanTask.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DevicePlanTask.java
deleted file mode 100644
index 56bedf4..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DevicePlanTask.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.maibu.domain;
-
-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.maibu.enums.DeviceTaskStaus;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("iot_device_task")
-public class DevicePlanTask {
-
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    private Long planId; //归属于某个计划任务
-
-    private String deviceId;
-
-    private DeviceTaskStaus taskStaus; //任务状态
-
-    @TableField(exist = false)
-    private String taskStausTranslate; //任务状态
-
-    private Long routeId; // 线路id
-
-    private LocalDateTime finishTime;
-
-    private LocalDateTime startTime; //开始时间 时分秒
-
-    private LocalDateTime createTime; //创建时间
-
-    private String taskType; //任务类型分类
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceRunStatistics.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceRunStatistics.java
deleted file mode 100644
index fed300f..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceRunStatistics.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.maibu.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-
-@Data
-@TableName(" iot_device_run_statistics" )
-public class DeviceRunStatistics implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    private LocalDateTime startTime;
-
-    private LocalDateTime endTime;
-
-    private Double workArea; //作业面积
-
-    private Double distance;  //作业距离
-
-    private Long time; //时长 分钟
-
-    private String deviceId;
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceRunningStatusHistory.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceRunningStatusHistory.java
deleted file mode 100644
index 2496def..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceRunningStatusHistory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.maibu.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("iot_device_running_status_history")
-public class DeviceRunningStatusHistory implements Serializable {
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    private String deviceId;
-
-    private String voltage; //电压
-
-    private String leftTargetSpeed; // 左轮目标速度
-
-    private String rightTargetSpeed;//  右轮目标速度
-
-    private String leftMeasureSpeed;// 左轮测量速度
-
-    private String rightMeasureSpeed;//  右轮测量速度
-
-    private String leftCurrent;// 左轮电流
-
-    private String rightCurrent;// 右轮电流
-
-    private String leftMotorTemp;// 左轮温度
-
-    private String rightMotorTemp;// 右轮温度
-
-    private String chipTemp;//芯片温度
-
-    private String yaw;//偏航角
-
-    private String pitch;//仰俯角
-
-    private String roll;//翻滚角
-
-    private String satelliteCnt;//跟踪的卫星数
-
-    private String qual;//定位质量
-
-    private String headingStatus;//航向角状态
-
-    private String latitude;//纬度
-
-    private String longitude;//经度
-
-    private Date time;
-
-    private String cuttingSpeed;//割刀速度
-
-    private String controlMode;//控制模式
-
-    private String battery;//电池电量
-
-    private String workingArea;//作业面积
-
-    private String obstacleSign;//障碍物标志位
-
-    private Date createTime;
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceStatusRecordDTO.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceStatusRecordDTO.java
deleted file mode 100644
index fac9376..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceStatusRecordDTO.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.maibu.domain;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class DeviceStatusRecordDTO {
-    private List<DeviceRunningStatusHistory> histories;
-    private long lastRecordTime;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceTaskPlanRule.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceTaskPlanRule.java
deleted file mode 100644
index 2ff25f0..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/DeviceTaskPlanRule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.maibu.domain;
-
-import com.maibu.enums.DeviceTaskPlanRepeatType;
-import lombok.Data;
-
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.util.List;
-
-@Data
-public class DeviceTaskPlanRule {
-
-    private DeviceTaskPlanRepeatType type; //类型 天  周 月
-
-    private String startDate; //开始日期 年月
-
-    private String dayTime; //时分秒
-
-    private List<Integer> dayOfMonth; //月某天
-
-    private LocalDate endTime; //结束时间 时分秒
-
-    private List<DayOfWeek> days; //星期
-
-    private List<String> daysTranslate; //星期翻译
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/EventLog.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/EventLog.java
deleted file mode 100644
index 4ad9aa5..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/domain/EventLog.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.maibu.domain;
-
-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.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 事件日志对象 iot_event_log
- *
- * @author kerwincui
- * @date 2024-08-16
- */
-
-@ApiModel(value = "EventLog" , description = "事件日志 iot_event_log" )
-@Data
-@TableName("iot_event_log" )
-public class EventLog {
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 设备事件日志ID
-     */
-    @TableId(value = "log_id" , type = IdType.AUTO)
-    private Long logId;
-
-
-    /**
-     * 标识符
-     */
-    @ApiModelProperty("标识符" )
-    private String identity;
-
-
-    /**
-     * 物模型名称
-     */
-    @ApiModelProperty("物模型名称" )
-    private String modelName;
-
-
-    /**
-     * 类型（3=事件上报，5=设备上线，6=设备离线）
-     */
-    @ApiModelProperty("类型" )
-    private Integer logType;
-
-
-    /**
-     * 日志值
-     */
-    @ApiModelProperty("日志值" )
-    private String logValue;
-
-
-    /**
-     * 设备ID
-     */
-    @ApiModelProperty("设备ID" )
-    private Long deviceId;
-
-
-    /**
-     * 设备名称
-     */
-    @ApiModelProperty("设备名称" )
-    private String deviceName;
-
-
-    /**
-     * 设备编号
-     */
-    @ApiModelProperty("设备编号" )
-    private String serialNumber;
-
-
-    /**
-     * 是否监测数据（1=是，0=否）
-     */
-    @ApiModelProperty("是否监测数据" )
-    private Integer isMonitor;
-
-
-    /**
-     * 模式(1=影子模式，2=在线模式，3=其他)
-     */
-    @ApiModelProperty("模式(1=影子模式，2=在线模式，3=其他)" )
-    private Integer mode;
-
-
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty("用户ID" )
-    private Long userId;
-
-
-    /**
-     * 用户昵称
-     */
-    @ApiModelProperty("用户昵称" )
-    private String userName;
-
-
-    /**
-     * 租户ID
-     */
-    @ApiModelProperty("租户ID" )
-    private Long tenantId;
-
-
-    /**
-     * 租户名称
-     */
-    @ApiModelProperty("租户名称" )
-    private String tenantName;
-
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty("备注" )
-    private String remark;
-
-    @TableField(exist = false)
-    private List<String> identityList;
-
-
-    @TableField(exist = false)
-    @ApiModelProperty("请求参数")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> params;
-
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
-    public void setParams(Map<String, Object> params)
-    {
-        this.params = params;
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/ConnectType.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/ConnectType.java
deleted file mode 100644
index 562ea2f..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/ConnectType.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public enum ConnectType {
-
-    TCP,
-
-    MQTT,
-
-    HTTP;
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceTaskPlanRepeatType.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceTaskPlanRepeatType.java
deleted file mode 100644
index 6a949f5..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceTaskPlanRepeatType.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum DeviceTaskPlanRepeatType {
-
-    DAY("DAY","天"),
-    WEEK("WEEK","周"),
-    MONTH("MONTH","月");
-//    ONCE("ONCE","单次");
-
-    private final String code;
-    private final String description;
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceTaskStaus.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceTaskStaus.java
deleted file mode 100644
index 96f78b3..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceTaskStaus.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum DeviceTaskStaus {
-
-    NEW("NEW","新建"),
-    EXECUTING("EXECUTING","执行中"),
-    PAUSE("PAUSE","暂停中"),
-    FINISH("FINISH","执行成功"),
-    FAILED("FAILED","执行失败");
-
-
-    private final String code;
-    private final String description;
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceType.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceType.java
deleted file mode 100644
index fc4728d..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/enums/DeviceType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.maibu.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public enum DeviceType {
-    /**
-     * 未知
-     */
-    UNKNOWN(0, "未知"),
-    /**
-     * 直连设备
-     */
-    DIRECT_DEVICE(1, "直连设备"),
-    /**
-     * 网关设备
-     */
-    GATEWAY(2, "网关设备"),
-    /**
-     * 监控设备
-     */
-    CAMERA(3, "监控设备"),
-    /**
-     * 网关子设备
-     */
-    SUB_GATEWAY(4,"网关子设备");
-
-    private int code;
-    private String desc;
-
-    public static DeviceType transfer(Integer code){
-        for (DeviceType value : DeviceType.values()) {
-            if (value.code == code){
-                return value;
-            }
-        }
-        return DeviceType.DIRECT_DEVICE;
-    }
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/CategoryMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/CategoryMapper.java
deleted file mode 100644
index f0f66bb..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/CategoryMapper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.maibu.mapper;
-
-import com.maibu.domain.Category;
-import com.maibu.model.IdAndName;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 产品分类Mapper接口
- * 
- * @author kerwincui
- * @date 2021-12-16
- */
-@Repository
-public interface CategoryMapper 
-{
-    /**
-     * 查询产品分类
-     * 
-     * @param categoryId 产品分类主键
-     * @return 产品分类
-     */
-    public Category selectCategoryByCategoryId(Long categoryId);
-
-    /**
-     * 查询产品分类列表
-     * 
-     * @param category 产品分类
-     * @return 产品分类集合
-     */
-    public List<Category> selectCategoryList(Category category);
-
-    /**
-     * 查询产品简短分类列表
-     *
-     * @return 产品分类集合
-     */
-    public List<IdAndName> selectCategoryShortList(Category category);
-
-    /**
-     * 新增产品分类
-     * 
-     * @param category 产品分类
-     * @return 结果
-     */
-    public int insertCategory(Category category);
-
-    /**
-     * 修改产品分类
-     * 
-     * @param category 产品分类
-     * @return 结果
-     */
-    public int updateCategory(Category category);
-
-    /**
-     * 删除产品分类
-     * 
-     * @param categoryId 产品分类主键
-     * @return 结果
-     */
-    public int deleteCategoryByCategoryId(Long categoryId);
-
-    /**
-     * 批量删除产品分类
-     * 
-     * @param categoryIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteCategoryByCategoryIds(Long[] categoryIds);
-
-    /**
-     * 分类下的产品数量
-     *
-     * @param categoryIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int productCountInCategorys(Long[] categoryIds);
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java
index 81d20c6..0da43a8 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceMapper.java
@@ -1,6 +1,6 @@
 package com.maibu.mapper;
 
-import com.maibu.domain.Device;
+import com.maibu.core.business.Device;
 import com.maibu.mybatis.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanMapper.java
index 0b4f5bb..88fcdfa 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanMapper.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanMapper.java
@@ -1,6 +1,6 @@
 package com.maibu.mapper;
 
-import com.maibu.domain.DevicePlan;
+import com.maibu.core.business.DevicePlan;
 import com.maibu.mybatis.mapper.BaseMapperX;
 import org.springframework.stereotype.Repository;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java
index d489c57..cd2656a 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DevicePlanTaskMapper.java
@@ -1,6 +1,6 @@
 package com.maibu.mapper;
 
-import com.maibu.domain.DevicePlanTask;
+import com.maibu.core.business.DevicePlanTask;
 import com.maibu.mybatis.mapper.BaseMapperX;
 import org.springframework.stereotype.Repository;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceRunStatisticsMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceRunStatisticsMapper.java
index 76e8863..b12c56e 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceRunStatisticsMapper.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceRunStatisticsMapper.java
@@ -1,6 +1,6 @@
 package com.maibu.mapper;
 
-import com.maibu.domain.DeviceRunStatistics;
+import com.maibu.core.business.DeviceRunStatistics;
 import com.maibu.mybatis.mapper.BaseMapperX;
 import org.springframework.stereotype.Repository;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceStatusHistoryMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceStatusHistoryMapper.java
index cde6765..81cbf29 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceStatusHistoryMapper.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/DeviceStatusHistoryMapper.java
@@ -1,6 +1,6 @@
 package com.maibu.mapper;
 
-import com.maibu.domain.DeviceRunningStatusHistory;
+import com.maibu.core.business.DeviceRunningStatusHistory;
 import com.maibu.mybatis.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/EventLogMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/EventLogMapper.java
index 654a1a6..6285951 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/EventLogMapper.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/EventLogMapper.java
@@ -1,8 +1,8 @@
 package com.maibu.mapper;
 
 
-import com.maibu.domain.EventLog;
-import com.maibu.model.HistoryModel;
+import com.maibu.core.business.EventLog;
+import com.maibu.core.business.HistoryModel;
 import com.maibu.mybatis.mapper.BaseMapperX;
 
 import java.util.List;
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/IoTCommonDevicesMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/IoTCommonDevicesMapper.java
index d587071..c85bdd8 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/IoTCommonDevicesMapper.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/IoTCommonDevicesMapper.java
@@ -1,6 +1,6 @@
 package com.maibu.mapper;
 
-import com.maibu.domain.IoTCommonDevice;
+import com.maibu.core.business.IoTCommonDevice;
 import com.maibu.mybatis.mapper.BaseMapperX;
 import org.springframework.stereotype.Repository;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/MqttClientMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/MqttClientMapper.java
deleted file mode 100644
index 0ca3614..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/MqttClientMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.maibu.mapper;
-
-
-import org.eclipse.paho.client.mqttv3.MqttClient;
-
-import java.util.List;
-
-/**
- * mqtt桥接配置表Mapper接口
- * 
- * @author gx_ma
- * @date 2024-06-03
- */
-public interface MqttClientMapper 
-{
-    /**
-     * 查询mqtt桥接配置表
-     * 
-     * @param id mqtt桥接配置表主键
-     * @return mqtt桥接配置表
-     */
-    public MqttClient selectMqttClientById(Long id);
-
-    /**
-     * 查询mqtt桥接配置表列表
-     * 
-     * @param mqttClient mqtt桥接配置表
-     * @return mqtt桥接配置表集合
-     */
-    public List<MqttClient> selectMqttClientList(MqttClient mqttClient);
-
-    /**
-     * 新增mqtt桥接配置表
-     * 
-     * @param mqttClient mqtt桥接配置表
-     * @return 结果
-     */
-    public int insertMqttClient(MqttClient mqttClient);
-
-    /**
-     * 修改mqtt桥接配置表
-     * 
-     * @param mqttClient mqtt桥接配置表
-     * @return 结果
-     */
-    public int updateMqttClient(MqttClient mqttClient);
-
-    /**
-     * 删除mqtt桥接配置表
-     * 
-     * @param id mqtt桥接配置表主键
-     * @return 结果
-     */
-    public int deleteMqttClientById(Long id);
-
-    /**
-     * 批量删除mqtt桥接配置表
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteMqttClientByIds(Long[] ids);
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/WorkRecordMapper.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/WorkRecordMapper.java
index 4bab353..9f9c1d3 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/WorkRecordMapper.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper/WorkRecordMapper.java
@@ -1,7 +1,8 @@
 package com.maibu.mapper;
 
 
-import com.maibu.model.WorkRecord;
+
+import com.maibu.core.business.WorkRecord;
 
 import java.util.List;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/memory/CommonMemory.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/memory/CommonMemory.java
deleted file mode 100644
index 14246ab..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/memory/CommonMemory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.maibu.memory;
-
-
-import com.maibu.domain.IoTCommonDevice;
-import com.maibu.domain.IoTCommonProduct;
-import lombok.Data;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-@Component
-@Data
-public class CommonMemory {
-
-    public static ConcurrentHashMap<String, IoTCommonDevice> commonDeviceMap = new ConcurrentHashMap<>();
-
-    public static ConcurrentHashMap<String, IoTCommonDevice> unRegisterCommonDeviceMap = new ConcurrentHashMap<>();
-
-    public static ConcurrentHashMap<Long, IoTCommonProduct> productMap = new ConcurrentHashMap<>();
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/AuthenticateInputModel.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/AuthenticateInputModel.java
deleted file mode 100644
index 0b67a77..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/AuthenticateInputModel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.maibu.model;
-
-/**
- * 动作
- * @author kerwincui
- * @date 2021-12-16
- */
-public class AuthenticateInputModel
-{
-    /** 设备编号 */
-    private String serialNumber;
-
-    /** 产品ID */
-    private Long productId;
-
-    public AuthenticateInputModel(String serialNumber,Long productId){
-        this.serialNumber=serialNumber;
-        this.productId=productId;
-    }
-
-    public String getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setSerialNumber(String serialNumber) {
-        this.serialNumber = serialNumber;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceAlertCount.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceAlertCount.java
deleted file mode 100644
index 2398234..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceAlertCount.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.maibu.model;
-
-import lombok.Data;
-
-@Data
-public class DeviceAlertCount {
-    private String serialNumber;
-    private String sceneId;
-    private Integer alertCount;
-    private Integer noprocessedCount;
-    private Integer processedCount;
-    private Integer unprocessedCount;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceAllShortOutput.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceAllShortOutput.java
deleted file mode 100644
index 62ec322..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceAllShortOutput.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.maibu.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 设备对象 iot_device
- *
- * @author kerwincui
- * @date 2021-12-16
- */
-public class DeviceAllShortOutput
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 产品分类ID */
-    private Long deviceId;
-
-    /** 产品分类名称 */
-    private String deviceName;
-
-    /** 产品名称 */
-    private String productName;
-
-    /** 设备类型（1-直连设备、2-网关子设备、3-网关设备） */
-    private Integer deviceType;
-
-    /** 用户昵称 */
-    private String userName;
-
-    /** 设备编号 */
-    private String serialNumber;
-
-    /** 固件版本 */
-    private BigDecimal firmwareVersion;
-
-    /** 设备状态（1-未激活，2-禁用，3-在线，4-离线） */
-    private Integer status;
-
-    /** 设备影子 */
-    private Integer isShadow;
-
-    /** wifi信号强度（信号极好4格[-55— 0]，信号好3格[-70— -55]，信号一般2格[-85— -70]，信号差1格[-100— -85]） */
-    private Integer rssi;
-
-    /** 激活时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date activeTime;
-
-    /** 是否自定义位置 **/
-    private Integer locationWay;
-
-    /** 设备地址 */
-    private String networkAddress;
-
-    /** 经度 */
-    private BigDecimal longitude;
-
-    /** 纬度 */
-    private BigDecimal latitude;
-
-    /** 是否设备所有者，用于查询 **/
-    private Integer isOwner;
-
-    private Integer subDeviceCount;
-
-    public Integer getSubDeviceCount() {
-        return subDeviceCount;
-    }
-
-    public void setSubDeviceCount(Integer subDeviceCount) {
-        this.subDeviceCount = subDeviceCount;
-    }
-
-    public Integer getLocationWay() {
-        return locationWay;
-    }
-
-    public void setLocationWay(Integer locationWay) {
-        this.locationWay = locationWay;
-    }
-
-    public Integer getIsOwner() {
-        return isOwner;
-    }
-
-    public void setIsOwner(Integer isOwner) {
-        this.isOwner = isOwner;
-    }
-
-    public String getNetworkAddress() {
-        return networkAddress;
-    }
-
-    public void setNetworkAddress(String networkAddress) {
-        this.networkAddress = networkAddress;
-    }
-
-    public BigDecimal getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(BigDecimal longitude) {
-        this.longitude = longitude;
-    }
-
-    public BigDecimal getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(BigDecimal latitude) {
-        this.latitude = latitude;
-    }
-
-    public Integer getIsShadow() {
-        return isShadow;
-    }
-
-    public void setIsShadow(Integer isShadow) {
-        this.isShadow = isShadow;
-    }
-
-    public void setRssi(Integer rssi)
-    {
-        this.rssi = rssi;
-    }
-
-    public Integer getRssi()
-    {
-        return rssi;
-    }
-
-    public void setDeviceId(Long deviceId)
-    {
-        this.deviceId = deviceId;
-    }
-
-    public Long getDeviceId()
-    {
-        return deviceId;
-    }
-    public void setDeviceName(String deviceName)
-    {
-        this.deviceName = deviceName;
-    }
-
-    public String getDeviceName()
-    {
-        return deviceName;
-    }
-
-    public void setProductName(String productName)
-    {
-        this.productName = productName;
-    }
-
-    public String getProductName()
-    {
-        return productName;
-    }
-    public void setDeviceType(Integer deviceType)
-    {
-        this.deviceType = deviceType;
-    }
-
-    public Integer getDeviceType()
-    {
-        return deviceType;
-    }
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-    public Integer getStatus()
-    {
-        return status;
-    }
-
-    public void setSerialNumber(String serialNumber)
-    {
-        this.serialNumber = serialNumber;
-    }
-
-    public String getSerialNumber()
-    {
-        return serialNumber;
-    }
-    public void setFirmwareVersion(BigDecimal firmwareVersion)
-    {
-        this.firmwareVersion = firmwareVersion;
-    }
-
-    public BigDecimal getFirmwareVersion()
-    {
-        return firmwareVersion;
-    }
-
-    public void setActiveTime(Date activeTime)
-    {
-        this.activeTime = activeTime;
-    }
-
-    public Date getActiveTime()
-    {
-        return activeTime;
-    }
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceMqttVO.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceMqttVO.java
deleted file mode 100644
index c628b73..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceMqttVO.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.maibu.model;
-
-/**
- * MQTT连接相关参数实体类
- * @author fastb
- * @date 2023-08-02 17:09
- */
-public class DeviceMqttVO {
-
-    /**
-     * 设备主键id
-     */
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    private String serialNumber;
-
-    /**
-     * 产品id
-     */
-    private Long productId;
-
-    /**
-     * 用户id
-     */
-    private Long tenantId;
-
-    /**
-     * mqtt连接账号
-     */
-    private String mqttAccount;
-
-    /**
-     * mqtt连接密码
-     */
-    private String mqttPassword;
-
-    /**
-     * 产品密匙
-     */
-    private String mqttSecret;
-
-    /**
-     * 是否启用授权码（0-否，1-是）
-     */
-    private Integer isAuthorize;
-
-    private String transport;
-
-    /**
-     * 认证方式
-     */
-    private Integer vertificateMethod;
-
-    public String getTransport() {
-        return transport;
-    }
-
-    public void setTransport(String transport) {
-        this.transport = transport;
-    }
-
-    public Integer getVertificateMethod() {
-        return vertificateMethod;
-    }
-
-    public void setVertificateMethod(Integer vertificateMethod) {
-        this.vertificateMethod = vertificateMethod;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public String getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setSerialNumber(String serialNumber) {
-        this.serialNumber = serialNumber;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public Long getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(Long tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getMqttAccount() {
-        return mqttAccount;
-    }
-
-    public void setMqttAccount(String mqttAccount) {
-        this.mqttAccount = mqttAccount;
-    }
-
-    public String getMqttPassword() {
-        return mqttPassword;
-    }
-
-    public void setMqttPassword(String mqttPassword) {
-        this.mqttPassword = mqttPassword;
-    }
-
-    public String getMqttSecret() {
-        return mqttSecret;
-    }
-
-    public void setMqttSecret(String mqttSecret) {
-        this.mqttSecret = mqttSecret;
-    }
-
-    public Integer getIsAuthorize() {
-        return isAuthorize;
-    }
-
-    public void setIsAuthorize(Integer isAuthorize) {
-        this.isAuthorize = isAuthorize;
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceNumberStatus.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceNumberStatus.java
deleted file mode 100644
index db2cfa9..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceNumberStatus.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.maibu.model;
-
-import lombok.Data;
-
-/**
- * @author kerwincui
- * @date 2024-02-06 11:18
- */
-@Data
-public class DeviceNumberStatus {
-
-    /**
-     * 设备编号
-     */
-    private String serialNumber;
-
-    /**
-     * 设备状态（1-未激活，2-禁用，3-在线，4-离线）
-     */
-    private int  status;
-
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceRelateAlertLogVO.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceRelateAlertLogVO.java
deleted file mode 100644
index 58ca666..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceRelateAlertLogVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.maibu.model;
-
-import lombok.Data;
-
-/**
- * @author fastb
- * @date 2023-09-13 11:18
- */
-@Data
-public class DeviceRelateAlertLogVO {
-
-    /**
-     * 设备ID
-     */
-    private Long deviceId;
-
-    /**
-     * 设备编号
-     */
-    private String serialNumber;
-
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-
-    /**
-     * 用户ID
-     */
-    private Long userId;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceRunningStatus.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceRunningStatus.java
deleted file mode 100644
index 45dd3fe..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceRunningStatus.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.maibu.model;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class DeviceRunningStatus implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-    /** 产品分类ID */
-    private String deviceId;
-
-    private String voltage;
-
-    private String leftTargetSpeed;
-
-    private String rightTargetSpeed;
-
-    private String leftMeasureSpeed;
-
-    private String rightMeasureSpeed;
-
-    private String leftCurrent;
-
-    private String rightCurrent;
-
-    private String leftMotorTemp;
-
-    private String rightMotorTemp;
-
-    private String chipTemp;
-
-    private String yaw;
-
-    private String pitch;
-
-    private String roll;
-
-    private String satelliteCnt;
-
-    private String qual;
-
-    private String headingStatus;
-
-    private String latitude;
-
-    private String longitude;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceStatistic.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceStatistic.java
deleted file mode 100644
index bab9e96..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceStatistic.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.maibu.model;
-
-/**
- * id和name
- *
- * @author kerwincui
- * @date 2021-12-16
- */
-public class DeviceStatistic
-{
-    /** 设备数量 **/
-    private int deviceCount;
-
-    /** 设备数量 **/
-    private int deviceOnlineCount;
-
-    /** 产品数量 **/
-    private int productCount;
-
-    /** 告警 **/
-    private long alertCount;
-
-    /** 属性上报 **/
-    private long propertyCount;
-
-    /** 功能上报 **/
-    private long functionCount;
-
-    /** 事件上报 **/
-    private long eventCount;
-
-    /** 监测数据上报 **/
-    private long monitorCount;
-
-    /** 告警设备数量 **/
-    private long alertDeviceCount;
-
-    /** 设备离线数量 **/
-    private int deviceOfflineCount;
-
-    /** 告警未处理数量 **/
-    private long alertNotProcessedCount;
-
-    /** 告警已处理数量 **/
-    private long alertProcessedCount;
-
-    public long getAlertNotProcessedCount() {
-        return alertNotProcessedCount;
-    }
-
-    public void setAlertNotProcessedCount(long alertNotProcessedCount) {
-        this.alertNotProcessedCount = alertNotProcessedCount;
-    }
-
-    public long getAlertProcessedCount() {
-        return alertProcessedCount;
-    }
-
-    public void setAlertProcessedCount(long alertProcessedCount) {
-        this.alertProcessedCount = alertProcessedCount;
-    }
-
-
-    public long getAlertDeviceCount() {
-        return alertDeviceCount;
-    }
-
-    public void setAlertDeviceCount(long alertDeviceCount) {
-        this.alertDeviceCount = alertDeviceCount;
-    }
-
-    public int getDeviceOfflineCount() {
-        return deviceOfflineCount;
-    }
-
-    public void setDeviceOfflineCount(int deviceOfflineCount) {
-        this.deviceOfflineCount = deviceOfflineCount;
-    }
-
-    public int getDeviceOnlineCount() {
-        return deviceOnlineCount;
-    }
-
-    public void setDeviceOnlineCount(int deviceOnlineCount) {
-        this.deviceOnlineCount = deviceOnlineCount;
-    }
-
-    public long getMonitorCount() {
-        return monitorCount;
-    }
-
-    public void setMonitorCount(long monitorCount) {
-        this.monitorCount = monitorCount;
-    }
-
-    public int getDeviceCount() {
-        return deviceCount;
-    }
-
-    public void setDeviceCount(int deviceCount) {
-        this.deviceCount = deviceCount;
-    }
-
-    public int getProductCount() {
-        return productCount;
-    }
-
-    public void setProductCount(int productCount) {
-        this.productCount = productCount;
-    }
-
-    public long getAlertCount() {
-        return alertCount;
-    }
-
-    public void setAlertCount(long alertCount) {
-        this.alertCount = alertCount;
-    }
-
-    public long getPropertyCount() {
-        return propertyCount;
-    }
-
-    public void setPropertyCount(long propertyCount) {
-        this.propertyCount = propertyCount;
-    }
-
-    public long getFunctionCount() {
-        return functionCount;
-    }
-
-    public void setFunctionCount(long functionCount) {
-        this.functionCount = functionCount;
-    }
-
-    public long getEventCount() {
-        return eventCount;
-    }
-
-    public void setEventCount(long eventCount) {
-        this.eventCount = eventCount;
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceStatusVO.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceStatusVO.java
deleted file mode 100644
index b1c030e..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/DeviceStatusVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.maibu.model;
-
-import lombok.Data;
-
-/**
- * 设备状态
- * @author gsb
- * @date 2024/4/11 10:39
- */
-@Data
-public class DeviceStatusVO {
-
-    private String serialNumber;
-
-    private Integer status;
-
-    private String transport;
-
-    private Long productId;
-
-    private Integer deviceType;
-
-    private Integer rssi;
-
-    private Integer isShadow;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/HistoryModel.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/HistoryModel.java
deleted file mode 100644
index aea660b..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/HistoryModel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.maibu.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author bill
- */
-@Data
-public class HistoryModel {
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date time;
-
-    private String value;
-
-    private String identity;
-
-    private String moderName;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/IdAndName.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/IdAndName.java
deleted file mode 100644
index 2d3e22e..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/IdAndName.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.maibu.model;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * id和name
- * 
- * @author kerwincui
- * @date 2021-12-16
- */
-public class IdAndName
-{
-    private Long id;
-
-    private String name;
-
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-    public Long getId()
-    {
-        return id;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-    public String getName()
-    {
-        return name;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("categoryId", getId())
-            .append("categoryName", getName())
-            .toString();
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/MonitorModel.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/MonitorModel.java
deleted file mode 100644
index 31afa3b..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/MonitorModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.maibu.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-/**
- * 动作
- * @author kerwincui
- * @date 2021-12-16
- */
-public class MonitorModel
-{
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date time;
-
-    private String value;
-
-    public Date getTime() {
-        return time;
-    }
-
-    public void setTime(Date time) {
-        this.time = time;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-        }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/ProductAuthenticateModel.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/ProductAuthenticateModel.java
deleted file mode 100644
index e84d83d..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/ProductAuthenticateModel.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.maibu.model;
-
-
-public class ProductAuthenticateModel {
-    /** 产品分类ID */
-    private Long deviceId;
-
-    /** 产品分类名称 */
-    private String deviceName;
-
-    /**设备状态（1-未激活，2-禁用，3-在线，4-离线）**/
-    private int status;
-
-    /** 产品ID */
-    private Long productId;
-
-    /** 产品名称 */
-    private String productName;
-
-    /** 产品状态 1-未发布，2-已发布 */
-    private int productStatus;
-
-    /** 是否启用授权码（0-否，1-是） */
-    private Integer isAuthorize;
-
-    /** 设备编号 */
-    private String serialNumber;
-
-    /** mqtt账号 */
-    private String mqttAccount;
-
-    /** mqtt密码 */
-    private String mqttPassword;
-
-    /** 产品秘钥 */
-    private String mqttSecret;
-
-    private int vertificateMethod;
-
-    public int getVertificateMethod() {
-        return vertificateMethod;
-    }
-
-    public void setVertificateMethod(int vertificateMethod) {
-        this.vertificateMethod = vertificateMethod;
-    }
-
-    public Integer getIsAuthorize() {
-        return isAuthorize;
-    }
-
-    public void setIsAuthorize(Integer isAuthorize) {
-        this.isAuthorize = isAuthorize;
-    }
-
-    public int getProductStatus() {
-        return productStatus;
-    }
-
-    public void setProductStatus(int productStatus) {
-        this.productStatus = productStatus;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setSerialNumber(String serialNumber) {
-        this.serialNumber = serialNumber;
-    }
-
-    public String getMqttAccount() {
-        return mqttAccount;
-    }
-
-    public void setMqttAccount(String mqttAccount) {
-        this.mqttAccount = mqttAccount;
-    }
-
-    public String getMqttPassword() {
-        return mqttPassword;
-    }
-
-    public void setMqttPassword(String mqttPassword) {
-        this.mqttPassword = mqttPassword;
-    }
-
-    public String getMqttSecret() {
-        return mqttSecret;
-    }
-
-    public void setMqttSecret(String mqttSecret) {
-        this.mqttSecret = mqttSecret;
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/ProductCode.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/ProductCode.java
deleted file mode 100644
index 6797a29..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/ProductCode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.maibu.model;
-
-import lombok.Data;
-
-/**
- * @author gsb
- * @date 2023/9/4 17:23
- */
-@Data
-public class ProductCode {
-
-    /**
-     * 产品id
-     */
-    private Long productId;
-    /**
-     * 协议编号
-     */
-    private String protocolCode;
-
-    private String serialNumber;
-
-    private Long userId;
-
-    private String transport;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/RegisterUserInput.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/RegisterUserInput.java
deleted file mode 100644
index e8eb44a..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/RegisterUserInput.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.maibu.model;
-
-public class RegisterUserInput {
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    /**
-     * 验证码
-     */
-    private String code;
-
-    private String phonenumber;
-
-    /**
-     * 唯一标识
-     */
-    private String uuid = "";
-
-    private Long deptId = null;
-
-    private Long[] roleIds = null;
-
-    /**
-     * 登录平台  1-web端；2-移动端；3-小程序
-     */
-    private Integer sourceType;
-
-    /**
-     * 验证码类型 1-系统验证码；2-短信验证码
-     */
-    private Integer verifyType = 1;
-
-    public Integer getVerifyType() {
-        return verifyType;
-    }
-
-    public void setVerifyType(Integer verifyType) {
-        this.verifyType = verifyType;
-    }
-
-    public Integer getSourceType() {
-        return sourceType;
-    }
-
-    public void setSourceType(Integer sourceType) {
-        this.sourceType = sourceType;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public Long[] getRoleIds() {
-        return roleIds;
-    }
-
-    public void setRoleIds(Long[] roleIds) {
-        this.roleIds = roleIds;
-    }
-
-    public String getPhonenumber() {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber) {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getUsername()
-    {
-        return username;
-    }
-
-    public void setUsername(String username)
-    {
-        this.username = username;
-    }
-
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-
-    public String getCode()
-    {
-        return code;
-    }
-
-    public void setCode(String code)
-    {
-        this.code = code;
-    }
-
-    public String getUuid()
-    {
-        return uuid;
-    }
-
-    public void setUuid(String uuid)
-    {
-        this.uuid = uuid;
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/RegisterUserOutput.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/RegisterUserOutput.java
deleted file mode 100644
index 6fc6449..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/RegisterUserOutput.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.maibu.model;
-
-import lombok.Data;
-
-/**
- * @author fastb
- * @date 2023-08-17 11:46
- */
-@Data
-public class RegisterUserOutput {
-
-    /**
-     * 错误信息
-     */
-    private String msg;
-
-    /**
-     * 用户id
-     */
-    private Long sysUserId;
-
-    /**
-     * 加密密码
-     */
-    private String encryptPassword;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/UserIdDeviceIdModel.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/UserIdDeviceIdModel.java
deleted file mode 100644
index d8c7007..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/UserIdDeviceIdModel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.maibu.model;
-
-/**
- * 用户ID和设备ID模型
- * 
- * @author kerwincui
- * @date 2021-12-16
- */
-public class UserIdDeviceIdModel
-{
-    private Long userId;
-
-    private Long deviceId;
-
-    public UserIdDeviceIdModel(Long userId, Long deviceId){
-        this.userId=userId;
-        this.deviceId=deviceId;
-    }
-
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/UserSocialProfile.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/UserSocialProfile.java
deleted file mode 100644
index 5008234..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/UserSocialProfile.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.maibu.model;
-
-import com.maibu.annotation.Excel;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public class UserSocialProfile {
-    /**
-     * 第三方系统用户表主键
-     */
-    private Long socialUserId;
-
-    /**
-     * 第三方用户来源
-     */
-    @Excel(name = "第三方用户来源")
-    private String source;
-
-    /**
-     * 用户名
-     */
-    @Excel(name = "用户名")
-    private String username;
-
-    /**
-     * 用户昵称
-     */
-    @Excel(name = "用户昵称")
-    private String nickname;
-
-    /**
-     * 用户头像
-     */
-    @Excel(name = "用户头像")
-    private String avatar;
-
-    /**
-     * 绑定状态(0:未绑定,1:绑定)
-     */
-    @Excel(name = "绑定状态(0:未绑定,1:绑定)")
-    private String status;
-
-    /**
-     * 第三方具体来源
-     */
-    private String sourceClient;
-
-    public String getSourceClient() {
-        return sourceClient;
-    }
-
-    public void setSourceClient(String sourceClient) {
-        this.sourceClient = sourceClient;
-    }
-
-    public Long getSocialUserId() {
-        return socialUserId;
-    }
-
-    public void setSocialUserId(Long socialUserId) {
-        this.socialUserId = socialUserId;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("socialUserId", getSocialUserId())
-                .append("source", getSource())
-                .append("status", getStatus())
-                .append("username", getUsername())
-                .append("nickname", getNickname())
-                .append("avatar", getAvatar())
-                .toString();
-    }
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/WorkRecord.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/WorkRecord.java
deleted file mode 100644
index 53cf857..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/WorkRecord.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.maibu.model;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class WorkRecord implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private Long id;
-    private String workName;
-    private Long userId;
-    private String jsonData;
-    private String imgUrl;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/gateWay/ProductSubGatewayVO.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/gateWay/ProductSubGatewayVO.java
deleted file mode 100644
index 953aef4..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/gateWay/ProductSubGatewayVO.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.maibu.model.gateWay;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * 网关与子产品关联对象 iot_product_sub_gateway
- *
- * @author zhuangpeng.li
- * @date 2024-09-04
- */
-
-@Data
-public class ProductSubGatewayVO implements Serializable{
-    private static final long serialVersionUID=1L;
-
-    /** 业务id */
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty("业务id")
-    private Long id;
-
-    /** 网关产品id */
-    private Long gwProductId;
-
-    /** 子产品id */
-    private Long subProductId;
-
-    /**
-     * 子产品名称
-     */
-    private String subProductName;
-
-    /** 从机地址 */
-    private Integer slaveId;
-
-    /** 备注 */
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 子产品定位方式
-     */
-    private Integer subLocationWay;
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/param/DataCenterParam.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/param/DataCenterParam.java
deleted file mode 100644
index 44ea84e..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/model/param/DataCenterParam.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.maibu.model.param;
-
-import lombok.Data;
-
-/**
- * @author fastb
- * @version 1.0
- * @description: 数据中心统一传参类
- * @date 2024-06-19 17:07
- */
-@Data
-public class DataCenterParam {
-
-    /**
-     * 设备编号
-     */
-    private String serialNumber;
-
-    /**
-     * 开始时间
-     */
-    private String beginTime;
-
-    /**
-     * 结束时间
-     */
-    private String endTime;
-
-    /**
-     * 租户id
-     */
-    private Long tenantId;
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/ICategoryService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/ICategoryService.java
deleted file mode 100644
index 5662130..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/ICategoryService.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.maibu.service;
-
-
-import com.maibu.core.domain.AjaxResult;
-import com.maibu.domain.Category;
-import com.maibu.model.IdAndName;
-
-import java.util.List;
-
-/**
- * 产品分类Service接口
- *
- * @author kerwincui
- * @date 2021-12-16
- */
-public interface ICategoryService
-{
-    /**
-     * 查询产品分类
-     *
-     * @param categoryId 产品分类主键
-     * @return 产品分类
-     */
-    public Category selectCategoryByCategoryId(Long categoryId);
-
-    /**
-     * 查询产品分类列表
-     *
-     * @param category 产品分类
-     * @return 产品分类集合
-     */
-    public List<Category> selectCategoryList(Category category);
-
-    /**
-     * 查询产品简短分类列表
-     *
-     * @return 产品分类集合
-     */
-    public List<IdAndName> selectCategoryShortList(Category category);
-
-    /**
-     * 新增产品分类
-     *
-     * @param category 产品分类
-     * @return 结果
-     */
-    public int insertCategory(Category category);
-
-    /**
-     * 修改产品分类
-     *
-     * @param category 产品分类
-     * @return 结果
-     */
-    public int updateCategory(Category category);
-
-    /**
-     * 批量删除产品分类
-     *
-     * @param categoryIds 需要删除的产品分类主键集合
-     * @return 结果
-     */
-    public AjaxResult deleteCategoryByCategoryIds(Long[] categoryIds);
-
-    /**
-     * 删除产品分类信息
-     *
-     * @param categoryId 产品分类主键
-     * @return 结果
-     */
-    public int deleteCategoryByCategoryId(Long categoryId);
-
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java
index 1aced46..645956e 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IDeviceService.java
@@ -1,7 +1,7 @@
 package com.maibu.service;
 
+import com.maibu.core.business.Device;
 import com.maibu.core.domain.AjaxResult;
-import com.maibu.domain.Device;
 
 import java.util.List;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IEventLogService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IEventLogService.java
index f2e0839..6053def 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IEventLogService.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IEventLogService.java
@@ -1,8 +1,8 @@
 package com.maibu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.maibu.domain.EventLog;
-import com.maibu.model.HistoryModel;
+import com.maibu.core.business.EventLog;
+import com.maibu.core.business.HistoryModel;
 
 import java.util.List;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IToolService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IToolService.java
index f13422e..755d9eb 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IToolService.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IToolService.java
@@ -1,9 +1,8 @@
 package com.maibu.service;
 
+import com.maibu.core.business.RegisterUserInput;
+import com.maibu.core.business.RegisterUserOutput;
 import com.maibu.core.domain.entity.SysUser;
-import com.maibu.model.RegisterUserInput;
-import com.maibu.model.RegisterUserOutput;
-import org.springframework.http.ResponseEntity;
 
 import java.util.List;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IUserSocialProfileService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IUserSocialProfileService.java
deleted file mode 100644
index 5b54845..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IUserSocialProfileService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.maibu.service;
-
-
-import com.maibu.core.domain.AjaxResult;
-import com.maibu.model.UserSocialProfile;
-
-import java.util.List;
-
-public interface IUserSocialProfileService {
-    /**
-     * 找到用户绑定的社交账户
-     *
-     * @param sysUserId 用户主键
-     * @return
-     */
-    List<UserSocialProfile> selectUserSocialProfile(Long sysUserId);
-
-    /**
-     * 绑定用户
-     *
-     * @param bindId    绑定的Id
-     * @param sysUserId 用户主键
-     * @return
-     */
-    AjaxResult bindUser(String bindId, Long sysUserId);
-
-    /**
-     * 点击绑定跳转api
-     *
-     * @param platform 平台
-     * @return
-     */
-    AjaxResult bindSocialAccount(String platform);
-
-    /**
-     * 解除绑定
-     *
-     * @param socialUserId 要解除的社交账户主键
-     * @param sysUserId    用户主键
-     * @return
-     */
-    AjaxResult unbindSocialAccount(Long socialUserId, Long sysUserId);
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IWorkRecordService.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IWorkRecordService.java
index bb637eb..9b1c499 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IWorkRecordService.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IWorkRecordService.java
@@ -1,7 +1,8 @@
 package com.maibu.service;
 
 
-import com.maibu.model.WorkRecord;
+
+import com.maibu.core.business.WorkRecord;
 
 import java.util.List;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/CategoryServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/CategoryServiceImpl.java
deleted file mode 100644
index 85d2401..0000000
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/CategoryServiceImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.maibu.service.impl;
-
-import com.maibu.core.domain.AjaxResult;
-import com.maibu.core.domain.entity.SysUser;
-import com.maibu.domain.Category;
-import com.maibu.mapper.CategoryMapper;
-import com.maibu.model.IdAndName;
-import com.maibu.service.ICategoryService;
-import com.maibu.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static com.maibu.utils.SecurityUtils.getLoginUser;
-import static com.maibu.utils.SecurityUtils.isAdmin;
-
-
-/**
- * 产品分类Service业务层处理
- *
- * @author kerwincui
- * @date 2021-12-16
- */
-@Service
-public class CategoryServiceImpl implements ICategoryService
-{
-    @Autowired
-    private CategoryMapper categoryMapper;
-
-    /**
-     * 查询产品分类
-     *
-     * @param categoryId 产品分类主键
-     * @return 产品分类
-     */
-    @Override
-    public Category selectCategoryByCategoryId(Long categoryId)
-    {
-        return categoryMapper.selectCategoryByCategoryId(categoryId);
-    }
-
-    /**
-     * 查询产品分类列表
-     *
-     * @param category 产品分类
-     * @return 产品分类
-     */
-    @Override
-    public List<Category> selectCategoryList(Category category)
-    {
-        return categoryMapper.selectCategoryList(category);
-    }
-
-    /**
-     * 查询产品分简短类列表
-     *
-     * @return 产品分类
-     */
-    @Override
-    public List<IdAndName> selectCategoryShortList(Category category)
-    {
-        return categoryMapper.selectCategoryShortList(category);
-    }
-
-    /**
-     * 新增产品分类
-     *
-     * @param category 产品分类
-     * @return 结果
-     */
-    @Override
-    public int insertCategory(Category category)
-    {
-        // 判断是否为管理员
-        category.setIsSys(1);
-        SysUser user = getLoginUser().getUser();
-//        List<SysRole> roles=user.getRoles();
-//        for(int i=0;i<roles.size();i++){
-//            if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
-//                category.setIsSys(0);
-//                break;
-//            }
-//        }
-        if (null != user.getDeptId()) {
-            category.setTenantId(user.getDept().getDeptUserId());
-            category.setTenantName(user.getDept().getDeptUserName());
-        } else {
-            category.setTenantId(user.getUserId());
-            category.setTenantName(user.getUserName());
-        }
-        if (!isAdmin(user.getUserId())) {
-            category.setIsSys(0);
-        }
-        category.setCreateTime(DateUtils.getNowDate());
-        return categoryMapper.insertCategory(category);
-    }
-
-    /**
-     * 修改产品分类
-     *
-     * @param category 产品分类
-     * @return 结果
-     */
-    @Override
-    public int updateCategory(Category category)
-    {
-        category.setUpdateTime(DateUtils.getNowDate());
-        return categoryMapper.updateCategory(category);
-    }
-
-    /**
-     * 批量删除产品分类
-     *
-     * @param categoryIds 需要删除的产品分类主键
-     * @return 结果
-     */
-    @Override
-    public AjaxResult deleteCategoryByCategoryIds(Long[] categoryIds)
-    {
-        int productCount=categoryMapper.productCountInCategorys(categoryIds);
-        if(productCount>0){
-            return AjaxResult.error("删除失败，请先删除对应分类下的产品");
-        }
-        if(categoryMapper.deleteCategoryByCategoryIds(categoryIds)>0){
-            return AjaxResult.success("删除成功");
-        }
-        return AjaxResult.error("删除失败");
-    }
-
-    /**
-     * 删除产品分类信息
-     *
-     * @param categoryId 产品分类主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCategoryByCategoryId(Long categoryId)
-    {
-        return categoryMapper.deleteCategoryByCategoryId(categoryId);
-    }
-}
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java
index 7cc429f..1f32332 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/DeviceServiceImpl.java
@@ -1,13 +1,13 @@
 package com.maibu.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.maibu.core.business.Device;
+import com.maibu.core.business.DevicePlan;
+import com.maibu.core.business.DeviceRunningStatusHistory;
+import com.maibu.core.business.DeviceStatusRecordDTO;
 import com.maibu.core.domain.AjaxResult;
+import com.maibu.core.enums.DeviceTaskStaus;
 import com.maibu.core.redis.RedisCache;
-import com.maibu.domain.Device;
-import com.maibu.domain.DevicePlan;
-import com.maibu.domain.DeviceRunningStatusHistory;
-import com.maibu.domain.DeviceStatusRecordDTO;
-import com.maibu.enums.DeviceTaskStaus;
 import com.maibu.mapper.DeviceMapper;
 import com.maibu.mapper.DevicePlanMapper;
 import com.maibu.mapper.DeviceStatusHistoryMapper;
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/EventLogServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/EventLogServiceImpl.java
index 7a1fd9b..4403893 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/EventLogServiceImpl.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/EventLogServiceImpl.java
@@ -2,9 +2,9 @@ package com.maibu.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.maibu.domain.EventLog;
+import com.maibu.core.business.EventLog;
+import com.maibu.core.business.HistoryModel;
 import com.maibu.mapper.EventLogMapper;
-import com.maibu.model.HistoryModel;
 import com.maibu.mybatis.LambdaQueryWrapperX;
 import com.maibu.service.IEventLogService;
 import com.maibu.utils.StringUtils;
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/ToolServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/ToolServiceImpl.java
index b20a16c..71aa83c 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/ToolServiceImpl.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/ToolServiceImpl.java
@@ -1,10 +1,11 @@
 package com.maibu.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.maibu.constant.CacheConstants;
 import com.maibu.constant.Constants;
 import com.maibu.constant.UserConstants;
+import com.maibu.core.business.RegisterUserInput;
+import com.maibu.core.business.RegisterUserOutput;
 import com.maibu.core.domain.entity.SysUser;
 import com.maibu.core.redis.RedisCache;
 import com.maibu.exception.user.CaptchaException;
@@ -12,9 +13,6 @@ import com.maibu.exception.user.CaptchaExpireException;
 import com.maibu.manager.AsyncManager;
 import com.maibu.manager.factory.AsyncFactory;
 import com.maibu.mapper.SysUserMapper;
-import com.maibu.model.ProductAuthenticateModel;
-import com.maibu.model.RegisterUserInput;
-import com.maibu.model.RegisterUserOutput;
 import com.maibu.service.*;
 import com.maibu.utils.MessageUtils;
 import com.maibu.utils.SecurityUtils;
@@ -23,8 +21,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordServiceImpl.java b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordServiceImpl.java
index 108ebd1..6c927f4 100644
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordServiceImpl.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/WorkRecordServiceImpl.java
@@ -1,7 +1,7 @@
 package com.maibu.service.impl;
 
+import com.maibu.core.business.WorkRecord;
 import com.maibu.mapper.WorkRecordMapper;
-import com.maibu.model.WorkRecord;
 import com.maibu.service.IWorkRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
index b779726..46b08a6 100644
--- a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -4,9 +4,11 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.maibu.mapper.DeviceMapper">
 
-    <resultMap type="com.maibu.domain.Device" id="DeviceResult">
+    <resultMap type="com.maibu.core.business.Device" id="DeviceResult">
         <result property="deviceId" column="device_id"/>
         <result property="deviceAlias" column="device_alias"/>
+        <result property="orgId" column="org_id"/>
+        <result property="siteId" column="site_id"/>
         <result property="deviceName" column="device_name"/>
         <result property="productId" column="product_id"/>
         <result property="productName" column="product_name"/>
@@ -44,6 +46,8 @@
         select d.online_status,
                d.device_alias,
                d.device_id,
+               d.org_id,
+               d.site_id,
                d.device_name,
                d.product_id,
                d.product_name,
@@ -76,6 +80,8 @@
 
     <sql id="selectDeviceShortVo">
         select device_id,
+               org_id,
+               site_id,
                device_name,
                product_id,
                product_name,
@@ -97,6 +103,8 @@
 
     <sql id="selectWebhookDeviceVo">
         select device_id,
+               org_id,
+               site_id,
                device_name,
                product_id,
                serial_number,
@@ -112,7 +120,7 @@
         from iot_device
     </sql>
 
-    <select id="selectDeviceList" parameterType="com.maibu.domain.Device" resultMap="DeviceResult">
+    <select id="selectDeviceList" parameterType="com.maibu.core.business.Device" resultMap="DeviceResult">
         <include refid="selectDeviceVo"/>
         <where>
             <if test="deviceType != null">and p.device_type = #{deviceType}</if>
@@ -130,13 +138,11 @@
             <if test="networkAddress != null  and networkAddress != ''">and d.network_address like concat('%',
                 #{networkAddress}, '%')
             </if>
-            <if test="deptId != null and deptId != 0 and showChild != null and showChild">
-                and d.tenant_id in (SELECT u.user_id FROM sys_user u
-                join sys_dept de on u.dept_id = de.dept_id
-                WHERE FIND_IN_SET(#{deptId}, de.ancestors) OR de.dept_id = #{deptId})
+            <if test="orgId != null and orgId != 0">
+                and d.org_Id = #{orgId}
             </if>
-            <if test="deptId != null and deptId != 0 and showChild != null and !showChild">
-                and d.tenant_id = (SELECT dept_user_id FROM sys_dept WHERE dept_id = #{deptId})
+            <if test="siteId != null and siteId != 0">
+                and d.site_Id = #{siteId}
             </if>
             <if test="params.beginActiveTime != null and params.beginActiveTime != '' and params.endActiveTime != null and params.endActiveTime != ''">
                 and d.active_time between #{params.beginActiveTime} and #{params.endActiveTime}
@@ -146,7 +152,7 @@
         order by d.create_time desc
     </select>
 
-    <select id="selectUnAuthDeviceList" parameterType="com.maibu.domain.Device" resultMap="DeviceResult">
+    <select id="selectUnAuthDeviceList" parameterType="com.maibu.core.business.Device" resultMap="DeviceResult">
         select d.device_id, d.device_name, d.product_id, d.product_name, d.tenant_id, d.tenant_name,
         d.serial_number,d.gw_dev_code, d.firmware_version, d.status,d.is_shadow,d.is_simulate
         ,d.location_way,d.active_time, d.img_url,a.device_id as auth_device_id
@@ -230,7 +236,7 @@
     </select>
 
     <!-- 获取割草机运行数据-->
-    <select id="selectDeviceStatusByDeviceId" resultType="com.maibu.model.DeviceRunningStatus">
+    <select id="selectDeviceStatusByDeviceId" resultType="com.maibu.core.business.DeviceRunningStatus">
         select *
         from iot_device_running_status
         where device_id = #{deviceId}
@@ -238,7 +244,7 @@
 
 
     <!--  插入割草机运行数据  -->
-    <insert id="addDeviceRunningStatusInfo" parameterType="com.maibu.model.DeviceRunningStatus">
+    <insert id="addDeviceRunningStatusInfo" parameterType="com.maibu.core.business.DeviceRunningStatus">
         insert into iot_device_running_status
         (device_id, voltage, left_target_speed, right_target_speed,
          left_measure_speed, right_measure_speed, left_current, right_current,
@@ -265,7 +271,7 @@
         where serial_number = #{serialNumber}
     </select>
 
-    <insert id="insertDevice" parameterType="com.maibu.domain.Device" useGeneratedKeys="true"
+    <insert id="insertDevice" parameterType="com.maibu.core.business.Device" useGeneratedKeys="true"
             keyProperty="deviceId">
         insert into iot_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -298,6 +304,8 @@
             <if test="isSimulate != null">is_simulate,</if>
             <if test="slaveId != null">slave_id,</if>
             <if test="onlineStatus != null">online_status,</if>
+            <if test="orgId != null">org_id,</if>
+            <if test="siteId != null">site_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
@@ -329,10 +337,12 @@
             <if test="isSimulate != null">#{isSimulate},</if>
             <if test="slaveId != null">#{slaveId},</if>
             <if test="onlineStatus != null">#{onlineStatus},</if>
+            <if test="orgId != null">#{orgId},</if>
+            <if test="siteId != null">#{siteId},</if>
         </trim>
     </insert>
 
-    <insert id="insertBatchDevice" parameterType="com.maibu.domain.Device" useGeneratedKeys="true"
+    <insert id="insertBatchDevice" parameterType="com.maibu.core.business.Device" useGeneratedKeys="true"
             keyProperty="deviceId">
         insert into iot_device (device_name, product_id, product_name, tenant_id, tenant_name, serial_number,
         firmware_version, rssi, is_shadow, location_way, create_by, create_time)
@@ -354,7 +364,7 @@
     </insert>
 
 
-    <update id="updateDevice" parameterType="com.maibu.domain.Device">
+    <update id="updateDevice" parameterType="com.maibu.core.business.Device">
         update iot_device
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
@@ -387,11 +397,13 @@
             <if test="slaveId != null">slave_id = #{slaveId},</if>
             <if test="deviceAlias != null">device_alias = #{deviceAlias},</if>
             <if test="onlineStatus != null">online_status = #{onlineStatus},</if>
+            <if test="orgId != null">org_id = #{orgId},</if>
+            <if test="siteId != null">site_id = #{siteId},</if>
         </trim>
         where device_id = #{deviceId}
     </update>
 
-    <update id="updateDeviceStatus" parameterType="com.maibu.domain.Device">
+    <update id="updateDeviceStatus" parameterType="com.maibu.core.business.Device">
         update iot_device
         <trim prefix="SET" suffixOverrides=",">
             <if test="status != null">status = #{status},</if>
@@ -413,7 +425,7 @@
           and status = 3
     </update>
 
-    <update id="updateDeviceBySerialNumber" parameterType="com.maibu.domain.Device">
+    <update id="updateDeviceBySerialNumber" parameterType="com.maibu.core.business.Device">
         update iot_device
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
diff --git a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml
index b8ceb4b..f2138c0 100644
--- a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml
+++ b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.maibu.mapper.EventLogMapper">
 
-    <resultMap type="com.maibu.domain.EventLog" id="EventLogResult">
+    <resultMap type="com.maibu.core.business.EventLog" id="EventLogResult">
         <result property="logId"    column="log_id"    />
         <result property="identity"    column="identity"    />
         <result property="modelName"    column="model_name"    />
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
 
-    <select id="listHistory" resultType="com.maibu.model.HistoryModel">
+    <select id="listHistory" resultType="com.maibu.core.business.HistoryModel">
         select log_value as value,
         create_time as time,
         identity as identity
diff --git a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/WorkRecordMapper.xml b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/WorkRecordMapper.xml
index aed2b4b..76de8c5 100644
--- a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/WorkRecordMapper.xml
+++ b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/WorkRecordMapper.xml
@@ -4,24 +4,24 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.maibu.mapper.WorkRecordMapper">
 
-    <insert id="insertWorkRecord" parameterType="com.maibu.model.WorkRecord">
+    <insert id="insertWorkRecord" parameterType="com.maibu.core.business.WorkRecord">
         insert into iot_work_record(work_name, user_id, json_data, img_url)
         values (#{workName}, #{userId}, #{jsonData}, #{imgUrl})
     </insert>
 
-    <select id="selectWorkRecordByWorkName" resultType="com.maibu.model.WorkRecord">
+    <select id="selectWorkRecordByWorkName" resultType="com.maibu.core.business.WorkRecord">
         select *
         from iot_work_record
         where work_name = #{workName}
     </select>
 
-    <select id="selectWorkRecordById" resultType="com.maibu.model.WorkRecord">
+    <select id="selectWorkRecordById" resultType="com.maibu.core.business.WorkRecord">
         select *
         from iot_work_record
         where id = #{id}
     </select>
 
-    <select id="selectWorkRecordByUserId" resultType="com.maibu.model.WorkRecord">
+    <select id="selectWorkRecordByUserId" resultType="com.maibu.core.business.WorkRecord">
         select id, work_name, img_url
         from iot_work_record
         where user_id = #{userId}
diff --git a/maibu-service/maibu-system-service/pom.xml b/maibu-service/maibu-system-service/pom.xml
index eb8be99..08169df 100644
--- a/maibu-service/maibu-system-service/pom.xml
+++ b/maibu-service/maibu-system-service/pom.xml
@@ -19,10 +19,10 @@
             <artifactId>maibu-common</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.maibu</groupId>
-            <artifactId>maibu-framework</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.maibu</groupId>-->
+<!--            <artifactId>maibu-framework</artifactId>-->
+<!--        </dependency>-->
 
     </dependencies>
 
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/domain/SysPost.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/domain/SysPost.java
deleted file mode 100644
index 7a81baa..0000000
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/domain/SysPost.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.maibu.domain;
-
-import com.maibu.annotation.Excel;
-import com.maibu.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-/**
- * 岗位表 sys_post
- * 
- * @author ruoyi
- */
-@ApiModel(value = "SysPost", description = "岗位表 sys_post")
-public class SysPost extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 岗位序号 */
-    @ApiModelProperty("岗位序号")
-    @Excel(name = "岗位序号", cellType = Excel.ColumnType.NUMERIC)
-    private Long postId;
-
-    /** 岗位编码 */
-    @ApiModelProperty("岗位编码")
-    @Excel(name = "岗位编码")
-    private String postCode;
-
-    /** 岗位名称 */
-    @ApiModelProperty("岗位名称")
-    @Excel(name = "岗位名称")
-    private String postName;
-
-    /** 岗位排序 */
-    @ApiModelProperty("岗位排序")
-    @Excel(name = "岗位排序")
-    private Integer postSort;
-
-    /** 状态（0正常 1停用） */
-    @ApiModelProperty("状态（0正常 1停用）")
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    /** 用户是否存在此岗位标识 默认不存在 */
-    private boolean flag = false;
-
-    public Long getPostId()
-    {
-        return postId;
-    }
-
-    public void setPostId(Long postId)
-    {
-        this.postId = postId;
-    }
-
-    @NotBlank(message = "岗位编码不能为空")
-    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
-    public String getPostCode()
-    {
-        return postCode;
-    }
-
-    public void setPostCode(String postCode)
-    {
-        this.postCode = postCode;
-    }
-
-    @NotBlank(message = "岗位名称不能为空")
-    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
-    public String getPostName()
-    {
-        return postName;
-    }
-
-    public void setPostName(String postName)
-    {
-        this.postName = postName;
-    }
-
-    @NotNull(message = "显示顺序不能为空")
-    public Integer getPostSort()
-    {
-        return postSort;
-    }
-
-    public void setPostSort(Integer postSort)
-    {
-        this.postSort = postSort;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public boolean isFlag()
-    {
-        return flag;
-    }
-
-    public void setFlag(boolean flag)
-    {
-        this.flag = flag;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("postId", getPostId())
-            .append("postCode", getPostCode())
-            .append("postName", getPostName())
-            .append("postSort", getPostSort())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/domain/SysUserPost.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/domain/SysUserPost.java
deleted file mode 100644
index 5c97033..0000000
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/domain/SysUserPost.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.maibu.domain;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 用户和岗位关联 sys_user_post
- * 
- * @author ruoyi
- */
-@ApiModel(value = "SysUserPost", description = "用户和岗位关联 sys_user_post")
-public class SysUserPost
-{
-    /** 用户ID */
-    @ApiModelProperty("用户ID")
-    private Long userId;
-    
-    /** 岗位ID */
-    @ApiModelProperty("岗位ID")
-    private Long postId;
-
-    public Long getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getPostId()
-    {
-        return postId;
-    }
-
-    public void setPostId(Long postId)
-    {
-        this.postId = postId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("postId", getPostId())
-            .toString();
-    }
-}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/enums/Language.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/enums/Language.java
deleted file mode 100644
index 61dffa2..0000000
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/enums/Language.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.maibu.enums;
-
-public enum Language {
-    ZH_CN("zh-CN"),
-    EN("en-US"),
-    DEFAULT("default");
-
-    private String value;
-
-    Language(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public static String matches(String language) {
-        if(language.equals("zh")){
-            return Language.ZH_CN.value;
-        }else {
-            return Language.EN.value;
-        }
-    }
-}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysPostMapper.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysPostMapper.java
deleted file mode 100644
index 03666ad..0000000
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysPostMapper.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.maibu.mapper;
-
-
-import com.maibu.domain.SysPost;
-
-import java.util.List;
-
-/**
- * 岗位信息 数据层
- * 
- * @author ruoyi
- */
-public interface SysPostMapper
-{
-    /**
-     * 查询岗位数据集合
-     * 
-     * @param post 岗位信息
-     * @return 岗位数据集合
-     */
-    public List<SysPost> selectPostList(SysPost post);
-
-    /**
-     * 查询所有岗位
-     * 
-     * @return 岗位列表
-     */
-    public List<SysPost> selectPostAll();
-
-    /**
-     * 通过岗位ID查询岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 角色对象信息
-     */
-    public SysPost selectPostById(Long postId);
-
-    /**
-     * 根据用户ID获取岗位选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中岗位ID列表
-     */
-    public List<Long> selectPostListByUserId(Long userId);
-
-    /**
-     * 查询用户所属岗位组
-     * 
-     * @param userName 用户名
-     * @return 结果
-     */
-    public List<SysPost> selectPostsByUserName(String userName);
-
-    /**
-     * 删除岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int deletePostById(Long postId);
-
-    /**
-     * 批量删除岗位信息
-     * 
-     * @param postIds 需要删除的岗位ID
-     * @return 结果
-     */
-    public int deletePostByIds(Long[] postIds);
-
-    /**
-     * 修改岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int updatePost(SysPost post);
-
-    /**
-     * 新增岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int insertPost(SysPost post);
-
-    /**
-     * 校验岗位名称
-     * 
-     * @param postName 岗位名称
-     * @return 结果
-     */
-    public SysPost checkPostNameUnique(String postName);
-
-    /**
-     * 校验岗位编码
-     * 
-     * @param postCode 岗位编码
-     * @return 结果
-     */
-    public SysPost checkPostCodeUnique(String postCode);
-}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysRoleMenuMapper.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysRoleMenuMapper.java
index ee956c2..f68845b 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysRoleMenuMapper.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysRoleMenuMapper.java
@@ -7,14 +7,13 @@ import java.util.List;
 
 /**
  * 角色与菜单关联表 数据层
- * 
+ *
  * @author ruoyi
  */
-public interface SysRoleMenuMapper
-{
+public interface SysRoleMenuMapper {
     /**
      * 查询菜单使用数量
-     * 
+     *
      * @param menuId 菜单ID
      * @return 结果
      */
@@ -22,7 +21,7 @@ public interface SysRoleMenuMapper
 
     /**
      * 通过角色ID删除角色和菜单关联
-     * 
+     *
      * @param roleId 角色ID
      * @return 结果
      */
@@ -30,7 +29,7 @@ public interface SysRoleMenuMapper
 
     /**
      * 批量删除角色菜单关联信息
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface SysRoleMenuMapper
 
     /**
      * 批量新增角色菜单信息
-     * 
+     *
      * @param roleMenuList 角色菜单列表
      * @return 结果
      */
@@ -49,4 +48,13 @@ public interface SysRoleMenuMapper
      * @param roleId 角色id
      */
     List<SysRoleMenu> selectRoleMenuList(Long roleId);
+
+
+    /**
+     * 当前menu是否绑定到当前角色
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    public int checkMenuRole(Long menuId, Long roleId);
 }
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserMapper.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserMapper.java
index 72031dd..28e4e4c 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserMapper.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserMapper.java
@@ -1,6 +1,7 @@
 package com.maibu.mapper;
 
 import com.maibu.core.domain.entity.SysUser;
+import com.maibu.mybatis.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
  *
  * @author ruoyi
  */
-public interface SysUserMapper {
+public interface SysUserMapper extends BaseMapperX<SysUser> {
     /**
      * 根据条件分页查询用户列表
      *
@@ -198,4 +199,11 @@ public interface SysUserMapper {
      */
     List<SysUser> selectByDeptId(Long deptId);
 
+    /**
+     * 根据机构id获取当前机构所有非管理用户
+     *
+     * @return
+     */
+    List<SysUser> selectByRoleId(Long roleId);
+
 }
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserPostMapper.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserPostMapper.java
deleted file mode 100644
index af136c7..0000000
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysUserPostMapper.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.maibu.mapper;
-
-
-import com.maibu.domain.SysUserPost;
-
-import java.util.List;
-
-/**
- * 用户与岗位关联表 数据层
- * 
- * @author ruoyi
- */
-public interface SysUserPostMapper
-{
-    /**
-     * 通过用户ID删除用户和岗位关联
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deleteUserPostByUserId(Long userId);
-
-    /**
-     * 通过岗位ID查询岗位使用数量
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int countUserPostById(Long postId);
-
-    /**
-     * 批量删除用户和岗位关联
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteUserPost(Long[] ids);
-
-    /**
-     * 批量新增用户岗位信息
-     * 
-     * @param userPostList 用户角色列表
-     * @return 结果
-     */
-    public int batchUserPost(List<SysUserPost> userPostList);
-}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysMenuService.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysMenuService.java
index 9aee589..cb64ea7 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysMenuService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysMenuService.java
@@ -113,6 +113,7 @@ public interface ISysMenuService
      */
     public boolean checkMenuExistRole(Long menuId);
 
+
     /**
      * 新增保存菜单信息
      *
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysPostService.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysPostService.java
deleted file mode 100644
index 252d396..0000000
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysPostService.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.maibu.service;
-
-
-import com.maibu.domain.SysPost;
-
-import java.util.List;
-
-/**
- * 岗位信息 服务层
- * 
- * @author ruoyi
- */
-public interface ISysPostService
-{
-    /**
-     * 查询岗位信息集合
-     * 
-     * @param post 岗位信息
-     * @return 岗位列表
-     */
-    public List<SysPost> selectPostList(SysPost post);
-
-    /**
-     * 查询所有岗位
-     * 
-     * @return 岗位列表
-     */
-    public List<SysPost> selectPostAll();
-
-    /**
-     * 通过岗位ID查询岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 角色对象信息
-     */
-    public SysPost selectPostById(Long postId);
-
-    /**
-     * 根据用户ID获取岗位选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中岗位ID列表
-     */
-    public List<Long> selectPostListByUserId(Long userId);
-
-    /**
-     * 校验岗位名称
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public String checkPostNameUnique(SysPost post);
-
-    /**
-     * 校验岗位编码
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public String checkPostCodeUnique(SysPost post);
-
-    /**
-     * 通过岗位ID查询岗位使用数量
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int countUserPostById(Long postId);
-
-    /**
-     * 删除岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int deletePostById(Long postId);
-
-    /**
-     * 批量删除岗位信息
-     * 
-     * @param postIds 需要删除的岗位ID
-     * @return 结果
-     */
-    public int deletePostByIds(Long[] postIds);
-
-    /**
-     * 新增保存岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int insertPost(SysPost post);
-
-    /**
-     * 修改保存岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int updatePost(SysPost post);
-}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysRoleService.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysRoleService.java
index 048464a..70e5d5d 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysRoleService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysRoleService.java
@@ -22,6 +22,7 @@ public interface ISysRoleService
      */
     public List<SysRole> selectRoleList(SysRole role);
 
+
     /**
      * 根据用户ID查询角色列表
      *
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysUserService.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysUserService.java
index a83398b..a5f6b1e 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysUserService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/ISysUserService.java
@@ -60,13 +60,6 @@ public interface ISysUserService
      */
     public String selectUserRoleGroup(String userName);
 
-    /**
-     * 根据用户ID查询用户所属岗位组
-     *
-     * @param userName 用户名
-     * @return 结果
-     */
-    public String selectUserPostGroup(String userName);
 
     /**
      * 校验用户名称是否唯一
@@ -255,4 +248,6 @@ public interface ISysUserService
      * @return
      */
     List<SysUser> selectByDeptId();
+
+    List<SysUser> selectByRoleId(Long id);
 }
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysOrgService.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysOrgService.java
index 16de2a7..f90cc6e 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysOrgService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysOrgService.java
@@ -1,8 +1,11 @@
 package com.maibu.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.maibu.core.domain.AjaxResult;
 import com.maibu.core.domain.entity.SysOrg;
+import com.maibu.core.domain.entity.SysUser;
 import com.maibu.mapper.SysOrgMapper;
+import com.maibu.mapper.SysUserMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,8 +23,20 @@ public class SysOrgService {
     @Autowired
     private SysOrgMapper sysOrgMapper;
 
+    @Autowired
+    private SysSiteService sysSiteService;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
 
     public List<SysOrg> list(SysOrg org) {
+        if (org != null && org.getUserId() != null) {
+            SysUser sysUser = sysUserMapper.selectUserById(org.getUserId());
+            if(sysUser!=null){
+                org.setId(sysUser.getOrgId());
+            }
+        }
         LambdaQueryWrapper<SysOrg> queryWrapper = new LambdaQueryWrapper<>();
         if (org != null && !StringUtils.isEmpty(org.getOrgCode())) {
             queryWrapper.eq(SysOrg::getOrgCode, org.getOrgCode());
@@ -29,6 +44,9 @@ public class SysOrgService {
         if (org != null && !StringUtils.isEmpty(org.getOrgName())) {
             queryWrapper.like(SysOrg::getOrgName, org.getOrgName());
         }
+        if (org != null && org.getId()!=null) {
+            queryWrapper.eq(SysOrg::getId, org.getId());
+        }
         return sysOrgMapper.selectList(queryWrapper);
     }
 
@@ -36,8 +54,12 @@ public class SysOrgService {
         return sysOrgMapper.saveOrUpdate(org);
     }
 
-    public int delete(Long id) {
-        return sysOrgMapper.updateById(id);
+    public AjaxResult delete(Long id) {
+        // todo  查询是否有管理的site
+        if (sysSiteService.checkExistSite(id)) {
+            return AjaxResult.error("组织下有场站请先删除!");
+        }
+        return AjaxResult.success(sysOrgMapper.deleteById(id));
     }
 
     public SysOrg selectById(Long id) {
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysSiteService.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysSiteService.java
index beceb35..db1ea21 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysSiteService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysSiteService.java
@@ -1,14 +1,15 @@
 package com.maibu.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.maibu.core.domain.entity.SysOrg;
 import com.maibu.core.domain.entity.SysSite;
-import com.maibu.core.redis.RedisCache;
-import com.maibu.mapper.SysOrgMapper;
+import com.maibu.exception.ServiceException;
+import com.maibu.mapper.SysRegionMapper;
 import com.maibu.mapper.SysSiteMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -19,6 +20,9 @@ public class SysSiteService {
     @Autowired
     private SysSiteMapper sysSiteMapper;
 
+    @Autowired
+    private SysRegionService sysRegionService;
+
 
     public List<SysSite> list(SysSite site) {
         LambdaQueryWrapper<SysSite> queryWrapper = new LambdaQueryWrapper<>();
@@ -32,8 +36,21 @@ public class SysSiteService {
         return sysSiteMapper.saveOrUpdate(org);
     }
 
-    public int delete(Long id) {
-        return sysSiteMapper.deleteById(id);
+    @Transactional
+    public int delete(List<Long> ids) {
+        sysRegionService.deleteAll(ids);
+        return sysSiteMapper.deleteBatchIds(ids);
+    }
+
+
+    public boolean checkExistSite(Long id) {
+        List<SysSite> sysSites = selectByOrgId(id);
+        if (CollectionUtils.isEmpty(sysSites)) {
+            return false;
+        } else {
+            long count = sysSites.stream().filter(x -> x.getDelFlag() != null && !x.getDelFlag()).count();
+            return count > 0;
+        }
     }
 
     public SysSite selectById(Long id) {
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysMenuServiceImpl.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysMenuServiceImpl.java
index f44b4c8..c3c7e02 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysMenuServiceImpl.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysMenuServiceImpl.java
@@ -33,8 +33,7 @@ import static com.maibu.utils.SecurityUtils.getLoginUser;
  * @author ruoyi
  */
 @Service
-public class SysMenuServiceImpl implements ISysMenuService
-{
+public class SysMenuServiceImpl implements ISysMenuService {
     public static final String PREMISSION_STRING = "perms[\"{0}\"]";
 
     @Resource
@@ -56,8 +55,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(Long userId)
-    {
+    public List<SysMenu> selectMenuList(Long userId) {
         return selectMenuList(new SysMenu(), userId);
     }
 
@@ -68,17 +66,15 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
-    {
+    public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
+
+        //todo 重写
         menu.setLanguage(SecurityUtils.getLanguage());
         List<SysMenu> menuList = null;
         // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(userId))
-        {
+        if (SysUser.isAdmin(userId)) {
             menuList = menuMapper.selectMenuList(menu);
-        }
-        else
-        {
+        } else {
             menu.getParams().put("userId", userId);
             menuList = menuMapper.selectMenuListByUserId(menu);
         }
@@ -92,14 +88,11 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectMenuPermsByUserId(Long userId)
-    {
+    public Set<String> selectMenuPermsByUserId(Long userId) {
         List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
         Set<String> permsSet = new HashSet<>();
-        for (String perm : perms)
-        {
-            if (StringUtils.isNotEmpty(perm))
-            {
+        for (String perm : perms) {
+            if (StringUtils.isNotEmpty(perm)) {
                 permsSet.addAll(Arrays.asList(perm.trim().split(",")));
             }
         }
@@ -113,14 +106,11 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectMenuPermsByRoleId(Long roleId)
-    {
+    public Set<String> selectMenuPermsByRoleId(Long roleId) {
         List<String> perms = menuMapper.selectMenuPermsByRoleId(roleId);
         Set<String> permsSet = new HashSet<>();
-        for (String perm : perms)
-        {
-            if (StringUtils.isNotEmpty(perm))
-            {
+        for (String perm : perms) {
+            if (StringUtils.isNotEmpty(perm)) {
                 permsSet.addAll(Arrays.asList(perm.trim().split(",")));
             }
         }
@@ -135,15 +125,11 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId, String language)
-    {
+    public List<SysMenu> selectMenuTreeByUserId(Long userId, String language) {
         List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId))
-        {
+        if (SecurityUtils.isAdmin(userId)) {
             menus = menuMapper.selectMenuTreeAll(language);
-        }
-        else
-        {
+        } else {
             menus = menuMapper.selectMenuTreeByUserId(userId, language);
         }
         return getChildPerms(menus, 0);
@@ -156,8 +142,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 选中菜单列表
      */
     @Override
-    public List<Long> selectMenuListByRoleId(Long roleId)
-    {
+    public List<Long> selectMenuListByRoleId(Long roleId) {
         SysRole role = roleMapper.selectRoleById(roleId);
         return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
     }
@@ -169,11 +154,9 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 路由列表
      */
     @Override
-    public List<RouterVo> buildMenus(List<SysMenu> menus)
-    {
+    public List<RouterVo> buildMenus(List<SysMenu> menus) {
         List<RouterVo> routers = new LinkedList<RouterVo>();
-        for (SysMenu menu : menus)
-        {
+        for (SysMenu menu : menus) {
             RouterVo router = new RouterVo();
             router.setHidden("1".equals(menu.getVisible()));
             router.setName(getRouteName(menu));
@@ -182,14 +165,11 @@ public class SysMenuServiceImpl implements ISysMenuService
             router.setQuery(menu.getQuery());
             router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
             List<SysMenu> cMenus = menu.getChildren();
-            if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
-            {
+            if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
                 router.setAlwaysShow(true);
                 router.setRedirect("noRedirect");
                 router.setChildren(buildMenus(cMenus));
-            }
-            else if (isMenuFrame(menu))
-            {
+            } else if (isMenuFrame(menu)) {
                 router.setMeta(null);
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
                 RouterVo children = new RouterVo();
@@ -200,9 +180,7 @@ public class SysMenuServiceImpl implements ISysMenuService
                 children.setQuery(menu.getQuery());
                 childrenList.add(children);
                 router.setChildren(childrenList);
-            }
-            else if (menu.getParentId().intValue() == 0 && isInnerLink(menu))
-            {
+            } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {
                 router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
                 router.setPath("/");
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
@@ -227,22 +205,18 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 树结构列表
      */
     @Override
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus)
-    {
+    public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
         List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
-        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
-        {
+        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
             SysMenu menu = (SysMenu) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(menu.getParentId()))
-            {
+            if (!tempList.contains(menu.getParentId())) {
                 recursionFn(menus, menu);
                 returnList.add(menu);
             }
         }
-        if (returnList.isEmpty())
-        {
+        if (returnList.isEmpty()) {
             returnList = menus;
         }
         return returnList;
@@ -255,8 +229,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 下拉树结构列表
      */
     @Override
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus)
-    {
+    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus) {
         List<SysMenu> menuTrees = buildMenuTree(menus);
         return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
@@ -268,8 +241,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单信息
      */
     @Override
-    public SysMenu selectMenuById(Long menuId)
-    {
+    public SysMenu selectMenuById(Long menuId) {
         return menuMapper.selectMenuById(menuId, SecurityUtils.getLanguage());
     }
 
@@ -280,8 +252,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public boolean hasChildByMenuId(Long menuId)
-    {
+    public boolean hasChildByMenuId(Long menuId) {
         int result = menuMapper.hasChildByMenuId(menuId);
         return result > 0;
     }
@@ -293,12 +264,12 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public boolean checkMenuExistRole(Long menuId)
-    {
+    public boolean checkMenuExistRole(Long menuId) {
         int result = roleMenuMapper.checkMenuExistRole(menuId);
         return result > 0;
     }
 
+
     /**
      * 新增保存菜单信息
      *
@@ -306,8 +277,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public int insertMenu(SysMenu menu)
-    {
+    public int insertMenu(SysMenu menu) {
         return menuMapper.insertMenu(menu);
     }
 
@@ -318,8 +288,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public int updateMenu(SysMenu menu)
-    {
+    public int updateMenu(SysMenu menu) {
         return menuMapper.updateMenu(menu);
     }
 
@@ -330,8 +299,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public int deleteMenuById(Long menuId)
-    {
+    public int deleteMenuById(Long menuId) {
         return menuMapper.deleteMenuById(menuId);
     }
 
@@ -342,13 +310,11 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public String checkMenuNameUnique(SysMenu menu)
-    {
+    public String checkMenuNameUnique(SysMenu menu) {
         Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
         // 仅匹配菜单表存储的菜单名称，不匹配菜单翻译表存储的对应语言名称
         SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
-        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -365,18 +331,14 @@ public class SysMenuServiceImpl implements ISysMenuService
 
     @Override
     public List<SysMenu> deptRoleMenuTreeselect(Long deptId, Long roleId) {
+        //todo
         LoginUser loginUser = getLoginUser();
         Long userDeptId = loginUser.getDeptId();
-        Long deptUserId = loginUser.getUser().getDept().getDeptUserId();
+//        Long deptUserId = loginUser.getUser().getDept().getDeptUserId();
         SysRole sysRole = roleMapper.selectRoleById(roleId);
-//        List<SysUserRole> sysUserRoleList = sysUserRoleMapper.selectRoleByUserId(sysDept.getDeptUserId());
-//        SysUserRole sysUserRole = sysUserRoleList.stream().filter(s -> roleId.equals(s.getRoleId())).findAny().orElse(null);
-//        if (ObjectUtil.isNotNull(sysUserRole)) {
-//            return menuMapper.selectMenuList(new SysMenu());
+//        if (!deptId.equals(userDeptId) && "manager".equals(sysRole.getRoleKey())) {
+//            return this.selectMenuList(deptUserId);
 //        }
-        if (!deptId.equals(userDeptId) && "manager".equals(sysRole.getRoleKey())) {
-            return this.selectMenuList(deptUserId);
-        }
         SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
         if (ObjectUtil.isNull(sysDept) && null == sysDept.getDeptUserId()) {
             return new ArrayList<>();
@@ -390,12 +352,10 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 路由名称
      */
-    public String getRouteName(SysMenu menu)
-    {
+    public String getRouteName(SysMenu menu) {
         String routerName = StringUtils.capitalize(menu.getPath());
         // 非外链并且是一级目录（类型为目录）
-        if (isMenuFrame(menu))
-        {
+        if (isMenuFrame(menu)) {
             routerName = StringUtils.EMPTY;
         }
         return routerName;
@@ -407,23 +367,19 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 路由地址
      */
-    public String getRouterPath(SysMenu menu)
-    {
+    public String getRouterPath(SysMenu menu) {
         String routerPath = menu.getPath();
         // 内链打开外网方式
-        if (menu.getParentId().intValue() != 0 && isInnerLink(menu))
-        {
+        if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
             routerPath = innerLinkReplaceEach(routerPath);
         }
         // 非外链并且是一级目录（类型为目录）
         if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
-                && UserConstants.NO_FRAME.equals(menu.getIsFrame()))
-        {
+                && UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
             routerPath = "/" + menu.getPath();
         }
         // 非外链并且是一级目录（类型为菜单）
-        else if (isMenuFrame(menu))
-        {
+        else if (isMenuFrame(menu)) {
             routerPath = "/";
         }
         return routerPath;
@@ -435,19 +391,13 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 组件信息
      */
-    public String getComponent(SysMenu menu)
-    {
+    public String getComponent(SysMenu menu) {
         String component = UserConstants.LAYOUT;
-        if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu))
-        {
+        if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) {
             component = menu.getComponent();
-        }
-        else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu))
-        {
+        } else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
             component = UserConstants.INNER_LINK;
-        }
-        else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu))
-        {
+        } else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) {
             component = UserConstants.PARENT_VIEW;
         }
         return component;
@@ -459,8 +409,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 结果
      */
-    public boolean isMenuFrame(SysMenu menu)
-    {
+    public boolean isMenuFrame(SysMenu menu) {
         return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
                 && menu.getIsFrame().equals(UserConstants.NO_FRAME);
     }
@@ -471,8 +420,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 结果
      */
-    public boolean isInnerLink(SysMenu menu)
-    {
+    public boolean isInnerLink(SysMenu menu) {
         return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath());
     }
 
@@ -482,8 +430,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 结果
      */
-    public boolean isParentView(SysMenu menu)
-    {
+    public boolean isParentView(SysMenu menu) {
         return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
     }
 
@@ -494,15 +441,12 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param parentId 传入的父节点ID
      * @return String
      */
-    public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId)
-    {
+    public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId) {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
-        for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();)
-        {
+        for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext(); ) {
             SysMenu t = (SysMenu) iterator.next();
             // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
-            if (t.getParentId() == parentId)
-            {
+            if (t.getParentId() == parentId) {
                 recursionFn(list, t);
                 returnList.add(t);
             }
@@ -516,15 +460,12 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param list 分类表
      * @param t 子节点
      */
-    private void recursionFn(List<SysMenu> list, SysMenu t)
-    {
+    private void recursionFn(List<SysMenu> list, SysMenu t) {
         // 得到子节点列表
         List<SysMenu> childList = getChildList(list, t);
         t.setChildren(childList);
-        for (SysMenu tChild : childList)
-        {
-            if (hasChild(list, tChild))
-            {
+        for (SysMenu tChild : childList) {
+            if (hasChild(list, tChild)) {
                 recursionFn(list, tChild);
             }
         }
@@ -533,15 +474,12 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 得到子节点列表
      */
-    private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t)
-    {
+    private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
         List<SysMenu> tlist = new ArrayList<SysMenu>();
         Iterator<SysMenu> it = list.iterator();
-        while (it.hasNext())
-        {
+        while (it.hasNext()) {
             SysMenu n = (SysMenu) it.next();
-            if (n.getParentId().longValue() == t.getMenuId().longValue())
-            {
+            if (n.getParentId().longValue() == t.getMenuId().longValue()) {
                 tlist.add(n);
             }
         }
@@ -551,8 +489,7 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 判断是否有子节点
      */
-    private boolean hasChild(List<SysMenu> list, SysMenu t)
-    {
+    private boolean hasChild(List<SysMenu> list, SysMenu t) {
         return getChildList(list, t).size() > 0;
     }
 
@@ -561,10 +498,10 @@ public class SysMenuServiceImpl implements ISysMenuService
      *
      * @return 替换后的内链域名
      */
-    public String innerLinkReplaceEach(String path)
-    {
-        return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, "." },
-                new String[] { "", "", "", "/" });
+    public String innerLinkReplaceEach(String path) {
+        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, "."},
+                new String[]{"", "", "", "/"});
     }
 
+
 }
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysPostServiceImpl.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysPostServiceImpl.java
deleted file mode 100644
index 211a63f..0000000
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysPostServiceImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.maibu.service.impl;
-
-import com.maibu.constant.UserConstants;
-import com.maibu.domain.SysPost;
-import com.maibu.exception.ServiceException;
-import com.maibu.mapper.SysPostMapper;
-import com.maibu.mapper.SysUserPostMapper;
-import com.maibu.service.ISysPostService;
-import com.maibu.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 岗位信息 服务层处理
- * 
- * @author ruoyi
- */
-@Service
-public class SysPostServiceImpl implements ISysPostService
-{
-    @Autowired
-    private SysPostMapper postMapper;
-
-    @Autowired
-    private SysUserPostMapper userPostMapper;
-
-    /**
-     * 查询岗位信息集合
-     * 
-     * @param post 岗位信息
-     * @return 岗位信息集合
-     */
-    @Override
-    public List<SysPost> selectPostList(SysPost post)
-    {
-        return postMapper.selectPostList(post);
-    }
-
-    /**
-     * 查询所有岗位
-     * 
-     * @return 岗位列表
-     */
-    @Override
-    public List<SysPost> selectPostAll()
-    {
-        return postMapper.selectPostAll();
-    }
-
-    /**
-     * 通过岗位ID查询岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 角色对象信息
-     */
-    @Override
-    public SysPost selectPostById(Long postId)
-    {
-        return postMapper.selectPostById(postId);
-    }
-
-    /**
-     * 根据用户ID获取岗位选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中岗位ID列表
-     */
-    @Override
-    public List<Long> selectPostListByUserId(Long userId)
-    {
-        return postMapper.selectPostListByUserId(userId);
-    }
-
-    /**
-     * 校验岗位名称是否唯一
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    @Override
-    public String checkPostNameUnique(SysPost post)
-    {
-        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
-        SysPost info = postMapper.checkPostNameUnique(post.getPostName());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验岗位编码是否唯一
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    @Override
-    public String checkPostCodeUnique(SysPost post)
-    {
-        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
-        SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 通过岗位ID查询岗位使用数量
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    @Override
-    public int countUserPostById(Long postId)
-    {
-        return userPostMapper.countUserPostById(postId);
-    }
-
-    /**
-     * 删除岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    @Override
-    public int deletePostById(Long postId)
-    {
-        return postMapper.deletePostById(postId);
-    }
-
-    /**
-     * 批量删除岗位信息
-     * 
-     * @param postIds 需要删除的岗位ID
-     * @return 结果
-     */
-    @Override
-    public int deletePostByIds(Long[] postIds)
-    {
-        for (Long postId : postIds)
-        {
-            SysPost post = selectPostById(postId);
-            if (countUserPostById(postId) > 0)
-            {
-                throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName()));
-            }
-        }
-        return postMapper.deletePostByIds(postIds);
-    }
-
-    /**
-     * 新增保存岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    @Override
-    public int insertPost(SysPost post)
-    {
-        return postMapper.insertPost(post);
-    }
-
-    /**
-     * 修改保存岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    @Override
-    public int updatePost(SysPost post)
-    {
-        return postMapper.updatePost(post);
-    }
-}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysRoleServiceImpl.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysRoleServiceImpl.java
index 31fd834..27ca781 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysRoleServiceImpl.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysRoleServiceImpl.java
@@ -15,7 +15,6 @@ import com.maibu.service.ISysRoleService;
 import com.maibu.utils.SecurityUtils;
 import com.maibu.utils.StringUtils;
 import com.maibu.utils.spring.SpringUtils;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -23,6 +22,7 @@ import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.maibu.core.domain.entity.SysUser;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -37,8 +37,7 @@ import static com.maibu.utils.SecurityUtils.getLoginUser;
  * @author ruoyi
  */
 @Service
-public class SysRoleServiceImpl implements ISysRoleService
-{
+public class SysRoleServiceImpl implements ISysRoleService {
     @Autowired
     private SysRoleMapper roleMapper;
 
@@ -54,77 +53,28 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Resource
     private SysDeptMapper sysDeptMapper;
 
-    /**
-     * 根据条件分页查询角色数据
-     *
-     * @param role 角色信息
-     * @return 角色数据集合信息
-     */
+
     @Override
     @DataScope(deptAlias = "d")
-    public List<SysRole> selectRoleList(SysRole role)
-    {
-        LoginUser loginUser = getLoginUser();
-        Long userId = loginUser.getUserId();
-        Long userDeptId = loginUser.getDeptId();
-        Long deptId;
-        if (null != role.getDeptId()) {
-            deptId = role.getDeptId();
-        } else {
-            deptId = loginUser.getDeptId();
-        }
-        List<SysDept> sysDeptList;
-        SysDept sysDept = new SysDept();
-        sysDept.setDeptId(deptId);
-        if (null != role.getShowChild() && role.getShowChild()) {
-            sysDeptList = sysDeptMapper.listDeptAndChild(sysDept);
-        } else {
-            sysDeptList = sysDeptMapper.selectDeptList(sysDept);
-        }
-//        List<SysDept> sysDeptList = new ArrayList<>();
-//        if (null != role.getDeptIds()) {
-//            sysDeptList = sysDeptMapper.selectDeptByIds(Arrays.asList(role.getDeptIds()));
-//        } else {
-//            LoginUser loginUser = getLoginUser();
-//            Long deptId = loginUser.getDeptId();
-//            if (null != deptId) {
-//                SysDept sysDept = new SysDept();
-//                sysDept.setDeptId(deptId);
-//                sysDeptList = sysDeptMapper.selectDeptList(sysDept);
-//            }
-//        }
-        if (CollectionUtils.isNotEmpty(sysDeptList)) {
-            Map<Long, String> deptMap = sysDeptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
-            List<Long> deptIdList = sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-            List<SysRoleDept> sysRoleDeptList = roleDeptMapper.selectRoleDeptByDeptIds(deptIdList);
-            Map<Long, Long> roleDeptMap = sysRoleDeptList.stream().collect(Collectors.toMap(SysRoleDept::getRoleId, SysRoleDept::getDeptId));
-            if (CollectionUtils.isEmpty(sysRoleDeptList)) {
-                return new ArrayList<>();
-            }
-            List<Long> roleIdList = sysRoleDeptList.stream().map(SysRoleDept::getRoleId).collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(roleIdList)) {
-                return new ArrayList<>();
-            }
-            List<SysRole> sysRoleList = roleMapper.selectRoleByIds(roleIdList, role.getRoleName(), role.getStatus());
-            for (SysRole sysRole : sysRoleList) {
-                Long deptId1 = roleDeptMap.get(sysRole.getRoleId());
-                String deptName = deptMap.get(deptId1);
-                sysRole.setDeptId(deptId1);
-                sysRole.setDeptName(deptName);
-//                if (userDeptId.equals(deptId1) && "manager".equals(sysRole.getRoleKey())) {
-//                    sysRole.setCanEditRole(false);
-//                } else {
-//                    sysRole.setCanEditRole(true);
-//                }
-                sysRole.setCanEditRole(!(userDeptId.equals(deptId1) && "manager".equals(sysRole.getRoleKey()) && !SecurityUtils.isAdmin(userId)));
-                sysRole.setManager("manager".equals(sysRole.getRoleKey()));
-            }
-            return sysRoleList;
-        } else {
-            return new ArrayList<>();
+    public List<SysRole> selectRoleList(SysRole role) {
+        List<SysRole> list = roleMapper.selectRoleAll();
+        if (!CollectionUtils.isEmpty(list)) {
+            list.forEach(x -> {
+                if (!StringUtils.isEmpty(x.getMenuList())) {
+                    String[] l = x.getMenuList().split(",");
+                    Long[] result = Arrays.stream(l)
+                            .filter(s -> s != null && !s.isEmpty())
+                            .map(Long::valueOf)
+                            .toArray(Long[]::new);
+                    x.setMenuIds(result);
+                }
+            });
         }
+        return list;
+
     }
 
+
     /**
      * 根据用户ID查询角色
      *
@@ -133,16 +83,12 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Cacheable(cacheNames = "role", key = "#root.methodName + ':' + #userId", unless = "#result == null or #result.size() == 0")
     @Override
-    public List<SysRole> selectRolesByUserId(Long userId)
-    {
+    public List<SysRole> selectRolesByUserId(Long userId) {
         List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
         List<SysRole> roles = selectRoleAll();
-        for (SysRole role : roles)
-        {
-            for (SysRole userRole : userRoles)
-            {
-                if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
-                {
+        for (SysRole role : roles) {
+            for (SysRole userRole : userRoles) {
+                if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) {
                     role.setFlag(true);
                     break;
                 }
@@ -159,14 +105,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Cacheable(cacheNames = "role", key = "#root.methodName + ':' + #userId", unless = "#result == null or #result.size() == 0")
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
-    {
+    public Set<String> selectRolePermissionByUserId(Long userId) {
         List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
         Set<String> permsSet = new HashSet<>();
-        for (SysRole perm : perms)
-        {
-            if (StringUtils.isNotNull(perm))
-            {
+        for (SysRole perm : perms) {
+            if (StringUtils.isNotNull(perm)) {
                 permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
             }
         }
@@ -179,8 +122,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色列表
      */
     @Override
-    public List<SysRole> selectRoleAll()
-    {
+    public List<SysRole> selectRoleAll() {
         return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
     }
 
@@ -191,8 +133,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 选中角色ID列表
      */
     @Override
-    public List<Long> selectRoleListByUserId(Long userId)
-    {
+    public List<Long> selectRoleListByUserId(Long userId) {
         return roleMapper.selectRoleListByUserId(userId);
     }
 
@@ -204,16 +145,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Cacheable(cacheNames = "role", key = "#root.methodName + ':' + #roleId", unless = "#result == null")
     @Override
-    public SysRole selectRoleById(Long roleId)
-    {
-        SysRole sysRole = roleMapper.selectRoleById(roleId);
-        if (ObjectUtil.isNotNull(sysRole)) {
-            SysRoleDept sysRoleDept = roleDeptMapper.selectByRoleId(sysRole.getRoleId());
-            if (ObjectUtil.isNotNull(sysRoleDept)) {
-                sysRole.setDeptId(sysRoleDept.getDeptId());
-            }
-        }
-        return sysRole;
+    public SysRole selectRoleById(Long roleId) {
+        return roleMapper.selectRoleById(roleId);
     }
 
     /**
@@ -223,12 +156,10 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public String checkRoleNameUnique(SysRole role)
-    {
+    public String checkRoleNameUnique(SysRole role) {
         Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
         SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -241,12 +172,10 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public String checkRoleKeyUnique(SysRole role)
-    {
+    public String checkRoleKeyUnique(SysRole role) {
         Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
         SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -258,10 +187,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @param role 角色信息
      */
     @Override
-    public void checkRoleAllowed(SysRole role)
-    {
-        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
-        {
+    public void checkRoleAllowed(SysRole role) {
+        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) {
             throw new ServiceException("不允许操作超级管理员角色");
         }
     }
@@ -272,15 +199,12 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @param roleId 角色id
      */
     @Override
-    public void checkRoleDataScope(Long roleId)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
+    public void checkRoleDataScope(Long roleId) {
+        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysRole role = new SysRole();
             role.setRoleId(roleId);
             List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
-            if (StringUtils.isEmpty(roles))
-            {
+            if (StringUtils.isEmpty(roles)) {
                 throw new ServiceException("没有权限访问角色数据！");
             }
         }
@@ -294,8 +218,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Cacheable(cacheNames = "role", key = "#root.methodName + ':' + #roleId", unless = "#result == null")
     @Override
-    public int countUserRoleByRoleId(Long roleId)
-    {
+    public int countUserRoleByRoleId(Long roleId) {
         return userRoleMapper.countUserRoleByRoleId(roleId);
     }
 
@@ -307,19 +230,18 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertRole(SysRole role)
-    {
+    public int insertRole(SysRole role) {
         // 新增角色信息
         roleMapper.insertRole(role);
-        // 绑定部门角色
-        List<SysRoleDept> sysRoleDeptList = new ArrayList<>();
-        SysRoleDept sysRoleDept = new SysRoleDept();
-        sysRoleDept.setDeptId(role.getDeptId());
-        sysRoleDept.setRoleId(role.getRoleId());
-        sysRoleDeptList.add(sysRoleDept);
-        if (CollectionUtils.isNotEmpty(sysRoleDeptList)) {
-            roleDeptMapper.batchRoleDept(sysRoleDeptList);
-        }
+//        // 绑定部门角色
+//        List<SysRoleDept> sysRoleDeptList = new ArrayList<>();
+//        SysRoleDept sysRoleDept = new SysRoleDept();
+//        sysRoleDept.setDeptId(role.getDeptId());
+//        sysRoleDept.setRoleId(role.getRoleId());
+//        sysRoleDeptList.add(sysRoleDept);
+//        if (CollectionUtils.isNotEmpty(sysRoleDeptList)) {
+//            roleDeptMapper.batchRoleDept(sysRoleDeptList);
+//        }
         return insertRoleMenu(role);
     }
 
@@ -334,8 +256,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     })
     @Override
     @Transactional
-    public int updateRole(SysRole role)
-    {
+    public int updateRole(SysRole role) {
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与菜单关联
@@ -353,8 +274,7 @@ public class SysRoleServiceImpl implements ISysRoleService
             @CacheEvict(cacheNames = "role", key = "'selectRoleById:' + #role.roleId", condition = "#result != null"),
     })
     @Override
-    public int updateRoleStatus(SysRole role)
-    {
+    public int updateRoleStatus(SysRole role) {
         return roleMapper.updateRole(role);
     }
 
@@ -366,8 +286,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int authDataScope(SysRole role)
-    {
+    public int authDataScope(SysRole role) {
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与部门关联
@@ -381,20 +300,17 @@ public class SysRoleServiceImpl implements ISysRoleService
      *
      * @param role 角色对象
      */
-    public int insertRoleMenu(SysRole role)
-    {
+    public int insertRoleMenu(SysRole role) {
         int rows = 1;
         // 新增用户与角色管理
         List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
-        for (Long menuId : role.getMenuIds())
-        {
+        for (Long menuId : role.getMenuIds()) {
             SysRoleMenu rm = new SysRoleMenu();
             rm.setRoleId(role.getRoleId());
             rm.setMenuId(menuId);
             list.add(rm);
         }
-        if (list.size() > 0)
-        {
+        if (list.size() > 0) {
             rows = roleMenuMapper.batchRoleMenu(list);
         }
         return rows;
@@ -405,20 +321,17 @@ public class SysRoleServiceImpl implements ISysRoleService
      *
      * @param role 角色对象
      */
-    public int insertRoleDept(SysRole role)
-    {
+    public int insertRoleDept(SysRole role) {
         int rows = 1;
         // 新增角色与部门（数据权限）管理
         List<SysRoleDept> list = new ArrayList<SysRoleDept>();
-        for (Long deptId : role.getDeptIds())
-        {
+        for (Long deptId : role.getDeptIds()) {
             SysRoleDept rd = new SysRoleDept();
             rd.setRoleId(role.getRoleId());
             rd.setDeptId(deptId);
             list.add(rd);
         }
-        if (list.size() > 0)
-        {
+        if (list.size() > 0) {
             rows = roleDeptMapper.batchRoleDept(list);
         }
         return rows;
@@ -433,8 +346,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @CacheEvict(cacheNames = "role", allEntries = true)
     @Override
     @Transactional
-    public int deleteRoleById(Long roleId)
-    {
+    public int deleteRoleById(Long roleId) {
         // 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenuByRoleId(roleId);
         // 删除角色与部门关联
@@ -451,13 +363,11 @@ public class SysRoleServiceImpl implements ISysRoleService
     @CacheEvict(cacheNames = "role", allEntries = true)
     @Override
     @Transactional
-    public int deleteRoleByIds(Long[] roleIds)
-    {
-        for (Long roleId : roleIds)
-        {
+    public int deleteRoleByIds(Long[] roleIds) {
+        for (Long roleId : roleIds) {
             checkRoleAllowed(new SysRole(roleId));
             checkRoleDataScope(roleId);
-            SysRole role = selectRoleById(roleId);
+//            SysRole role = selectRoleById(roleId);
             //if (countUserRoleByRoleId(roleId) > 0)
             //{
             //    throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
@@ -466,7 +376,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         // 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenu(roleIds);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDept(roleIds);
+//        roleDeptMapper.deleteRoleDept(roleIds);
         return roleMapper.deleteRoleByIds(roleIds);
     }
 
@@ -478,8 +388,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @CacheEvict(cacheNames = "role", allEntries = true)
     @Override
-    public int deleteAuthUser(SysUserRole userRole)
-    {
+    public int deleteAuthUser(SysUserRole userRole) {
         return userRoleMapper.deleteUserRoleInfo(userRole);
     }
 
@@ -492,8 +401,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @CacheEvict(cacheNames = "role", allEntries = true)
     @Override
-    public int deleteAuthUsers(Long roleId, Long[] userIds)
-    {
+    public int deleteAuthUsers(Long roleId, Long[] userIds) {
         return userRoleMapper.deleteUserRoleInfos(roleId, userIds);
     }
 
@@ -505,12 +413,10 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int insertAuthUsers(Long roleId, Long[] userIds)
-    {
+    public int insertAuthUsers(Long roleId, Long[] userIds) {
         // 新增用户与角色管理
         List<SysUserRole> list = new ArrayList<SysUserRole>();
-        for (Long userId : userIds)
-        {
+        for (Long userId : userIds) {
             SysUserRole ur = new SysUserRole();
             ur.setUserId(userId);
             ur.setRoleId(roleId);
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserOnlineServiceImpl.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserOnlineServiceImpl.java
index 1d7aa08..d902417 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserOnlineServiceImpl.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserOnlineServiceImpl.java
@@ -87,10 +87,11 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
         sysUserOnline.setBrowser(user.getBrowser());
         sysUserOnline.setOs(user.getOs());
         sysUserOnline.setLoginTime(user.getLoginTime());
-        if (StringUtils.isNotNull(user.getUser().getDept()))
-        {
-            sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
-        }
+        //TODO 设置组织？
+//        if (StringUtils.isNotNull(user.getUser().getDept()))
+//        {
+//            sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
+//        }
         return sysUserOnline;
     }
 }
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserServiceImpl.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserServiceImpl.java
index c66342d..645c3a9 100644
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserServiceImpl.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysUserServiceImpl.java
@@ -2,11 +2,8 @@ package com.maibu.service.impl;
 
 import com.maibu.annotation.DataScope;
 import com.maibu.constant.UserConstants;
-import com.maibu.core.domain.entity.SysDept;
 import com.maibu.core.domain.entity.SysRole;
 import com.maibu.core.domain.entity.SysUser;
-import com.maibu.domain.SysPost;
-import com.maibu.domain.SysUserPost;
 import com.maibu.domain.SysUserRole;
 import com.maibu.enums.SocialPlatformType;
 import com.maibu.exception.ServiceException;
@@ -39,8 +36,7 @@ import java.util.stream.Collectors;
  * @author ruoyi
  */
 @Service
-public class SysUserServiceImpl implements ISysUserService
-{
+public class SysUserServiceImpl implements ISysUserService {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
     @Autowired
@@ -49,14 +45,10 @@ public class SysUserServiceImpl implements ISysUserService
     @Autowired
     private SysRoleMapper roleMapper;
 
-    @Autowired
-    private SysPostMapper postMapper;
 
     @Autowired
     private SysUserRoleMapper userRoleMapper;
 
-    @Autowired
-    private SysUserPostMapper userPostMapper;
 
     @Autowired
     private ISysConfigService configService;
@@ -71,23 +63,21 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUserList(SysUser user)
-    {
+    public List<SysUser> selectUserList(SysUser user) {
         List<SysUser> sysUserList = userMapper.selectUserList(user);
-        for (SysUser sysUser : sysUserList) {
-            // 根据用户查询角色
-            List<SysRole> sysRoles = roleMapper.selectRolePermissionByUserId(sysUser.getUserId());
-            if (!sysRoles.isEmpty()){
-                String result = sysRoles.stream()
-                        .map(SysRole::getRoleName) // 方法引用，等价于 role -> role.getRoleName()
-                        .collect(Collectors.joining(", ")); // 指定分隔符
-                sysUser.setRoles(sysRoles);
-                sysUser.setRoleNames(result);
-            }
-            SysDept dept = sysUser.getDept();
-            sysUser.setManager(sysUser.getUserId().equals(dept.getDeptUserId()));
-        }
+//        for (SysUser sysUser : sysUserList) {
+//            // 根据用户查询角色
+//            List<SysRole> sysRoles = roleMapper.selectRolePermissionByUserId(sysUser.getUserId());
+//            if (!sysRoles.isEmpty()) {
+//                String result = sysRoles.stream()
+//                        .map(SysRole::getRoleName) // 方法引用，等价于 role -> role.getRoleName()
+//                        .collect(Collectors.joining(", ")); // 指定分隔符
+//                sysUser.setRoles(sysRoles);
+//                sysUser.setRoleNames(result);
+//            }
+////            SysDept dept = sysUser.getDept();
+////            sysUser.setManager(sysUser.getUserId().equals(dept.getDeptUserId()));
+//        }
         return sysUserList;
     }
 
@@ -99,8 +89,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectAllocatedList(SysUser user)
-    {
+    public List<SysUser> selectAllocatedList(SysUser user) {
         return userMapper.selectAllocatedList(user);
     }
 
@@ -112,8 +101,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUnallocatedList(SysUser user)
-    {
+    public List<SysUser> selectUnallocatedList(SysUser user) {
         user.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
         return userMapper.selectUnallocatedList(user);
     }
@@ -126,8 +114,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Cacheable(cacheNames = "sysUser", key = "#root.methodName + ':' + #userName", unless = "#result == null")
     @Override
-    public SysUser selectUserByUserName(String userName)
-    {
+    public SysUser selectUserByUserName(String userName) {
         return userMapper.selectUserByUserName(userName);
     }
 
@@ -139,8 +126,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Cacheable(cacheNames = "sysUser", key = "#root.methodName + ':' + #userId", unless = "#result == null")
     @Override
-    public SysUser selectUserById(Long userId)
-    {
+    public SysUser selectUserById(Long userId) {
         return userMapper.selectUserById(userId);
     }
 
@@ -152,34 +138,14 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Cacheable(cacheNames = "sysUser", key = "#root.methodName + ':' + #userName", unless = "#result == null")
     @Override
-    public String selectUserRoleGroup(String userName)
-    {
+    public String selectUserRoleGroup(String userName) {
         List<SysRole> list = roleMapper.selectRolesByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
-        {
+        if (CollectionUtils.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
         return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
     }
 
-    /**
-     * 查询用户所属岗位组
-     *
-     * @param userName 用户名
-     * @return 结果
-     */
-    @Cacheable(cacheNames = "sysUser", key = "#root.methodName + ':' + #userName", unless = "#result == null")
-    @Override
-    public String selectUserPostGroup(String userName)
-    {
-        List<SysPost> list = postMapper.selectPostsByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
-        {
-            return StringUtils.EMPTY;
-        }
-        return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
-    }
-
     /**
      * 校验用户名称是否唯一
      *
@@ -187,12 +153,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String checkUserNameUnique(SysUser user)
-    {
+    public String checkUserNameUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -205,12 +169,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public String checkPhoneUnique(SysUser user)
-    {
+    public String checkPhoneUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -223,12 +185,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public String checkEmailUnique(SysUser user)
-    {
+    public String checkEmailUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -240,10 +200,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @param user 用户信息
      */
     @Override
-    public void checkUserAllowed(SysUser user)
-    {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
-        {
+    public void checkUserAllowed(SysUser user) {
+        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
             throw new ServiceException("不允许操作超级管理员用户");
         }
     }
@@ -254,15 +212,12 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId 用户id
      */
     @Override
-    public void checkUserDataScope(Long userId)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
+    public void checkUserDataScope(Long userId) {
+        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysUser user = new SysUser();
             user.setUserId(userId);
             List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
-            if (StringUtils.isEmpty(users))
-            {
+            if (StringUtils.isEmpty(users)) {
                 throw new ServiceException("没有权限访问用户数据！");
             }
         }
@@ -281,12 +236,11 @@ public class SysUserServiceImpl implements ISysUserService
     })
     @Override
     @Transactional
-    public int insertUser(SysUser user)
-    {
+    public int insertUser(SysUser user) {
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
-        insertUserPost(user);
+//        insertUserPost(user);
         // 新增用户与角色管理
         insertUserRole(user);
         return rows;
@@ -299,8 +253,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public boolean registerUser(SysUser user)
-    {
+    public boolean registerUser(SysUser user) {
         return userMapper.insertUser(user) > 0;
     }
 
@@ -317,17 +270,16 @@ public class SysUserServiceImpl implements ISysUserService
     })
     @Override
     @Transactional
-    public int updateUser(SysUser user)
-    {
+    public int updateUser(SysUser user) {
         Long userId = user.getUserId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 新增用户与角色管理
         insertUserRole(user);
         // 删除用户与岗位关联
-        userPostMapper.deleteUserPostByUserId(userId);
+//        userPostMapper.deleteUserPostByUserId(userId);
         // 新增用户与岗位管理
-        insertUserPost(user);
+//        insertUserPost(user);
         return userMapper.updateUser(user);
     }
 
@@ -339,8 +291,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public void insertUserAuth(Long userId, Long[] roleIds)
-    {
+    public void insertUserAuth(Long userId, Long[] roleIds) {
         userRoleMapper.deleteUserRoleByUserId(userId);
         insertUserRole(userId, roleIds);
     }
@@ -352,8 +303,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserStatus(SysUser user)
-    {
+    public int updateUserStatus(SysUser user) {
         return userMapper.updateUser(user);
     }
 
@@ -364,8 +314,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserProfile(SysUser user)
-    {
+    public int updateUserProfile(SysUser user) {
         return userMapper.updateUser(user);
     }
 
@@ -377,8 +326,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar(String userName, String avatar)
-    {
+    public boolean updateUserAvatar(String userName, String avatar) {
         return userMapper.updateUserAvatar(userName, avatar) > 0;
     }
 
@@ -389,8 +337,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetPwd(SysUser user)
-    {
+    public int resetPwd(SysUser user) {
         return userMapper.updateUser(user);
     }
 
@@ -402,8 +349,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetUserPwd(String userName, String password)
-    {
+    public int resetUserPwd(String userName, String password) {
         return userMapper.resetUserPwd(userName, password);
     }
 
@@ -412,8 +358,7 @@ public class SysUserServiceImpl implements ISysUserService
      *
      * @param user 用户对象
      */
-    public void insertUserRole(SysUser user)
-    {
+    public void insertUserRole(SysUser user) {
         this.insertUserRole(user.getUserId(), user.getRoleIds());
     }
 
@@ -422,22 +367,21 @@ public class SysUserServiceImpl implements ISysUserService
      *
      * @param user 用户对象
      */
-    public void insertUserPost(SysUser user)
-    {
-        Long[] posts = user.getPostIds();
-        if (StringUtils.isNotEmpty(posts))
-        {
-            // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
-            for (Long postId : posts)
-            {
-                SysUserPost up = new SysUserPost();
-                up.setUserId(user.getUserId());
-                up.setPostId(postId);
-                list.add(up);
-            }
-            userPostMapper.batchUserPost(list);
-        }
+    public void insertUserPost(SysUser user) {
+//        Long[] posts = user.getPostIds();
+//        if (StringUtils.isNotEmpty(posts))
+//        {
+//            // 新增用户与岗位管理
+//            List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
+//            for (Long postId : posts)
+//            {
+//                SysUserPost up = new SysUserPost();
+//                up.setUserId(user.getUserId());
+//                up.setPostId(postId);
+//                list.add(up);
+//            }
+//            userPostMapper.batchUserPost(list);
+//        }
     }
 
     /**
@@ -446,14 +390,11 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId 用户ID
      * @param roleIds 角色组
      */
-    public void insertUserRole(Long userId, Long[] roleIds)
-    {
-        if (StringUtils.isNotEmpty(roleIds))
-        {
+    public void insertUserRole(Long userId, Long[] roleIds) {
+        if (StringUtils.isNotEmpty(roleIds)) {
             // 新增用户与角色管理
             List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
-            for (Long roleId : roleIds)
-            {
+            for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
@@ -472,14 +413,13 @@ public class SysUserServiceImpl implements ISysUserService
     @CacheEvict(cacheNames = "sysUser", allEntries = true)
     @Override
     @Transactional
-    public int deleteUserById(Long userId)
-    {
+    public int deleteUserById(Long userId) {
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 删除用户与岗位表
-        userPostMapper.deleteUserPostByUserId(userId);
+//        userPostMapper.deleteUserPostByUserId(userId);
         // 删除用户与微信绑定,因为引入iot-service模块会产生循环依赖，所以先写在这个mapper里
-        userMapper.deleteBySysUserIdAndSourceClient(userId, SocialPlatformType.listWechatPlatform);
+//        userMapper.deleteBySysUserIdAndSourceClient(userId, SocialPlatformType.listWechatPlatform);
         return userMapper.deleteUserById(userId);
     }
 
@@ -492,19 +432,17 @@ public class SysUserServiceImpl implements ISysUserService
     @CacheEvict(cacheNames = "sysUser", allEntries = true)
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds)
-    {
-        for (Long userId : userIds)
-        {
+    public int deleteUserByIds(Long[] userIds) {
+        for (Long userId : userIds) {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
         }
         // 删除用户与角色关联
         userRoleMapper.deleteUserRole(userIds);
         // 删除用户与岗位关联
-        userPostMapper.deleteUserPost(userIds);
+//        userPostMapper.deleteUserPost(userIds);
         // 删除用户与微信关联,因为引入iot-service模块会产生循环依赖，所以先写在这个mapper里
-        userMapper.deleteBySysUserIdsAndSourceClient(userIds, SocialPlatformType.listWechatPlatform);
+//        userMapper.deleteBySysUserIdsAndSourceClient(userIds, SocialPlatformType.listWechatPlatform);
         return userMapper.deleteUserByIds(userIds);
     }
 
@@ -517,10 +455,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
-    {
-        if (StringUtils.isNull(userList) || userList.size() == 0)
-        {
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
+        if (StringUtils.isNull(userList) || userList.size() == 0) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -528,23 +464,18 @@ public class SysUserServiceImpl implements ISysUserService
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (SysUser user : userList)
-        {
-            try
-            {
+        for (SysUser user : userList) {
+            try {
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
-                if (StringUtils.isNull(u))
-                {
+                if (StringUtils.isNull(u)) {
                     BeanValidators.validateWithException(validator, user);
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     this.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                }
-                else if (isUpdateSupport)
-                {
+                } else if (isUpdateSupport) {
                     BeanValidators.validateWithException(validator, user);
                     checkUserAllowed(user);
                     checkUserDataScope(user.getUserId());
@@ -552,28 +483,21 @@ public class SysUserServiceImpl implements ISysUserService
                     this.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
-                }
-                else
-                {
+                } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
                 }
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }
         }
-        if (failureNum > 0)
-        {
+        if (failureNum > 0) {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
-        }
-        else
-        {
+        } else {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();
@@ -614,7 +538,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public List<SysUser> selectAllSubUser(Long deptId){
+    public List<SysUser> selectAllSubUser(Long deptId) {
         return userMapper.selectAllSubUser(deptId);
     }
 
@@ -624,7 +548,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public SysUser getDeptUserByUserId(Long userId){
+    public SysUser getDeptUserByUserId(Long userId) {
         return userMapper.getDeptUserByUserId(userId);
     }
 
@@ -632,14 +556,21 @@ public class SysUserServiceImpl implements ISysUserService
     public List<SysUser> listTerminal(SysUser user) {
         return userMapper.listTerminal(user);
     }
+
     /**
      * 根据机构id获取当前机构所有非管理用户
      * @return
      */
     @Override
-    public List<SysUser> selectByDeptId(){
+    public List<SysUser> selectByDeptId() {
         Long deptId = SecurityUtils.getDeptId();
         return userMapper.selectByDeptId(deptId);
     }
 
+    @Override
+    public List<SysUser> selectByRoleId(Long roleId) {
+        return userMapper.selectByRoleId(roleId);
+    }
+
+
 }
diff --git a/maibu-service/maibu-system-service/src/main/resources/system/SysPostMapper.xml b/maibu-service/maibu-system-service/src/main/resources/system/SysPostMapper.xml
deleted file mode 100644
index f7b07eb..0000000
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysPostMapper.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.maibu.mapper.SysPostMapper">
-
-	<resultMap type="SysPost" id="SysPostResult">
-		<id     property="postId"        column="post_id"       />
-		<result property="postCode"      column="post_code"     />
-		<result property="postName"      column="post_name"     />
-		<result property="postSort"      column="post_sort"     />
-		<result property="status"        column="status"        />
-		<result property="createBy"      column="create_by"     />
-		<result property="createTime"    column="create_time"   />
-		<result property="updateBy"      column="update_by"     />
-		<result property="updateTime"    column="update_time"   />
-		<result property="remark"        column="remark"        />
-	</resultMap>
-	
-	<sql id="selectPostVo">
-        select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
-		from sys_post
-    </sql>
-	
-	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
-	    <include refid="selectPostVo"/>
-		<where>
-			<if test="postCode != null and postCode != ''">
-				AND post_code like concat('%', #{postCode}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="postName != null and postName != ''">
-				AND post_name like concat('%', #{postName}, '%')
-			</if>
-		</where>
-	</select>
-	
-	<select id="selectPostAll" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-	</select>
-	
-	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		where post_id = #{postId}
-	</select>
-	
-	<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
-		select p.post_id
-        from sys_post p
-	        left join sys_user_post up on up.post_id = p.post_id
-	        left join sys_user u on u.user_id = up.user_id
-	    where u.user_id = #{userId}
-	</select>
-	
-	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
-		select p.post_id, p.post_name, p.post_code
-		from sys_post p
-			 left join sys_user_post up on up.post_id = p.post_id
-			 left join sys_user u on u.user_id = up.user_id
-		where u.user_name = #{userName}
-	</select>
-	
-	<select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		 where post_name=#{postName} limit 1
-	</select>
-	
-	<select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		 where post_code=#{postCode} limit 1
-	</select>
-	
-	<update id="updatePost" parameterType="SysPost">
- 		update sys_post
- 		<set>
- 			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
- 			<if test="postName != null and postName != ''">post_name = #{postName},</if>
- 			<if test="postSort != null">post_sort = #{postSort},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where post_id = #{postId}
-	</update>
- 	
- 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
- 		insert into sys_post(
- 			<if test="postId != null and postId != 0">post_id,</if>
- 			<if test="postCode != null and postCode != ''">post_code,</if>
- 			<if test="postName != null and postName != ''">post_name,</if>
- 			<if test="postSort != null">post_sort,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="postId != null and postId != 0">#{postId},</if>
- 			<if test="postCode != null and postCode != ''">#{postCode},</if>
- 			<if test="postName != null and postName != ''">#{postName},</if>
- 			<if test="postSort != null">#{postSort},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<delete id="deletePostById" parameterType="Long">
-		delete from sys_post where post_id = #{postId}
-	</delete>
-	
-	<delete id="deletePostByIds" parameterType="Long">
- 		delete from sys_post where post_id in
- 		<foreach collection="array" item="postId" open="(" separator="," close=")">
- 			#{postId}
-        </foreach> 
- 	</delete>
-
-</mapper> 
\ No newline at end of file
diff --git a/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMapper.xml b/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMapper.xml
index 6adcfe5..0ff7ed7 100644
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMapper.xml
+++ b/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMapper.xml
@@ -19,20 +19,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"           column="update_by"             />
 		<result property="updateTime"         column="update_time"           />
 		<result property="remark"             column="remark"                />
+		<result property="menuList"           column="menu_list"             />
+		<result property="siteAccess"           column="site_access"             />
 	</resultMap>
 
 	<sql id="selectRoleVo">
 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
-            r.status, r.del_flag, r.create_time, r.remark
+            r.status, r.del_flag, r.create_time, r.remark,r.site_access
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
-	        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		where r.del_flag = '0'
+		SELECT
+		r.role_id,
+		r.role_name,
+		r.role_key,
+		r.role_sort,
+		r.data_scope,
+		r.menu_check_strictly,
+		r.dept_check_strictly,
+		r.status,
+		r.del_flag,
+		r.create_time,
+		r.remark,
+		r.site_access
+		GROUP_CONCAT(srm.menu_id) AS menu_list
+		FROM sys_role r
+		LEFT JOIN sys_user_role ur ON ur.role_id = r.role_id
+		LEFT JOIN sys_user u ON u.user_id = ur.user_id
+		LEFT JOIN sys_role_menu srm ON srm.role_id = r.role_id
+
+		where r.del_flag = 0
 		<if test="roleId != null and roleId != 0">
 			AND r.role_id = #{roleId}
 		</if>
@@ -51,18 +70,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
 			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
+		GROUP BY r.role_id
 		order by r.role_sort
 	</select>
 
 	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		WHERE r.del_flag = '0' and ur.user_id = #{userId}
+		WHERE r.del_flag = 0 and ur.user_id = #{userId}
 	</select>
 
 	<select id="selectRoleAll" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
+		SELECT
+		r.role_id,
+		r.role_name,
+		r.role_key,
+		r.role_sort,
+		r.data_scope,
+		r.menu_check_strictly,
+		r.dept_check_strictly,
+		r.status,
+		r.del_flag,
+		r.create_time,
+		r.remark,
+		r.site_access,
+		GROUP_CONCAT(srm.menu_id) AS menu_list
+		FROM sys_role r
+		LEFT JOIN sys_user_role ur ON ur.role_id = r.role_id
+		LEFT JOIN sys_user u ON u.user_id = ur.user_id
+		LEFT JOIN sys_role_menu srm ON srm.role_id = r.role_id
+		where r.del_flag = 0
+		GROUP BY r.role_id
+		order by r.role_sort
 	</select>
 
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
@@ -80,17 +118,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		WHERE r.del_flag = '0' and u.user_name = #{userName}
+		WHERE r.del_flag = 0 and u.user_name = #{userName}
 	</select>
 
 	<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		 where r.role_name=#{roleName} and r.del_flag = '0' limit 1
+		 where r.role_name=#{roleName} and r.del_flag = 0 limit 1
 	</select>
 
 	<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
+		 where r.role_key=#{roleKey} and r.del_flag = 0 limit 1
 	</select>
 
     <select id="selectRoleByIds" resultMap="SysRoleResult">
@@ -118,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="deptCheckStrictly != null">dept_check_strictly,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
+			<if test="siteAccess != null and siteAccess != ''">site_access,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
@@ -130,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
+		    <if test="siteAccess != null and siteAccess != ''">#{siteAccess},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			sysdate()
  		)
@@ -146,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="siteAccess != null">site_access = #{siteAccess},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
@@ -153,11 +194,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 
 	<delete id="deleteRoleById" parameterType="Long">
- 		update sys_role set del_flag = '2' where role_id = #{roleId}
+ 		update sys_role set del_flag = 1 where role_id = #{roleId}
  	</delete>
 
  	<delete id="deleteRoleByIds" parameterType="Long">
- 	    update sys_role set del_flag = '2' where role_id in
+ 	    update sys_role set del_flag = 1 where role_id in
  		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
         </foreach>
diff --git a/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMenuMapper.xml b/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMenuMapper.xml
index f0d05b5..bc9f938 100644
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMenuMapper.xml
+++ b/maibu-service/maibu-system-service/src/main/resources/system/SysRoleMenuMapper.xml
@@ -25,11 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<delete id="deleteRoleMenu" parameterType="Long">
  		delete from sys_role_menu where role_id in
- 		<foreach collection="array" item="ids" index="roleId" open="(" separator="," close=")">
+ 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
  			#{roleId}
         </foreach> 
  	</delete>
-	
+
 	<insert id="batchRoleMenu">
 		insert into sys_role_menu(role_id, menu_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
diff --git a/maibu-service/maibu-system-service/src/main/resources/system/SysUserMapper.xml b/maibu-service/maibu-system-service/src/main/resources/system/SysUserMapper.xml
index 4a86f6f..9a573fa 100644
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysUserMapper.xml
+++ b/maibu-service/maibu-system-service/src/main/resources/system/SysUserMapper.xml
@@ -6,7 +6,9 @@
 
     <resultMap type="com.maibu.core.domain.entity.SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
-        <result property="deptId" column="dept_id"/>
+        <result property="orgId" column="org_id"/>
+        <result property="siteId" column="site_id"/>
+        <result property="roleId" column="role_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="email" column="email"/>
@@ -29,22 +31,9 @@
         <result property="openId" column="open_id"/>
         <result property="displayPassword" column="display_password"/>
         <result property="aiChatNum" column="ai_chat_num"/>
-        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
 
-    <resultMap id="deptResult" type="SysDept">
-        <id property="deptId" column="dept_id"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="deptName" column="dept_name"/>
-        <result property="ancestors" column="ancestors"/>
-        <result property="orderNum" column="order_num"/>
-        <result property="leader" column="leader"/>
-        <result property="status" column="dept_status"/>
-        <result property="deptUserId" column="dept_user_id"/>
-        <result property="deptUserName" column="dept_user_name"/>
-    </resultMap>
-
     <resultMap id="RoleResult" type="SysRole">
         <id property="roleId" column="role_id"/>
         <result property="roleName" column="role_name"/>
@@ -55,26 +44,21 @@
     </resultMap>
 
     <sql id="selectUserVo">
-        select u.ai_chat_num,u.display_password,u.open_id,u.session_id,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber,
+        select u.ai_chat_num,u.display_password,u.open_id,u.session_id,u.user_id, u.dept_id,u.org_id,u.site_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber,
         u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        d.dept_user_id,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
-        (select su.user_name from sys_user su where su.user_id = d.dept_user_id) as dept_user_name,
         ap.language,ap.time_zone
         from sys_user u
-        left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
         left join app_preferences ap on u.user_id = ap.user_id
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+        select u.user_id, u.dept_id,u.org_id,u.site_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-        d.dept_name, d.leader, d.dept_user_id, r.role_id, r.role_key
+        r.role_id, r.role_key
         from sys_user u
-        left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
         where u.del_flag = '0'
@@ -90,27 +74,18 @@
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
         </if>
-        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        <if test="orgId != null and orgId != 0">
+            AND u.org_id = #{orgId}
         </if>
-        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-            AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-        </if>
-        <if test="deptId != null and deptId != 0 and showChild != null and showChild">
-            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
-            ancestors) ))
-        </if>
-        <if test="deptId != null and deptId != 0 and showChild != null and !showChild">
-            AND u.dept_id = #{deptId}
+        <if test="siteId != null and siteId != 0">
+            AND u.site_id = #{siteId}
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
     <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
         from sys_user u
-        left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
         where u.del_flag = '0' and r.role_id = #{roleId}
@@ -121,17 +96,14 @@
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
     <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
         from sys_user u
-        left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
         where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
-        and u.dept_id = #{deptId}
         and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and
         ur.role_id = #{roleId})
         <if test="userName != null and userName != ''">
@@ -141,7 +113,6 @@
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
@@ -151,7 +122,7 @@
 
     <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.user_id = #{userId}
+        where u.user_id = #{userId} and u.del_flag = '0'
     </select>
 
     <select id="selectUserByOpenId" parameterType="String" resultMap="SysUserResult">
@@ -180,6 +151,8 @@
         insert into sys_user(
         <if test="userId != null and userId != 0">user_id,</if>
         <if test="deptId != null">dept_id,</if>
+        <if test="orgId != null">org_id,</if>
+        <if test="siteId != null">site_id,</if>
         <if test="userName != null and userName != ''">user_name,</if>
         <if test="nickName != null and nickName != ''">nick_name,</if>
         <if test="email != null and email != ''">email,</if>
@@ -198,6 +171,8 @@
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
+        <if test="orgId != null and orgId != ''">#{orgId},</if>
+        <if test="siteId != null and siteId != ''">#{siteId},</if>
         <if test="userName != null and userName != ''">#{userName},</if>
         <if test="nickName != null and nickName != ''">#{nickName},</if>
         <if test="email != null and email != ''">#{email},</if>
@@ -220,6 +195,8 @@
         update sys_user
         <set>
             <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+            <if test="orgId != null and orgId != 0">org_id = #{orgId},</if>
+            <if test="siteId != null and siteId != 0">site_id = #{siteId},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
             <if test="email != null ">email = #{email},</if>
@@ -298,6 +275,8 @@
         SELECT
         u.user_id,
         u.dept_id,
+        u.site_id,
+        u.org_id,
         u.nick_name,
         u.user_name,
         u.email,
@@ -327,6 +306,8 @@
         SELECT
         u.user_id,
         u.dept_id,
+        u.site_id,
+        u.org_id,
         u.nick_name,
         u.user_name
         FROM
@@ -343,7 +324,7 @@
     </select>
 
     <select id="listTerminal" resultType="com.maibu.core.domain.entity.SysUser">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+        select u.user_id, u.dept_id,u.site_id,u.org_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_name, d.leader, d.dept_user_id, r.role_id, r.role_key
         from sys_user u
@@ -351,7 +332,6 @@
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
         where u.del_flag = '0'
-        and isnull(u.dept_id)
         <if test="userId != null and userId != 0">
             AND u.user_id = #{userId}
         </if>
@@ -379,4 +359,11 @@
         where u.dept_id = #{deptId}
         and u.user_id != d.dept_user_id
     </select>
+
+
+    <select id="selectByRoleId" parameterType="Long" resultMap="SysUserResult">
+        select u.user_id,u.user_name,u.nick_name from
+            sys_user u inner join sys_user_role sur   on u.user_id  = sur.user_id
+        where sur.role_id  = #{roleId}
+    </select>
 </mapper>
diff --git a/maibu-service/maibu-system-service/src/main/resources/system/SysUserPostMapper.xml b/maibu-service/maibu-system-service/src/main/resources/system/SysUserPostMapper.xml
deleted file mode 100644
index 54d3bc6..0000000
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysUserPostMapper.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.maibu.mapper.SysUserPostMapper">
-
-	<resultMap type="SysUserPost" id="SysUserPostResult">
-		<result property="userId"     column="user_id"      />
-		<result property="postId"     column="post_id"      />
-	</resultMap>
-
-	<delete id="deleteUserPostByUserId" parameterType="Long">
-		delete from sys_user_post where user_id=#{userId}
-	</delete>
-	
-	<select id="countUserPostById" resultType="Integer">
-	    select count(1) from sys_user_post where post_id=#{postId}  
-	</select>
-	
-	<delete id="deleteUserPost" parameterType="Long">
- 		delete from sys_user_post where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchUserPost">
-		insert into sys_user_post(user_id, post_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.userId},#{item.postId})
-		</foreach>
-	</insert>
-	
-</mapper> 
\ No newline at end of file
diff --git a/maibu-web-middleware/src/main/java/com/maibu/websocket/WebsocketHandler.java b/maibu-web-middleware/src/main/java/com/maibu/websocket/WebsocketHandler.java
index 512d12f..11124e8 100644
--- a/maibu-web-middleware/src/main/java/com/maibu/websocket/WebsocketHandler.java
+++ b/maibu-web-middleware/src/main/java/com/maibu/websocket/WebsocketHandler.java
@@ -2,8 +2,8 @@ package com.maibu.websocket;
 
 import com.maibu.common.CommandConstant;
 import com.maibu.common.MiddleConstant;
+import com.maibu.core.enums.CommandRequestType;
 import com.maibu.dto.*;
-import com.maibu.enums.CommandRequestType;
 import com.maibu.memory.MiddleGlobalMemory;
 import com.maibu.netty.NettyClient;
 import com.maibu.utils.CommandUtils;