物模型的新增和修改和查看列表接口

2026-05-07 16:05:26 +08:00
parent 364d9d80dc
commit 7264a4ab49
20 changed files with 717 additions and 223 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,181 +5,39 @@
  </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/SysDeviceModelController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceActionMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceModelMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceModelPropertyMappingMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDevicePropertyMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceActionService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceModelPropertyMappingService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceModelService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDevicePropertyService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceActionServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceModelPropertyMappingServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceModelServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDevicePropertyServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceActionMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceModelMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceModelPropertyMappingMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysDevicePropertyMapper.xml" 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/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/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-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-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-common/src/main/java/com/maibu/core/business/DeviceAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/DeviceAction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/DeviceModelProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/DeviceModelProperty.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" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
+  <component name="DatabaseLocalColorSettings">
+    <colors>
+      <entry key="maibu/019f10b4-77b4-4949-81b0-7a4b0c5121ad:SCHEMA" value="Green" />
+    </colors>
+  </component>
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
@@ -190,9 +48,31 @@
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
+  <component name="HttpClientEndpointsTabState">
+    <option name="cachedRequestData" value="&lt;CachedHttpClientTabRequests&gt;&#10;  &lt;entry key=&quot;45c16fd27b8c9d2e42db8a9886c27e80ed8db5aa&quot; value=&quot;###&amp;#10;POST http://localhost:8061/system/devicemodel/add&amp;#10;Content-Type: application/json&amp;#10;&amp;#10;{&amp;#10;  &amp;quot;id&amp;quot;: 0,&amp;#10;  &amp;quot;name&amp;quot;: &amp;quot;&amp;quot;,&amp;#10;  &amp;quot;connectType&amp;quot;: &amp;quot;TCP&amp;quot;,&amp;#10;  &amp;quot;supportProperties&amp;quot;: [],&amp;#10;  &amp;quot;version&amp;quot;: &amp;quot;&amp;quot;,&amp;#10;  &amp;quot;deviceType&amp;quot;: 0,&amp;#10;  &amp;quot;supportActions&amp;quot;: [],&amp;#10;  &amp;quot;createBy&amp;quot;: &amp;quot;&amp;quot;,&amp;#10;  &amp;quot;createTime&amp;quot;: &amp;quot;&amp;quot;,&amp;#10;  &amp;quot;updateBy&amp;quot;: &amp;quot;&amp;quot;,&amp;#10;  &amp;quot;updateTime&amp;quot;: &amp;quot;&amp;quot;,&amp;#10;  &amp;quot;delFlag&amp;quot;: false,&amp;#10;  &amp;quot;params&amp;quot;: &amp;quot;&amp;quot;,&amp;#10;  &amp;quot;remark&amp;quot;: &amp;quot;&amp;quot;&amp;#10;}&quot; /&gt;&#10;&lt;/CachedHttpClientTabRequests&gt;" />
+  </component>
+  <component name="HttpClientOnboardingState"><![CDATA[{
+  "isOnboardingCommentShown": true
+}]]></component>
  <component name="McpProjectServerCommands">
-    <commands />
-    <urls />
+    <McpServerCommand sourceId="UserConfigurationSource">
+      <option name="allowedToolsNames" />
+      <option name="enabled" value="true" />
+      <option name="name" value="" />
+      <option name="programPath" value="" />
+      <option name="arguments" value="" />
+      <option name="workingDirectory" value="" />
+      <envs />
+    </McpServerCommand>
+    <McpServerCommand sourceId="UserConfigurationSource">
+      <option name="allowedToolsNames" />
+      <option name="enabled" value="true" />
+      <option name="name" value="" />
+      <option name="programPath" value="" />
+      <option name="arguments" value="" />
+      <option name="workingDirectory" value="" />
+      <envs />
+    </McpServerCommand>
  </component>
  <component name="ProjectColorInfo">{
  &quot;associatedIndex&quot;: 1
@@ -202,37 +82,38 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <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;,
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    &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-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;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;onboarding.tips.debug.path&quot;: &quot;D:/code/MiddlePlatform/maibu-service/maibu-system-service/src/main/java/com/maibu/Main.java&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.CommitDialog&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "Application.test.executor": "Debug",
+    "HTTP Request.MiddlePlatformApplication | #1.executor": "Run",
+    "Maven.MiddlePlatform [clean].executor": "Run",
+    "Maven.MiddlePlatform [install].executor": "Run",
+    "Maven.maibu-netty-server [clean].executor": "Run",
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.MCP Project settings loaded": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    "Spring Boot.MiddlePlatformApplication.executor": "Run",
+    "git-widget-placeholder": "main",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/home/maibu/Test/MiddlePlatform/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "onboarding.tips.debug.path": "D:/code/MiddlePlatform/maibu-service/maibu-system-service/src/main/java/com/maibu/Main.java",
+    "settings.editor.selected.configurable": "project.propVCSSupport.CommitDialog",
+    "vue.rearranger.settings.migration": "true"
  }
