Bläddra i källkod

修改平台推送消息故障类型

zhuoning 2 år sedan
förälder
incheckning
d714639257

+ 241 - 89
huimv-env-platform/.idea/workspace.xml

@@ -1,32 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aea4e25b-646a-4ad1-9dc9-156d47497795" name="Default Changelist" comment="新建环境控制平台">
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/huimv-env-common/target/maven-archiver/pom.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/huimv-env-input/target/classes/application-dev.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/huimv-env-input/target/classes/application.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/huimv-env-input/target/classes/assembly.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/dao/entity/EnvPushMessgeEntity.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-common/src/main/java/com/huimv/env/common/dao/repo/EnvPushMessgeEntityRepo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/HuimvDeviceApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/HuimvDeviceApplication.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/listener/DeviceListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/listener/DeviceListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/service/IDeviceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/service/IDeviceService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DeviceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DeviceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/resources/application.properties" afterDir="false" />
+    <list default="true" id="aea4e25b-646a-4ad1-9dc9-156d47497795" name="Default Changelist" comment="修改推送故障类型">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/huimv-env-device/src/main/resources/conf/config.properties" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-device/src/main/resources/conf/config.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/huimv-env-input/src/main/java/com/huimv/env/input/server/EnvInputServerHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/huimv-env-input/src/main/java/com/huimv/env/input/server/EnvInputServerHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/huimv-env-input/src/main/resources/application-test.yml" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -60,13 +39,6 @@
         <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
         <item name="huimv-env-platform: schema" type="76f4a085:MysqlImplModel$Schema" />
       </path>
-      <path>
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
-        <item name="huimv-env-platform@192.168.1.7" type="feb32156:DbDataSourceImpl" />
-        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
-        <item name="huimv-env-platform: schema" type="76f4a085:MysqlImplModel$Schema" />
-        <item name="env_push_message: table" type="285a2a93:MysqlImplModel$Table" />
-      </path>
     </expand>
     <select />
   </component>
@@ -118,22 +90,26 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/huimv-env-input/target/huimv-env-input-0.0.1-SNAPSHOT.jar" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../cloud-platform" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="spring.boot" />
+    <property name="settings.editor.selected.configurable" value="File.Encoding" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-device\src\main\resources\config" />
-    </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="com.huimv.env.device.service" />
       <recent name="com.huimv.env.common.service" />
       <recent name="com.huimv.env.input" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-input\src\main\resources" />
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-device\src\main\resources" />
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform" />
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\src\main\resources" />
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\config" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.huimv.env.device.producer" />
       <recent name="com.huimv.env.common.utils" />
@@ -141,12 +117,8 @@
       <recent name="com.huimv.env.input.service" />
       <recent name="com.huimv.env.input.service.impl" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-device\src\main\resources" />
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform" />
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\src\main\resources" />
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\config" />
-      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-manage\src\main\resources" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-device\src\main\resources\config" />
     </key>
   </component>
   <component name="RunManager" selected="Spring Boot.HuimvDeviceApplication">
@@ -241,10 +213,10 @@
     <recent_temporary>
       <list>
         <item itemvalue="Spring Boot.HuimvDeviceApplication" />
+        <item itemvalue="Application.HuimvEnvInputApplication" />
         <item itemvalue="JUnit.DeviceTest.test3" />
         <item itemvalue="JUnit.DeviceTest.test2" />
         <item itemvalue="JUnit.DeviceTest.test1" />
-        <item itemvalue="Application.HuimvEnvInputApplication" />
       </list>
     </recent_temporary>
   </component>
@@ -268,7 +240,33 @@
       <workItem from="1660783913362" duration="33806000" />
       <workItem from="1660826703552" duration="1451000" />
       <workItem from="1660870213371" duration="8618000" />
-      <workItem from="1660885650555" duration="7810000" />
+      <workItem from="1660885650555" duration="18174000" />
+      <workItem from="1660989212245" duration="1551000" />
+      <workItem from="1660993923956" duration="448000" />
+      <workItem from="1661131164613" duration="7507000" />
+      <workItem from="1661147123078" duration="642000" />
+      <workItem from="1661147790453" duration="28000" />
+      <workItem from="1661148964049" duration="1652000" />
+      <workItem from="1661152577955" duration="137000" />
+      <workItem from="1661169061541" duration="1184000" />
+      <workItem from="1661223369596" duration="63000" />
+      <workItem from="1661255800991" duration="17000" />
+      <workItem from="1661301829240" duration="1461000" />
+      <workItem from="1661312125478" duration="5585000" />
+      <workItem from="1661392207619" duration="129000" />
+      <workItem from="1661411391539" duration="3343000" />
+      <workItem from="1661417860758" duration="1922000" />
+      <workItem from="1661483948605" duration="1299000" />
+      <workItem from="1661485633694" duration="1953000" />
+      <workItem from="1661585829747" duration="2725000" />
+      <workItem from="1661592029293" duration="1258000" />
+      <workItem from="1661924371073" duration="2031000" />
+      <workItem from="1661929441720" duration="348000" />
+      <workItem from="1662367455695" duration="965000" />
+      <workItem from="1662426794332" duration="881000" />
+      <workItem from="1662538991378" duration="854000" />
+      <workItem from="1663405853545" duration="628000" />
+      <workItem from="1663490929068" duration="1954000" />
     </task>
     <task id="LOCAL-00001" summary="新建环境控制平台">
       <created>1660656813145</created>
