# commit

2026-05-20 09:48:21 +08:00
parent 603c3178e6
commit 330993a845
20 changed files with 372 additions and 99 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,6 @@ build/
 .DS_Store

 /logs
-.idea/*
+.idea/*
+
+*.log
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,29 +4,22 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </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" />
+    <list default="true" id="84ac1b15-3cfa-4375-9957-45b7b581d04e" name="Changes" comment="#修复工单修改接口">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/maibu-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/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$/log.path_IS_UNDEFINED/sys-debug.2026-04-28.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-debug.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-error.2026-04-28.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-error.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-info.2026-04-28.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-info.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-user.2026-04-28.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-user.2026-04-29.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-user.log" beforeDir="false" afterPath="$PROJECT_DIR$/log.path_IS_UNDEFINED/sys-user.log" 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-service/maibu-iot-service/src/main/java/com/maibu/controller/AlarmController.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/AlarmController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IAlarmService.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IAlarmService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/AlarmServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/AlarmServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -49,11 +42,11 @@
    <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;" />
+    <option name="cachedRequestData" value="&lt;CachedHttpClientTabRequests&gt;&#10;  &lt;entry key=&quot;357ab699300853a38feb03ccfb5c91af20d77d8d&quot; value=&quot;###&amp;#10;GET http://localhost:8081/system/devicemodel/list?pageNum=1&amp;amp;pageSize=10&amp;amp;name=&amp;amp;connectType=t&quot; /&gt;&#10;&lt;/CachedHttpClientTabRequests&gt;" />
  </component>
-  <component name="HttpClientOnboardingState"><![CDATA[{
-  "isOnboardingCommentShown": true
-}]]></component>
+  <component name="HttpClientOnboardingState">{
+  &quot;isOnboardingCommentShown&quot;: true
+}</component>
  <component name="McpProjectServerCommands">
    <McpServerCommand sourceId="UserConfigurationSource">
      <option name="allowedToolsNames" />
@@ -74,6 +67,9 @@
      <envs />
    </McpServerCommand>
  </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="CurrentFile" />
+  </component>
  <component name="ProjectColorInfo">{
  &quot;associatedIndex&quot;: 1
 }</component>
@@ -82,38 +78,40 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <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 name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;Application.test.executor&quot;: &quot;Debug&quot;,
+    &quot;HTTP Request.MiddlePlatformApplication | #1.executor&quot;: &quot;Run&quot;,
+    &quot;HTTP Request.MiddlePlatformApplication | #2.executor&quot;: &quot;Run&quot;,
+    &quot;HTTP Request.MiddlePlatformApplication | #3.executor&quot;: &quot;Run&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;Run&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/maibu/Test/MiddlePlatform/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller&quot;,
+    &quot;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>
+}</component>
  <component name="RdControllerToolWindowsLayoutState" isNewUi="true">
    <layout>
      <window_info id="Bookmarks" side_tool="true" />
@@ -122,65 +120,52 @@
      <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" 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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2463386" />
+      <window_info id="Commit" order="1" weight="0.2463386" />
+      <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
      <window_info anchor="bottom" id="Database Changes" />
      <window_info anchor="bottom" id="TypeScript" />
      <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" />
+      <window_info anchor="bottom" id="Version Control" order="0" weight="0.48920512" />
      <window_info anchor="bottom" id="Problems" order="1" />
-      <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="Problems View" order="2" weight="0.5019627" />
+      <window_info anchor="bottom" id="Terminal" order="3" />
      <window_info anchor="bottom" id="Services" order="4" />
      <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="bottom" id="Build" order="5" weight="0.3302257" />
+      <window_info active="true" anchor="bottom" id="Run" order="6" visible="true" weight="0.36555445" />
+      <window_info anchor="bottom" id="Find" order="7" weight="0.3302257" />
+      <window_info anchor="bottom" id="Debug" order="8" weight="0.36555445" />
      <window_info anchor="right" id="PR AI Assistant" />
+      <window_info anchor="right" id="Endpoints" />
      <window_info anchor="right" id="documentation.v2" show_stripe_button="false" side_tool="true" />
-      <window_info anchor="right" id="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="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="Gradle" order="3" weight="0.25" />
-      <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" />
+      <window_info active="true" anchor="right" id="Maven" order="4" visible="true" weight="0.20415935" />
    </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-service/maibu-iot-service/src/main/java/com/maibu/controller" />
+      <recent name="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl" />
+      <recent name="$PROJECT_DIR$/maibu-common/src/main/java/com/maibu/core/business/dto" />
+      <recent name="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/service" />
+      <recent name="$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/mapper" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.maibu.web.controller.system" />
      <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" />
    </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" />
@@ -198,6 +183,12 @@
    <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 name="MiddlePlatformApplication | #2" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/MiddlePlatformApplication.http" executionIdentifier="#2" index="2" runType="Run single request">
+      <method v="2" />
+    </configuration>
+    <configuration name="MiddlePlatformApplication | #3" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/MiddlePlatformApplication.http" executionIdentifier="#3" index="3" runType="Run single request">
+      <method v="2" />
+    </configuration>
    <configuration default="true" type="JetRunConfigurationType">
      <module name="maibu-iot-service" />
      <method v="2">
@@ -233,6 +224,8 @@
    <recent_temporary>
      <list>
        <item itemvalue="Spring Boot.MiddlePlatformApplication" />
+        <item itemvalue="HTTP Request.MiddlePlatformApplication | #3" />
+        <item itemvalue="HTTP Request.MiddlePlatformApplication | #2" />
        <item itemvalue="HTTP Request.MiddlePlatformApplication | #1" />
        <item itemvalue="Application.test" />
      </list>
@@ -246,6 +239,9 @@
      </set>
    </attachedChunks>
  </component>
+  <component name="StructureViewState">
+    <option name="selectedTab" value="Logical" />
+  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
      <changelist id="84ac1b15-3cfa-4375-9957-45b7b581d04e" name="Changes" comment="" />
@@ -280,7 +276,15 @@
      <workItem from="1777536497397" duration="4839000" />
      <workItem from="1778042711435" duration="13630000" />
      <workItem from="1778058957116" duration="9296000" />
-      <workItem from="1778122560817" duration="16187000" />
+      <workItem from="1778122560817" duration="109038000" />
+      <workItem from="1778653471044" duration="772000" />
+      <workItem from="1778654245667" duration="271000" />
+      <workItem from="1778654518357" duration="342000" />
+      <workItem from="1778654986049" duration="1019000" />
+      <workItem from="1778656021238" duration="1535000" />
+      <workItem from="1778658354887" duration="2629000" />
+      <workItem from="1778660995906" duration="54560000" />
+      <workItem from="1779237276134" duration="3317000" />
    </task>
    <task id="LOCAL-00001" summary="#update">
      <option name="closed" value="true" />
@@ -338,18 +342,226 @@
      <option name="project" value="LOCAL" />
      <updated>1778051353366</updated>
    </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="物模型的新增和修改和查看列表接口">
+      <option name="closed" value="true" />
+      <created>1778141126329</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1778141126329</updated>
+    </task>
+    <task id="LOCAL-00009" summary="SysUser新增权限字段，和需改增加和修改和查询列表接口">
+      <option name="closed" value="true" />
+      <created>1778206916483</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1778206916483</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修改接口system/site/list 根据组织id得到场站list">
+      <option name="closed" value="true" />
+      <created>1778207840351</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1778207840351</updated>
+    </task>
+    <task id="LOCAL-00011" summary="修改接口system/devicemodel/list分页">
+      <option name="closed" value="true" />
+      <created>1778210449207</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1778210449207</updated>
+    </task>
+    <task id="LOCAL-00012" summary="修改接口system/devicemodel/list分页">
+      <option name="closed" value="true" />
+      <created>1778218670780</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1778218670780</updated>
+    </task>
+    <task id="LOCAL-00013" summary="#新增产品表和产品接口表和控制层">
+      <option name="closed" value="true" />
+      <created>1778218713227</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1778218713227</updated>
+    </task>
+    <task id="LOCAL-00014" summary="#新增产品表的架构代码（）">
+      <option name="closed" value="true" />
+      <created>1778223414798</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1778223414798</updated>
+    </task>
+    <task id="LOCAL-00015" summary="#修改模型的update接口">
+      <option name="closed" value="true" />
+      <created>1778223457362</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1778223457362</updated>
+    </task>
+    <task id="LOCAL-00016" summary="#厂家模块init">
+      <option name="closed" value="true" />
+      <created>1778287008465</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1778287008465</updated>
+    </task>
+    <task id="LOCAL-00017" summary="#厂家模块的接口返回值的补充">
+      <option name="closed" value="true" />
+      <created>1778309168631</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1778309168631</updated>
+    </task>
+    <task id="LOCAL-00018" summary="#修复模型模块接口-逻辑删除不生效问题">
+      <option name="closed" value="true" />
+      <created>1778309230525</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1778309230525</updated>
+    </task>
+    <task id="LOCAL-00019" summary="#创建物联网设备模块的三层架构代码+库表的创建（新增几个了）">
+      <option name="closed" value="true" />
+      <created>1778310109753</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1778310109753</updated>
+    </task>
+    <task id="LOCAL-00020" summary="#修复设备管理的接口和现有的厂家做兼容（sql中修改表名字+字段id）">
+      <option name="closed" value="true" />
+      <created>1778553366338</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1778553366338</updated>
+    </task>
+    <task id="LOCAL-00021" summary="#修复通用物联网设备的接入接口的处理逻辑（缓存）">
+      <option name="closed" value="true" />
+      <created>1778553425504</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1778553425504</updated>
+    </task>
+    <task id="LOCAL-00022" summary="#告警中心">
+      <option name="closed" value="true" />
+      <created>1778659898388</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1778659898388</updated>
+    </task>
+    <task id="LOCAL-00023" summary="#工单模块">
+      <option name="closed" value="true" />
+      <created>1778659949764</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1778659949764</updated>
+    </task>
+    <task id="LOCAL-00024" summary="#工单模块+lombok">
+      <option name="closed" value="true" />
+      <created>1778720959140</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1778720959140</updated>
+    </task>
+    <task id="LOCAL-00025" summary="#机器人的二维码模块">
+      <option name="closed" value="true" />
+      <created>1778741609875</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1778741609875</updated>
+    </task>
+    <task id="LOCAL-00026" summary="#适配前端的二维码新增接口">
+      <option name="closed" value="true" />
+      <created>1778813931654</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1778813931654</updated>
+    </task>
+    <task id="LOCAL-00027" summary="#适配现有的权限方案的改动">
+      <option name="closed" value="true" />
+      <created>1778835348155</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1778835348155</updated>
+    </task>
+    <task id="LOCAL-00028" summary="#id重复bug">
+      <option name="closed" value="true" />
+      <created>1778837534661</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1778837534661</updated>
+    </task>
+    <task id="LOCAL-00029" summary="#修复工单修改接口">
+      <option name="closed" value="true" />
+      <created>1779066908452</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1779066908452</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
  <component name="VcsManagerConfiguration">
    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
    <option name="CHECK_NEW_TODO" value="false" />
    <MESSAGE value="#init" />
    <MESSAGE value="#update" />
-    <option name="LAST_COMMIT_MESSAGE" value="#update" />
+    <MESSAGE value="物模型的新增和修改和查看列表接口" />
+    <MESSAGE value="SysUser新增权限字段，和需改增加和修改和查询列表接口" />
+    <MESSAGE value="修改接口system/site/list 根据组织id得到场站list" />
+    <MESSAGE value="修改接口system/devicemodel/list分页" />
+    <MESSAGE value="#新增产品表和产品接口表和控制层" />
+    <MESSAGE value="#新增产品表的架构代码（）" />
+    <MESSAGE value="#修改模型的update接口" />
+    <MESSAGE value="#厂家模块init" />
+    <MESSAGE value="#厂家模块的接口返回值的补充" />
+    <MESSAGE value="#修复模型模块接口-逻辑删除不生效问题" />
+    <MESSAGE value="#创建物联网设备模块的三层架构代码+库表的创建（新增几个了）" />
+    <MESSAGE value="#修复设备管理的接口和现有的厂家做兼容（sql中修改表名字+字段id）" />
+    <MESSAGE value="#修复通用物联网设备的接入接口的处理逻辑（缓存）" />
+    <MESSAGE value="#告警中心" />
+    <MESSAGE value="#工单模块" />
+    <MESSAGE value="#工单模块+lombok" />
+    <MESSAGE value="#机器人的二维码模块" />
+    <MESSAGE value="#适配前端的二维码新增接口" />
+    <MESSAGE value="#适配现有的权限方案的改动" />
+    <MESSAGE value="#id重复bug" />
+    <MESSAGE value="#修复工单修改接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="#修复工单修改接口" />
    <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
  </component>
  <component name="XDebuggerManager">
@@ -390,6 +602,39 @@
          <line>127</line>
          <option name="timeStamp" value="25" />
        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeviceModelController.java</url>
+          <line>81</line>
+          <option name="timeStamp" value="32" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysDeviceModelController.java</url>
+          <line>83</line>
+          <option name="timeStamp" value="33" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/SysDeviceModelServiceImpl.java</url>
+          <line>112</line>
+          <option name="timeStamp" value="34" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-method">
+          <url>file://$PROJECT_DIR$/maibu-admin/src/main/java/com/maibu/web/controller/system/SysQrCodeController.java</url>
+          <line>75</line>
+          <properties class="com.maibu.web.controller.system.SysQrCodeController" method="generate">
+            <option name="EMULATED" value="true" />
+            <option name="WATCH_EXIT" value="false" />
+          </properties>
+          <option name="timeStamp" value="37" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-method">
+          <url>file://$PROJECT_DIR$/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/IOTWorkOrderController.java</url>
+          <line>58</line>
+          <properties class="com.maibu.controller.IOTWorkOrderController" method="edit">
+            <option name="EMULATED" value="true" />
+            <option name="WATCH_EXIT" value="false" />
+          </properties>
+          <option name="timeStamp" value="38" />
+        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
  </component>
--- a/D:/uploadPath/avatar/2026/05/15/1-首页_20260515160414A006.png
+++ b/D:/uploadPath/avatar/2026/05/15/1-首页_20260515160414A006.png
--- a/D:/uploadPath/avatar/2026/05/15/1-首页_20260515161004A001.png
+++ b/D:/uploadPath/avatar/2026/05/15/1-首页_20260515161004A001.png
--- a/D:/uploadPath/avatar/2026/05/15/10-装备控制_20260515160723A008.png
+++ b/D:/uploadPath/avatar/2026/05/15/10-装备控制_20260515160723A008.png
--- a/D:/uploadPath/avatar/2026/05/15/11-作业航线_20260515160320A003.png
+++ b/D:/uploadPath/avatar/2026/05/15/11-作业航线_20260515160320A003.png
--- a/D:/uploadPath/avatar/2026/05/15/2-实时监控_20260515160343A004.png
+++ b/D:/uploadPath/avatar/2026/05/15/2-实时监控_20260515160343A004.png
--- a/D:/uploadPath/avatar/2026/05/15/20211231082559_932c3_20260515161037A003.jpg
+++ b/D:/uploadPath/avatar/2026/05/15/20211231082559_932c3_20260515161037A003.jpg
--- a/D:/uploadPath/avatar/2026/05/15/20211231082559_932c3_20260515162739A004.jpg
+++ b/D:/uploadPath/avatar/2026/05/15/20211231082559_932c3_20260515162739A004.jpg
--- a/D:/uploadPath/avatar/2026/05/15/7-工单管理_20260515161025A002.png
+++ b/D:/uploadPath/avatar/2026/05/15/7-工单管理_20260515161025A002.png
--- a/D:/uploadPath/avatar/2026/05/15/8-报表管理_20260515160242A001.png
+++ b/D:/uploadPath/avatar/2026/05/15/8-报表管理_20260515160242A001.png
--- a/D:/uploadPath/avatar/2026/05/15/8-报表管理_20260515160453A007.png
+++ b/D:/uploadPath/avatar/2026/05/15/8-报表管理_20260515160453A007.png
--- a/D:/uploadPath/avatar/2026/05/15/9-系统设置_20260515160250A002.png
+++ b/D:/uploadPath/avatar/2026/05/15/9-系统设置_20260515160250A002.png
--- a/D:/uploadPath/avatar/2026/05/15/9-系统设置_20260515160348A005.png
+++ b/D:/uploadPath/avatar/2026/05/15/9-系统设置_20260515160348A005.png
--- a/D:/uploadPath/avatar/2026/05/18/04032_20260518162112A001.png
+++ b/D:/uploadPath/avatar/2026/05/18/04032_20260518162112A001.png
--- a/D:/uploadPath/avatar/2026/05/18/20211231082559_932c3_20260518163437A001.jpg
+++ b/D:/uploadPath/avatar/2026/05/18/20211231082559_932c3_20260518163437A001.jpg
--- a/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java
+++ b/maibu-admin/src/main/java/com/maibu/web/controller/system/SysLoginController.java
@@ -84,6 +84,7 @@ public class SysLoginController {
        String password = null;
        Integer aiChatNum = null;
        String nickName = null;
+        String avatar = null;

        //loginPlatForm == null 走默认账号密码登录
        if (loginPlatForm != null) {
@@ -107,6 +108,7 @@ public class SysLoginController {
                if (sysUser != null) {
                    aiChatNum = sysUser.getAiChatNum();
                    nickName = sysUser.getNickName();
+                     avatar =sysUser.getAvatar();
                }
            } else if (loginPlatForm == 2) {
                //公众号
@@ -139,6 +141,7 @@ public class SysLoginController {
            String code = SourceType.switchCode(sourceType);
            username = loginBody.getUsername();
            password = loginBody.getPassword();
+
            String loginUserKey = username + ":" + code; // 使用用户ID作为缓存键的一部分
            NettyDevice nettyDevice = sessionManager.getDevice(loginUserKey);
            if (sourceType != 1) {
@@ -164,6 +167,7 @@ public class SysLoginController {
        ajax.put("username", username);
        ajax.put("aiChatNum", aiChatNum);
        ajax.put("nickName", nickName);
+        ajax.put("avatar",avatar);
        if (sysUser != null) {
            ajax.put("roleId",sysUser.getRoleId());
            ajax.put("siteId",sysUser.getSiteId());
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/AlarmController.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/controller/AlarmController.java
@@ -1 +1 @@
-package com.maibu.controller;
+package com.maibu.controller;
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IAlarmService.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/IAlarmService.java
@@ -1 +1 @@
-package com.maibu.service;
+package com.maibu.service;
--- a/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/AlarmServiceImpl.java
+++ b/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl/AlarmServiceImpl.java
@@ -55,6 +55,28 @@ public class AlarmServiceImpl extends ServiceImpl<AlarmMapper, Alarm> implements
        return baseMapper.selectList(wrapper);
    }

+
+    @Override
+    public Map<String, Object> getAlarmStatistics(AlarmQueryDTO queryDTO) {
+        com.github.pagehelper.PageHelper.clearPage();
+
+        LambdaQueryWrapper<Alarm> wrapper = buildQueryWrapper(queryDTO);
+
+        List<Alarm> alarms = baseMapper.selectList(wrapper);
+        Map<String, Object> statistics = new HashMap<>();
+        statistics.put("total", alarms.size());
+        statistics.put("pending", alarms.stream().filter(a -> a.getHandleStatus() == 1).count());
+        statistics.put("processing", alarms.stream().filter(a -> a.getHandleStatus() == 2).count());
+        statistics.put("closed", alarms.stream().filter(a -> a.getHandleStatus() == 3).count());
+
+        statistics.put("levelStats", alarms.stream().collect(Collectors.groupingBy(Alarm::getAlarmLevel, Collectors.counting())));
+        statistics.put("typeStats", alarms.stream().collect(Collectors.groupingBy(Alarm::getAlarmType, Collectors.counting())));
+
+        return statistics;
+    }
+
+
+
    private void validateQueryParams(AlarmQueryDTO queryDTO) {
        Long userId = SecurityUtils.getUserId();
        if (SecurityUtils.isAdmin(userId)) {