-}</component>
+}]]></component>
  <component name="RdControllerToolWindowsLayoutState" isNewUi="true">
    <layout>
      <window_info id="Bookmarks" side_tool="true" />
@@ -241,50 +122,65 @@
      <window_info id="Commit_Guest" show_stripe_button="false" />
      <window_info id="Pull Requests" />
      <window_info id="Learn" show_stripe_button="false" />
-      <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 active="true" content_ui="combo" id="Project" order="0" sideWeight="0.5010537" visible="true" weight="0.30316347" />
+      <window_info id="Commit" order="1" sideWeight="0.5010537" weight="0.30316347" />
+      <window_info id="Structure" order="2" sideWeight="0.49894625" side_tool="true" weight="0.26801407" />
      <window_info anchor="bottom" id="Database Changes" />
      <window_info anchor="bottom" id="TypeScript" />
      <window_info anchor="bottom" id="Profiler" />
      <window_info anchor="bottom" id="TODO" />
      <window_info anchor="bottom" id="File Transfer" />
-      <window_info anchor="bottom" id="Version Control" order="0" weight="0.48920512" />
+      <window_info anchor="bottom" id="Version Control" order="0" />
      <window_info anchor="bottom" id="Problems" order="1" />
-      <window_info anchor="bottom" id="Problems View" order="2" weight="0.5019627" />
-      <window_info anchor="bottom" id="Terminal" order="3" />
+      <window_info anchor="bottom" id="Problems View" order="2" weight="0.4044193" />
+      <window_info anchor="bottom" id="Terminal" order="3" weight="0.8218842" />
      <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.3302257" />
-      <window_info anchor="bottom" id="Find" order="7" weight="0.3302257" />
-      <window_info anchor="bottom" id="Debug" order="8" visible="true" weight="0.3370952" />
-      <window_info anchor="right" id="Endpoints" />
+      <window_info anchor="bottom" id="SQL Generator" order="5" weight="0.4044193" />
+      <window_info anchor="bottom" id="Find" order="6" weight="0.3302257" />
+      <window_info anchor="bottom" id="Build" order="7" weight="0.3302257" />
+      <window_info active="true" anchor="bottom" id="Run" order="8" visible="true" weight="0.41265947" />
+      <window_info anchor="bottom" id="Debug" order="9" weight="0.5402355" />
+      <window_info anchor="right" id="PR AI Assistant" />
      <window_info anchor="right" id="documentation.v2" show_stripe_button="false" side_tool="true" />
-      <window_info anchor="right" id="Coverage" side_tool="true" />
-      <window_info anchor="right" id="Beans" />
-      <window_info anchor="right" content_ui="combo" id="Notifications" order="0" weight="0.25" />
-      <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="Notifications" order="0" weight="0.3481241" />
+      <window_info anchor="right" id="AIAssistant" order="1" sideWeight="0.50110745" weight="0.24399531" />
+      <window_info anchor="right" id="Database" order="2" weight="0.24399531" />
      <window_info anchor="right" id="Gradle" order="3" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="4" weight="0.20415935" />
+      <window_info active="true" anchor="right" id="Maven" order="4" sideWeight="0.50110745" visible="true" weight="0.24399531" />
+      <window_info anchor="right" id="Coverage" order="5" sideWeight="0.27408636" side_tool="true" weight="0.244228" />
+      <window_info anchor="right" id="Beans" order="6" sideWeight="0.50110745" weight="0.24399531" />
+      <window_info anchor="right" id="Endpoints" order="7" sideWeight="0.72591364" weight="0.24399531" />
    </layout>
  </component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl" />