@@ -326,12 +324,134 @@
       <option name="project" value="LOCAL" />
       <updated>1660827831751</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="平台消息推送功能完成。">
+      <created>1660894096614</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1660894096615</updated>
+    </task>
+    <task id="LOCAL-00010" summary="下发喷雾除臭配置。">
+      <created>1660907135514</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1660907135551</updated>
+    </task>
+    <task id="LOCAL-00011" summary="修改下发喷雾除臭配置(将开关时长*60秒)。">
+      <created>1660990771376</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1660990771376</updated>
+    </task>
+    <task id="LOCAL-00012" summary="修改下发喷雾除臭配置(将开关时长*60秒)。">
+      <created>1661135289704</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1661135289704</updated>
+    </task>
+    <task id="LOCAL-00013" summary="修改获取除臭配置问题。">
+      <created>1661147740208</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1661147740208</updated>
+    </task>
+    <task id="LOCAL-00014" summary="修改报警使能。">
+      <created>1661169465347</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1661169465347</updated>
+    </task>
+    <task id="LOCAL-00015" summary="修改高低温报警。">
+      <created>1661170190884</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1661170190884</updated>
+    </task>
+    <task id="LOCAL-00016" summary="修改除臭配置时间">
+      <created>1661303464473</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1661303464473</updated>
+    </task>
+    <task id="LOCAL-00017" summary="新增高低温阈值查询功能。">
+      <created>1661321480341</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1661321480341</updated>
+    </task>
+    <task id="LOCAL-00018" summary="新增高低温阈值设置2">
+      <created>1661321532199</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1661321532199</updated>
+    </task>
+    <task id="LOCAL-00019" summary="修复高低温阈值解决小数问题。">
+      <created>1661323585514</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1661323585514</updated>
+    </task>
+    <task id="LOCAL-00020" summary="修改设备状态">
+      <created>1661414626086</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1661414626086</updated>
+    </task>
+    <task id="LOCAL-00021" summary="修改推送故障类型">
+      <created>1661419093694</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1661419093694</updated>
+    </task>
+    <task id="LOCAL-00022" summary="删除show文件">
+      <created>1661419816405</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1661419816405</updated>
+    </task>
+    <task id="LOCAL-00023" summary="修改平台推送问题。">
+      <created>1661487456846</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1661487456846</updated>
+    </task>
+    <task id="LOCAL-00024" summary="修改端口号">
+      <created>1661926653144</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1661926653144</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="修改数据库。" />
     <MESSAGE value="修改manage模块数据库" />
@@ -340,13 +460,28 @@
     <MESSAGE value="新建添加温度数据功能。" />
     <MESSAGE value="新建传感器注册功能。" />
     <MESSAGE value="新建上报设备状态和平台推送消息功能。" />
-    <option name="LAST_COMMIT_MESSAGE" value="新建上报设备状态和平台推送消息功能。" />
+    <MESSAGE value="平台消息推送功能完成。" />
+    <MESSAGE value="下发喷雾除臭配置。" />
+    <MESSAGE value="修改获取除臭配置问题。" />
+    <MESSAGE value="修改报警使能。" />
+    <MESSAGE value="修改高低温报警。" />
+    <MESSAGE value="修改下发喷雾除臭配置(将开关时长*60秒)。" />
+    <MESSAGE value="修改除臭配置时间" />
+    <MESSAGE value="新增高低温阈值查询功能。" />
+    <MESSAGE value="新增高低温阈值设置2" />
+    <MESSAGE value="修复高低温阈值解决小数问题。" />
+    <MESSAGE value="修改设备状态" />
+    <MESSAGE value="修改推送故障类型" />
+    <MESSAGE value="删除show文件" />
+    <MESSAGE value="修改平台推送问题。" />
+    <MESSAGE value="修改端口号" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改端口号" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="552" y="181" key="#Assign_Data_Sources" timestamp="1660732859216">
+    <state x="552" y="181" key="#Assign_Data_Sources" timestamp="1661413248338">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="552" y="181" key="#Assign_Data_Sources/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660732859216" />
+    <state x="552" y="181" key="#Assign_Data_Sources/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661413248338" />
     <state x="552" y="181" key="#Project_Structure" timestamp="1660875950290">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -355,90 +490,107 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="552" y="181" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660731614165" />
