This commit is contained in:
2026-04-21 09:55:36 +08:00
parent 2784db09eb
commit c021ffa3a2
3 changed files with 26 additions and 116 deletions

125
.idea/workspace.xml generated
View File

@@ -7,120 +7,7 @@
<list default="true" id="84ac1b15-3cfa-4375-9957-45b7b581d04e" name="Changes" comment="#update">
<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/common/CommonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/common/CommonController.java" afterDir="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/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-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/application-prod.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/application-sql.yml" beforeDir="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-admin/src/main/resources/banner.txt" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/banner.txt" 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/ImportExcelVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/OutputExcelVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/UserClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/domain/entity/UserClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/iot/response/DashDeviceTotalDto.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/iot/response/DeCodeBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/iot/response/IdentityAndName.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/DeviceReplyBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/DeviceReport.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/DeviceReportBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/DeviceStatusBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/DeviceTestReportBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/GwDeviceBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/InvokeReqDto.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/MQSendMessageBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/MessageReplyBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/SubDeviceBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/mq/message/ReportDataBo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/AlertPushParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/AppGeTuiParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/EnterpriseWeChatAPPParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/NotifyConfigVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/NotifySendResponse.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/WeChatServerParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/alertPush/AlertPushItem.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/alertPush/PushMsg.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/config/DingTalkConfigParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/config/EmailConfigParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/config/VoiceConfigParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/config/WeChatConfigParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/msg/DingTalkMsgParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/msg/EmailMsgParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/msg/VoiceMsgParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/msg/WeComMsgParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/notify/msg/WechatMsgParams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/thingsModel/NeuronModel.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/thingsModel/SceneThingsModelItem.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/thingsModel/ThingsModelRuleItem.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/thingsModel/ThingsModelSimpleItem.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/thingsModel/ThingsModelValuesInput.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/NotifyChannelEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/NotifyChannelProviderEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/NotifyServiceCodeEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/OTAUpgrade.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/ThingsModelType.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/VerifyTypeEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/scenemodel/SceneModelTagOpreationEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/enums/scenemodel/SceneModelVariableTypeEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/BeanMapUtilByReflect.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/file/QRCodeUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/modbus/BitUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/modbus/ModbusUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/modbus/Mparams.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/wechat/AesException.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/wechat/ByteGroup.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/wechat/PKCS7Encoder.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/wechat/SHA1.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/wechat/WXBizMsgCrypt.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/wechat/WechatUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/utils/wechat/XMLParse.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/wechat/WeChatAppResult.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/wechat/WeChatLoginBody.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/wechat/WeChatLoginResult.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/wechat/WeChatMiniProgramResult.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/wechat/WeChatPhoneInfo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/wechat/WeChatUserInfo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/wechat/WxCallBackXmlBO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-external/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-external/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-external/src/main/java/com/maibu/own/service/PathPlanService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-external/src/main/java/com/maibu/own/service/PathPlanService.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/aspectj/DataSourceAspect.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/DataSourceConfig.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/DruidConfig.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/MyBatisConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/MyBatisConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/properties/DruidProperties.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/sharding/ShardingAlgorithmTool.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/sharding/ShardingTablesLoadRunner.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/sharding/TimeShardingAlgorithm.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/config/sharding/enums/ShardingTableCacheEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/datasource/DynamicDataSource.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/datasource/DynamicDataSourceContextHolder.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/mybatis/mapper/BaseMapperX.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-framework/src/main/java/com/maibu/mybatis/mapper/BaseMapperX.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/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/memory/GlobalMemory.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-netty-server/src/main/java/com/maibu/memory/GlobalMemory.java" afterDir="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/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/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-service/maibu-iot-service/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/pom.xml" afterDir="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/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-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/service/impl/SysConfigServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysConfigServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/AppLanguageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/AppLanguageMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/AppPreferencesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/AppPreferencesMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysDictDataMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysDictDataMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysDictTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysDictTypeMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysMenuMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysMenuMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysRoleDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysRoleDeptMapper.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/SysTranslateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysTranslateMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysUserClientMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysUserClientMapper.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/SysUserRoleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/resources/system/SysUserRoleMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/maibu-admin/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-admin/src/main/resources/logback.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -292,7 +179,15 @@
<option name="project" value="LOCAL" />
<updated>1776417161587</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="#update">
<option name="closed" value="true" />
<created>1776734458599</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1776734458599</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">