+      <recent name="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service" />
+      <recent name="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper" />
+      <recent name="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system" />
      <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" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.maibu.controller" />
      <recent name="com.maibu.core.business" />
      <recent name="com.maibu.memory" />
      <recent name="com.maibu.service" />
      <recent name="com.maibu.mapper" />
-      <recent name="com.maibu.web.controller.system" />
    </key>
  </component>
+  <component name="RunDashboard">
+    <option name="configurationStatuses">
+      <map>
+        <entry key="HttpClient.HttpRequestRunConfigurationType">
+          <value>
+            <map>
+              <entry key="MiddlePlatformApplication | #1" value="STOPPED" />
+            </map>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
  <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" />
@@ -299,6 +195,9 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
+    <configuration name="MiddlePlatformApplication | #1" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/MiddlePlatformApplication.http" executionIdentifier="#1" runType="Run single request">
+      <method v="2" />
+    </configuration>
    <configuration default="true" type="JetRunConfigurationType">
      <module name="maibu-iot-service" />
      <method v="2">
@@ -334,6 +233,7 @@
    <recent_temporary>
      <list>
        <item itemvalue="Spring Boot.MiddlePlatformApplication" />
+        <item itemvalue="HTTP Request.MiddlePlatformApplication | #1" />
        <item itemvalue="Application.test" />
      </list>
    </recent_temporary>
@@ -373,7 +273,14 @@
      <workItem from="1777443053830" duration="11329000" />
      <workItem from="1777508899679" duration="10803000" />
      <workItem from="1777523683395" duration="1929000" />
-      <workItem from="1777526446322" duration="7174000" />
+      <workItem from="1777526446322" duration="7624000" />
+      <workItem from="1777534532156" duration="400000" />
+      <workItem from="1777534941021" duration="1388000" />
+      <workItem from="1777536404885" duration="75000" />
+      <workItem from="1777536497397" duration="4839000" />
+      <workItem from="1778042711435" duration="13630000" />
+      <workItem from="1778058957116" duration="9296000" />
+      <workItem from="1778122560817" duration="16187000" />
    </task>
    <task id="LOCAL-00001" summary="#update">
      <option name="closed" value="true" />
@@ -407,7 +314,31 @@
      <option name="project" value="LOCAL" />
      <updated>1776997902016</updated>
    </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="#update">