-    <state x="765" y="228" key="#com.intellij.ide.util.MemberChooser" timestamp="1660888305350">
+    <state x="765" y="228" key="#com.intellij.ide.util.MemberChooser" timestamp="1660902545903">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="765" y="228" key="#com.intellij.ide.util.MemberChooser/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660888305350" />
+    <state x="765" y="228" key="#com.intellij.ide.util.MemberChooser/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660902545903" />
     <state x="726" y="386" width="663" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1660877046428">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="726" y="386" width="663" height="273" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660877046428" />
-    <state x="690" y="269" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1660735806192">
+    <state x="690" y="269" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1661419576972">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="690" y="269" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660735806192" />
-    <state x="461" y="216" key="CommitChangelistDialog2" timestamp="1660827827955">
+    <state x="690" y="269" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661419576972" />
+    <state x="461" y="216" key="CommitChangelistDialog2" timestamp="1661926649626">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="461" y="216" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660827827955" />
-    <state x="740" y="278" key="FileChooserDialogImpl" timestamp="1660886564959">
+    <state x="461" y="216" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661926649626" />
+    <state x="92" y="92" width="1736" height="856" key="DiffContextDialog" timestamp="1661170245929">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="740" y="278" key="FileChooserDialogImpl/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660886564959" />
-    <state width="1877" height="415" key="GridCell.Tab.0.bottom" timestamp="1660893777313">
+    <state x="92" y="92" width="1736" height="856" key="DiffContextDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661170245929" />
+    <state x="740" y="278" key="FileChooserDialogImpl" timestamp="1661151361195">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="415" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660893777313" />
-    <state width="1877" height="415" key="GridCell.Tab.0.center" timestamp="1660893777313">
+    <state x="740" y="278" key="FileChooserDialogImpl/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661151361195" />
+    <state width="1877" height="315" key="GridCell.Tab.0.bottom" timestamp="1663492267197">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="415" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660893777313" />
-    <state width="1877" height="415" key="GridCell.Tab.0.left" timestamp="1660893777312">
+    <state width="1877" height="315" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951986" />
+    <state width="1877" height="315" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1663492267197" />
+    <state width="1877" height="315" key="GridCell.Tab.0.center" timestamp="1663492267197">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="415" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660893777312" />
-    <state width="1877" height="415" key="GridCell.Tab.0.right" timestamp="1660893777313">
+    <state width="1877" height="315" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951985" />
+    <state width="1877" height="315" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1663492267197" />
+    <state width="1877" height="315" key="GridCell.Tab.0.left" timestamp="1663492267197">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="415" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660893777313" />
-    <state width="1877" height="415" key="GridCell.Tab.1.bottom" timestamp="1660893777314">
+    <state width="1877" height="315" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951985" />
+    <state width="1877" height="315" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1663492267197" />
+    <state width="1877" height="315" key="GridCell.Tab.0.right" timestamp="1663492267197">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="415" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660893777314" />
-    <state width="1877" height="415" key="GridCell.Tab.1.center" timestamp="1660893777314">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <state width="1877" height="315" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951985" />
+    <state width="1877" height="315" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1663492267197" />
+    <state width="1877" height="315" key="GridCell.Tab.1.bottom" timestamp="1661594951987">
+      <screen x="-1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="415" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660893777314" />
-    <state width="1877" height="415" key="GridCell.Tab.1.left" timestamp="1660893777314">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <state width="1877" height="315" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951987" />
+    <state width="1877" height="315" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661146435465" />
+    <state width="1877" height="315" key="GridCell.Tab.1.center" timestamp="1661594951987">
+      <screen x="-1920" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="315" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951987" />
+    <state width="1877" height="315" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661146435463" />
+    <state width="1877" height="315" key="GridCell.Tab.1.left" timestamp="1661594951987">
+      <screen x="-1920" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="315" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951987" />
+    <state width="1877" height="315" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661146435462" />
+    <state width="1877" height="315" key="GridCell.Tab.1.right" timestamp="1661594951987">
+      <screen x="-1920" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="415" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660893777314" />
-    <state width="1877" height="415" key="GridCell.Tab.1.right" timestamp="1660893777314">
+    <state width="1877" height="315" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594951987" />
+    <state width="1877" height="315" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661146435464" />
+    <state x="574" y="255" key="JpaSupport:com.ifengxue.plugin.gui.AutoGeneratorSettingsDialog" timestamp="1660903124149">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="415" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660893777314" />
-    <state x="574" y="255" key="JpaSupport:com.ifengxue.plugin.gui.AutoGeneratorSettingsDialog" timestamp="1660890506857">
+    <state x="574" y="255" key="JpaSupport:com.ifengxue.plugin.gui.AutoGeneratorSettingsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660903124149" />
+    <state x="686" y="235" key="JpaSupport:com.ifengxue.plugin.gui.SelectTablesDialog" timestamp="1660903125751">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="574" y="255" key="JpaSupport:com.ifengxue.plugin.gui.AutoGeneratorSettingsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660890506857" />
-    <state x="686" y="235" key="JpaSupport:com.ifengxue.plugin.gui.SelectTablesDialog" timestamp="1660890514282">
+    <state x="686" y="235" key="JpaSupport:com.ifengxue.plugin.gui.SelectTablesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660903125751" />
+    <state x="490" y="178" key="Maven.ArtifactSearchDialog" timestamp="1661145710163">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="686" y="235" key="JpaSupport:com.ifengxue.plugin.gui.SelectTablesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660890514282" />
-    <state x="463" y="165" key="SettingsEditor" timestamp="1660887639846">
+    <state x="490" y="178" key="Maven.ArtifactSearchDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661145710163" />
+    <state x="463" y="165" key="SettingsEditor" timestamp="1661146123419">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="463" y="165" key="SettingsEditor/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660887639846" />
-    <state x="552" y="256" key="Vcs.Push.Dialog.v2" timestamp="1660827833395">
+    <state x="463" y="165" key="SettingsEditor/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661146123419" />
+    <state x="552" y="256" key="Vcs.Push.Dialog.v2" timestamp="1661926654483">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="552" y="256" key="Vcs.Push.Dialog.v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660827833395" />
-    <state x="754" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1660886422568">
+    <state x="552" y="256" key="Vcs.Push.Dialog.v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1661926654483" />
+    <state x="754" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1663492895080">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="754" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660886422568" />
-    <state x="580" y="246" width="759" height="548" key="find.popup" timestamp="1660811518616">
+    <state x="-1166" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@-1920.0.1920.1040" timestamp="1661594947139" />
+    <state x="754" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1663492895080" />
+    <state x="580" y="246" width="759" height="548" key="find.popup" timestamp="1662427069535">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="580" y="246" width="759" height="548" key="find.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660811518616" />
+    <state x="580" y="246" width="759" height="548" key="find.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1662427069535" />
     <state x="334" y="46" key="new project wizard" timestamp="1660737465619">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="334" y="46" key="new project wizard/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660737465619" />