+      <option name="closed" value="true" />
+      <created>1777533958746</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1777533958746</updated>
+    </task>
+    <task id="LOCAL-00006" summary="#update">
+      <option name="closed" value="true" />
+      <created>1777533965657</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1777533965657</updated>
+    </task>
+    <task id="LOCAL-00007" summary="#update">
+      <option name="closed" value="true" />
+      <created>1778051353366</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1778051353366</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeviceModelController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeviceModelController.java
@@ -0,0 +1,307 @@
+package com.maibu.web.controller.system;
+
+import com.maibu.annotation.Log;
+import com.maibu.core.business.Device;
+import com.maibu.core.business.DeviceModel;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.enums.BusinessType;
+import com.maibu.mapper.DeviceRunStatisticsMapper;
+import com.maibu.mybatis.LambdaQueryWrapperX;
+import com.maibu.service.IDeviceService;
+import com.maibu.service.SysDeviceModelService;
+import com.maibu.utils.StringUtils;
+import com.maibu.utils.poi.ExcelUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 设备模型模块
+ */
+@Api(tags = "设备模型模块")
+@RestController
+@RequestMapping("/system/devicemodel")
+public class SysDeviceModelController extends BaseController {
+    @Autowired
+    private SysDeviceModelService deviceModelService;
+
+    /*@Autowired
+    private DeviceRunStatisticsMapper deviceRunStatisticsMapper;*/
+
+
+    @PostMapping("/add")
+    @ApiOperation("新增设备模型")
+    public AjaxResult add(@RequestBody DeviceModel deviceModel) {
+        // 参数校验
+        if (deviceModel.getName() == null || deviceModel.getName().isEmpty()) {
+            return AjaxResult.error("模型名称不能为空");
+        }
+
+        // 至少需要一个属性或动作
+        if (CollectionUtils.isEmpty(deviceModel.getSupportProperties())
+                && CollectionUtils.isEmpty(deviceModel.getSupportActions())) {
+            return AjaxResult.error("至少需要定义一个属性或动作");
+        }
+
+        int rows = deviceModelService.insertDeviceModel(deviceModel);
+        return toAjax(rows);
+    }
+
+
+
+    //@PreAuthorize("@ss.hasPermi('iot:deviceModel:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询设备模型列表")
+    public AjaxResult list(DeviceModel deviceModel) {
+        List<DeviceModel> list = deviceModelService.selectDeviceModelList(deviceModel);
+        return AjaxResult.success(list);
+    }
+
+
+   // @PreAuthorize("@ss.hasPermi('iot:deviceModel:edit')")
+   @PostMapping("/update") // 或者 @PutMapping
+   @ApiOperation("修改设备模型")
+   public AjaxResult edit(@RequestBody DeviceModel deviceModel) {
+       // 1. 校验 ID
+       if (deviceModel.getId() == null) {
+           return AjaxResult.error("模型ID不能为空");
+       }
+
+       // 2. 检查是否存在
+       DeviceModel existModel = deviceModelService.selectDeviceModelById(deviceModel.getId());
+       if (existModel == null) {
+           return AjaxResult.error("模型不存在");
+       }
+
+       // 3. 执行更新
+       int rows = deviceModelService.updateDeviceModel(deviceModel);
+       return toAjax(rows);
+   }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//
+//    /**
+//     * 查询模型的列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:devicemodel:list')")
+//    @GetMapping("/list")
+//    @ApiOperation("设备分页列表")
+//    public TableDataInfo list(Device device) {
+//        startPage();
+//        return getDataTable(deviceService.selectDeviceList(device));
+//    }
+//
+//
+//    @GetMapping("/userDevice")
+//    public AjaxResult userDevice(Device device) {
+//        return AjaxResult.success(deviceService.selectDeviceList(device));
+//    }
+//
+//
+//    /**
+//     * 导出设备列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:devicemodel:export')")
+//    @Log(title = "设备", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    @ApiOperation("导出设备")
+//    public void export(HttpServletResponse response, Device device) {
+//        List<Device> list = deviceService.selectDeviceList(device);
+//        ExcelUtil<Device> util = new ExcelUtil<Device>(Device.class);
+//        util.exportExcel(response, list, "设备数据");
+//    }
+//
+//
+//    /**
+//     * 根据设备编号详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('iot:device:query')")
+//    @GetMapping(value = "/getDeviceBySerialNumber/{serialNumber}")
+//    @ApiOperation("根据设备编号获取设备详情")
+//    public AjaxResult getInfoBySerialNumber(@PathVariable("serialNumber") String serialNumber) {
+//        return AjaxResult.success(deviceService.selectDeviceBySerialNumber(serialNumber));
+//    }
+
+
+    /**
+     * 重置设备状态
+     */
+ /*   @PreAuthorize("@ss.hasPermi('iot:device:edit')")
+    @Log(title = "重置设备状态", businessType = BusinessType.UPDATE)
+    @PutMapping("/reset/{serialNumber}")
+    @ApiOperation("重置设备状态")
+    public AjaxResult resetDeviceStatus(@PathVariable String serialNumber) {
+        Device device = new Device();
+        device.setSerialNumber(serialNumber);
+        return toAjax(deviceService.resetDeviceStatus(device.getSerialNumber()));
+    }
+*/
+
+  /*  @GetMapping("/getDeviceRunStatistics")
+    public AjaxResult getDeviceRunStatistics(@RequestParam("deviceId") String deviceId) {
+        if (StringUtils.isEmpty(deviceId)) {
+            return error("请选择设备");
+        }
+        LambdaQueryWrapperX<DeviceRunStatistics> queryWrapperX = new LambdaQueryWrapperX<>();
+        queryWrapperX.eq(DeviceRunStatistics::getDeviceId, deviceId);
+        queryWrapperX.orderByDesc(DeviceRunStatistics::getEndTime);
+        queryWrapperX.last("LIMIT 10");
+        return AjaxResult.success(deviceRunStatisticsMapper.selectList(queryWrapperX));
+    }
+*/
+  /*  @GetMapping("/getDeviceIntradayData")
+    public AjaxResult getDeviceIntradayData(@RequestParam("deviceId") String deviceId) {
+        List<DeviceRunStatistics> resultList = getIntradayData();
+        DeviceRunStatistics statistics = null;
+        if (!CollectionUtils.isEmpty(resultList)) {
+            statistics = resultList.stream().filter(x -> deviceId.equals(x.getDeviceId())).findFirst().orElse(null);
+        }
+        return AjaxResult.success(statistics);
+    }
+
+    public List<DeviceRunStatistics> getIntradayData() {
+        LambdaQueryWrapperX<DeviceRunStatistics> wrapper = new LambdaQueryWrapperX<>();
+        LocalDateTime start = LocalDate.now().atStartOfDay();       // 今天 00:00:00
+        LocalDateTime end = LocalDate.now().plusDays(1).atStartOfDay(); // 明天 00:00:00
+
+        wrapper.ge(DeviceRunStatistics::getStartTime, start)
+                .lt(DeviceRunStatistics::getStartTime, end);
+
+        List<DeviceRunStatistics> list = deviceRunStatisticsMapper.selectList(wrapper);
+        List<DeviceRunStatistics> resultList = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(list)) {
+            resultList = list.stream()
+                    .collect(Collectors.groupingBy(DeviceRunStatistics::getDeviceId))
+                    .values()
+                    .stream()
+                    .map(group -> {
+                        DeviceRunStatistics sum = new DeviceRunStatistics();
+                        sum.setDeviceId(group.get(0).getDeviceId());
+
+                        sum.setWorkArea(
+                                group.stream().mapToDouble(DeviceRunStatistics::getWorkArea).sum()
+                        );
+
+                        sum.setTime(
+                                group.stream().mapToLong(DeviceRunStatistics::getTime).sum()
+                        );
+
+                        return sum;
+                    })
+                    .collect(Collectors.toList());
+        }
+        List<String> l = resultList.stream().map(DeviceRunStatistics::getDeviceId).collect(Collectors.toList());
+        Device d = new Device();
+        d.setParams(new HashMap<>());
+        List<Device> query = deviceService.selectDeviceList(d);
+        if (!CollectionUtils.isEmpty(query) && !CollectionUtils.isEmpty(l)) {
+            for (Device device : query) {
+                if (!l.contains(device.getDeviceName())) {
+                    DeviceRunStatistics statistics = new DeviceRunStatistics();
+                    statistics.setDeviceId(device.getDeviceName());
+                    statistics.setTime(0L);
+                    statistics.setWorkArea(0.0);
+                    resultList.add(statistics);
+                }
+            }
+        }
+        return resultList;
+    }*/
+
+/*    @GetMapping("/generateOperationReport")
+    public void generateOperationReport(HttpServletResponse response) throws UnsupportedEncodingException {
+        List<DeviceRunStatistics> resultList = getIntradayData();
+        // ✅ 4. 响应头（下载）
+        response.setContentType(
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+
+        String fileName = URLEncoder.encode("设备统计.xlsx", "UTF-8");
+        response.setHeader("Content-Disposition",
+                "attachment;filename=" + fileName);
+        try (Workbook workbook = new XSSFWorkbook();
+             OutputStream os = response.getOutputStream()) {
+
+            Sheet sheet = workbook.createSheet("当日工作量统计");
+
+            // ✅ 1. 表头
+            Row header = sheet.createRow(0);
+            header.createCell(0).setCellValue("设备号");
+            header.createCell(1).setCellValue("工作面积(m2)");
+            header.createCell(2).setCellValue("工作时长(分钟)");
+
+            // ✅ 2. 数据
+            for (int i = 0; i < resultList.size(); i++) {
+                DeviceRunStatistics d = resultList.get(i);
+                Row row = sheet.createRow(i + 1);
+
+                row.createCell(0).setCellValue(d.getDeviceId());
+                row.createCell(1).setCellValue(d.getWorkArea());
+                row.createCell(2).setCellValue(d.getTime());
+            }
+
+            // ✅ 3. 自动列宽（可选）
+            for (int i = 0; i < 3; i++) {
+                sheet.autoSizeColumn(i);
+            }
+
+
+            // ✅ 5. 写出
+            workbook.write(os);
+            os.flush();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }*/
+
+}
--- a/maibu-common/src/main/java/com/maibu/core/business/DeviceAction.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/DeviceAction.java
@@ -1,8 +1,10 @@
 package com.maibu.core.business;

 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.fasterxml.jackson.annotation.JsonInclude;
 import com.maibu.core.domain.BaseDO;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class DeviceAction extends BaseDO {
    private String actionId;

    private String actionName;
-
+    // 关键：加上类型处理器，自动把 Map 转 JSON 存数据库
+    @TableField(typeHandler = JacksonTypeHandler.class)
    private Map<String,Object> params;

 }