-    <state x="663" y="152" key="refactoring.ChangeSignatureDialog" timestamp="1660889427219">
+    <state x="663" y="152" key="refactoring.ChangeSignatureDialog" timestamp="1660901595950">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="663" y="152" key="refactoring.ChangeSignatureDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660889427219" />
+    <state x="663" y="152" key="refactoring.ChangeSignatureDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1660901595950" />
     <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1660827351945">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>

+ 8 - 0
huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -2,6 +2,7 @@ D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\co
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempEntity.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceRegisterEntityRepo.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.java
+D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ITempThresholdService.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayConfigEntity.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPushMessageEntity.java
@@ -11,26 +12,33 @@ D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\co
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\DateUtil.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayStatusEntity.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.java
+D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayTimeService.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPushMessageService.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\Const.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\RegexUtil.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayTimeEntityRepo.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\DeviceRegisterServiceImpl.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SensorRegisterServiceImpl.java
+D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayStatusServiceImpl.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PigpenServiceImpl.java
+D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayTimeServiceImpl.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISensorRegisterService.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSensorRegisterEntityRepo.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempEntityRepo.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.java
+D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayStatusService.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IDeviceRegisterService.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempThresholdEntity.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PushMessageServiceImpl.java
+D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayConfigService.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAmmoniaEntity.java
+D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayConfigServiceImpl.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPigpenService.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.java
+D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\TempThresholdServiceImpl.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvHumiEntity.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceRegisterEntity.java
 D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvHumiEntityRepo.java

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 1
huimv-env-platform/huimv-env-device/src/main/resources/conf/config.properties


+ 1 - 1
huimv-env-platform/huimv-env-input/src/main/java/com/huimv/env/input/server/EnvInputServerHandler.java

@@ -326,7 +326,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
         String sprayTime = sprayTimeService.getSprayTimeByDeviceCode(deviceCode);
 //        String answerText = "hm+"+deviceCode+"+6+1+1+0101,60,10,10,0202,60,10,10,0303,60,10,10,0404,60,10,10+60+6+end";
         String answerText = "hm+" + deviceCode + "+6+" + runMode + "+" + deviceStatus + "+" + sprayTime + "+" + timeInterval + "+6+end";
-        log.info(">>获取喷雾除臭配置请求-应答数据>>" + answerText);
+        log.info("<<获取喷雾除臭配置请求-应答数据<<" + answerText);
         answerCmd(answerText, ctx);
     }