--- a/maibu-common/src/main/java/com/maibu/core/business/DeviceModelProperty.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/DeviceModelProperty.java
@@ -40,4 +40,6 @@ public class DeviceModelProperty extends BaseDO {
    private Boolean required;

    private Object defaultValue;
+   //是否告警信息
+    private Boolean isAlarm;
 }
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceActionMapper.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceActionMapper.java
@@ -0,0 +1,28 @@
+package com.maibu.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.maibu.core.business.DeviceAction;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_action(设备动作定义表)】的数据库操作Mapper
+ * @createDate 2026-05-07 12:33:48
+ * @Entity abbc.domain.IotDeviceAction
+ */
+@Mapper
+public interface SysDeviceActionMapper extends BaseMapper<DeviceAction> {
+
+
+    default List<DeviceAction> selectByModelId(Long modelId) {
+        return this.selectList(
+                new LambdaQueryWrapper<DeviceAction>()
+                        .eq(DeviceAction::getModelId, modelId)
+                        .eq(DeviceAction::getDelFlag, false)
+                        .orderByAsc(DeviceAction::getId)
+        );
+    }
+}
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceModelMapper.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceModelMapper.java
@@ -0,0 +1,17 @@
+package com.maibu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.maibu.core.business.DeviceModel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_model(设备模型表)】的数据库操作Mapper
+ * @createDate 2026-05-07 11:36:11
+ * @Entity  com.maibu.core.business.DeviceModel;
+ */
+@Mapper
+public interface SysDeviceModelMapper extends BaseMapper<DeviceModel> {
+
+
+}
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceModelPropertyMappingMapper.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDeviceModelPropertyMappingMapper.java
@@ -0,0 +1 @@
+package com.maibu.mapper;
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDevicePropertyMapper.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/SysDevicePropertyMapper.java
@@ -0,0 +1,28 @@
+package com.maibu.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.maibu.core.business.DeviceModelProperty;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_property(设备属性定义表)】的数据库操作Mapper
+ * @createDate 2026-05-07 12:33:48
+ * @Entity abbc.domain.IotDeviceProperty
+ */
+@Mapper
+public interface SysDevicePropertyMapper extends BaseMapper<DeviceModelProperty> {
+
+
+     default List<DeviceModelProperty> selectByModelId(Long modelId) {
+        return this.selectList(
+                new LambdaQueryWrapper<DeviceModelProperty>()
+                        .eq(DeviceModelProperty::getModelId, modelId)
+                        .eq(DeviceModelProperty::getDelFlag, false)
+                        .orderByAsc(DeviceModelProperty::getId)
+        );
+    }
+}
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceActionService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceActionService.java
@@ -0,0 +1,13 @@
+package com.maibu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.maibu.core.business.DeviceAction;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_action(设备动作定义表)】的数据库操作Service
+ * @createDate 2026-05-07 12:33:48
+ */
+public interface SysDeviceActionService extends IService<DeviceAction> {
+
+}
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceModelPropertyMappingService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceModelPropertyMappingService.java
@@ -0,0 +1 @@
+package com.maibu.service;
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceModelService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDeviceModelService.java
@@ -0,0 +1,40 @@
+package com.maibu.service;
+
+import com.maibu.core.business.DeviceModel;
+
+import java.util.List;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_model(设备模型表)】的数据库操作Service
+ * @createDate 2026-05-07 11:36:11
+ */
+public interface SysDeviceModelService {
+    /**
+     * 新增设备模型
+     * @param deviceModel
+     * @return
+     */
+    int insertDeviceModel(DeviceModel deviceModel);
+
+    /**
+     *查询设备模型列表
+     * @param deviceModel
+     * @return
+     */
+    List<DeviceModel> selectDeviceModelList(DeviceModel deviceModel);
+
+    /**
+     * selectDeviceModelById
+     * @param id
+     * @return
+     */
+    DeviceModel selectDeviceModelById(Long id);
+
+    /**
+     * updateDeviceModel
+     * @param deviceModel
+     * @return
+     */
+    int updateDeviceModel(DeviceModel deviceModel);
+}
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDevicePropertyService.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/SysDevicePropertyService.java
@@ -0,0 +1,21 @@
+package com.maibu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.maibu.core.business.DeviceModelProperty;
+
+import java.util.List;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_property(设备属性定义表)】的数据库操作Service
+ * @createDate 2026-05-07 12:33:48
+ */
+public interface SysDevicePropertyService extends IService<DeviceModelProperty> {
+
+    /**
+     *
+     * @param id
+     * @return
+     */
+    List<DeviceModelProperty> selectByModelId(Long id);
+}
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceActionServiceImpl.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceActionServiceImpl.java
@@ -0,0 +1 @@
+package com.maibu.service.impl;
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceModelPropertyMappingServiceImpl.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceModelPropertyMappingServiceImpl.java
@@ -0,0 +1,18 @@
+package com.maibu.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.maibu.core.business.DeviceModelPropertyMapping;
+import com.maibu.mapper.SysDeviceModelPropertyMappingMapper;
+import com.maibu.service.SysDeviceModelPropertyMappingService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_model_property_mapping(设备模型属性映射表)】的数据库操作Service实现
+ * @createDate 2026-05-07 12:33:48
+ */
+@Service
+public class SysDeviceModelPropertyMappingServiceImpl extends ServiceImpl<SysDeviceModelPropertyMappingMapper, DeviceModelPropertyMapping>
+        implements SysDeviceModelPropertyMappingService {
+
+}
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceModelServiceImpl.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceModelServiceImpl.java
--- a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDevicePropertyServiceImpl.java
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDevicePropertyServiceImpl.java
@@ -0,0 +1 @@
+package com.maibu.service.impl;
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceActionMapper.xml
+++ b/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceActionMapper.xml
@@ -0,0 +1,25 @@
+<?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.SysDeviceActionMapper">
+
+    <resultMap id="BaseResultMap" type="com.maibu.core.business.DeviceAction">
+        <id property="id" column="id" />
+        <result property="modelId" column="model_id" />
+        <result property="actionId" column="action_id" />
+        <result property="actionName" column="action_name" />
+        <!-- 给 params 加上 typeHandler -->
+        <result property="params" column="params" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <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="delFlag" column="del_flag" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,model_id,action_id,action_name,params,create_by,
+        create_time,update_by,update_time,del_flag
+    </sql>
+</mapper>
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceModelMapper.xml
+++ b/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceModelMapper.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceModelPropertyMappingMapper.xml
+++ b/maibu-service/maibu-system-service/src/main/resources/system/SysDeviceModelPropertyMappingMapper.xml
@@ -0,0 +1,27 @@
+<?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.SysDeviceModelPropertyMappingMapper">
+
+    <resultMap id="BaseResultMap" type="com.maibu.core.business.DeviceModelPropertyMapping">
+        <id property="id" column="id" />
+        <result property="productId" column="product_id" />
+        <result property="modeId" column="mode_id" />
+        <result property="productInterfaceId" column="product_interface_id" />
+        <result property="standardKey" column="standard_key" />
+        <result property="sourceKey" column="source_key" />
+        <result property="dataType" column="data_type" />
+        <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="delFlag" column="del_flag" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,product_id,mode_id,product_interface_id,standard_key,source_key,
+        data_type,create_by,create_time,update_by,update_time,
+        del_flag
+    </sql>
+</mapper>
--- a/maibu-service/maibu-system-service/src/main/resources/system/SysDevicePropertyMapper.xml
+++ b/maibu-service/maibu-system-service/src/main/resources/system/SysDevicePropertyMapper.xml
@@ -0,0 +1,28 @@
+<?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.SysDevicePropertyMapper">
+
+    <resultMap id="BaseResultMap" type="com.maibu.core.business.DeviceModelProperty">
+        <id property="id" column="id" />
+        <result property="modelId" column="model_id" />
+        <result property="propertyKey" column="property_key" />
+        <result property="propertyName" column="property_name" />
+        <result property="dataType" column="data_type" />
+        <result property="unit" column="unit" />
+        <result property="required" column="required" />
+        <result property="defaultValue" column="default_value" />
+        <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="delFlag" column="del_flag" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,model_id,property_key,property_name,data_type,unit,
+        required,default_value,create_by,create_time,update_by,
+        update_time,del_flag
+    </sql>
+</mapper>