forked from floraachy/xiuos_IoT
Merge branch 'master' of https://gitlink.org.cn/xuos/xiuos_IoT
This commit is contained in:
龚祖望
commit
057d8cd0ab
|
|
@ -121,7 +121,12 @@
|
|||
<artifactId>spring-boot-starter-aop</artifactId>
|
||||
<version>1.4.1.RELEASE</version>
|
||||
</dependency>
|
||||
|
||||
<!-- okhttps -->
|
||||
<dependency>
|
||||
<groupId>cn.zhxu</groupId>
|
||||
<artifactId>okhttps-fastjson</artifactId>
|
||||
<version>4.0.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
|
@ -129,11 +134,27 @@
|
|||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-core_2.12</artifactId>
|
||||
<version>3.3.1</version>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>5.8.15</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
<artifactId>logback-core</artifactId>
|
||||
<version>1.1.7</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
<artifactId>logback-classic</artifactId>
|
||||
<version>1.1.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.6</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,483 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="BranchesTreeState">
|
||||
<expand>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="83c94538-6ad4-4e72-85cf-eabaa1e6c548" name="Default Changelist" comment="add plc manage part">
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/ChatGPTController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/XiuosApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/XiuosApplication.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/LoginController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/UserController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/scheduled/TaskScheduled.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/scheduled/TaskScheduled.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/socket/SocketServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/aiit/xiuos/socket/SocketServer.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/application-local.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-local.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xiuosiot" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xiuosiot.iml" beforeDir="false" afterPath="$PROJECT_DIR$/xiuosiot.iml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="CodeStyleSettingsInfer">
|
||||
<option name="done" value="true" />
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="spring-beans.schema" />
|
||||
<option value="Interface" />
|
||||
<option value="Class" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
|
||||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/tdengine/TDengineJDBCUtil.java" root0="SKIP_INSPECTION" />
|
||||
</component>
|
||||
<component name="JsFlowSettings">
|
||||
<service-enabled>true</service-enabled>
|
||||
<exe-path />
|
||||
<other-services-enabled>true</other-services-enabled>
|
||||
<auto-save>true</auto-save>
|
||||
</component>
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="localRepository" value="F:\apache-maven-3.6.0-bin\apache-maven-3.6.0\xiuosrepo" />
|
||||
<option name="mavenHome" value="$PROJECT_DIR$/../../../apache-maven-3.6.0-bin/apache-maven-3.6.0" />
|
||||
<option name="userSettingsFile" value="F:\apache-maven-3.6.0-bin\apache-maven-3.6.0\conf\settings-xiuos.xml" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectCodeStyleSettingsMigration">
|
||||
<option name="version" value="1" />
|
||||
</component>
|
||||
<component name="ProjectId" id="2DnTHBDiOL6Bix3tTHzGHtSi6sm" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
||||
<ConfirmationsSetting value="2" id="Add" />
|
||||
</component>
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
|
||||
<property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="DatabaseDriversLRU" value="postgresql" />
|
||||
<property name="ExpandSpringBootJavaOptionsPanel" value="true" />
|
||||
<property name="RequestMappingsPanelOrder0" value="0" />
|
||||
<property name="RequestMappingsPanelOrder1" value="1" />
|
||||
<property name="RequestMappingsPanelWidth0" value="75" />
|
||||
<property name="RequestMappingsPanelWidth1" value="75" />
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<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$/../../backed" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="project.structure.last.edited" value="Global Libraries" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
||||
</component>
|
||||
<component name="ReactorSettings">
|
||||
<option name="notificationShown" value="true" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="F:\IdeaProject\xiuos_IoT\xiuosiot-backend\src\main\resources\mappers" />
|
||||
<recent name="F:\IdeaProject\xiuos_IoT\xiuosiot-backend\src\main\java\com\aiit\xiuos\dao\mappers" />
|
||||
<recent name="F:\IdeaProject\xiuosiot\src\main\resources\mappers" />
|
||||
<recent name="F:\IdeaProject\xiuosiot\src\main\java\com\aiit\xiuos\dao\mappers" />
|
||||
<recent name="F:\IdeaProject\xiuosiot\src\main\java\com\aiit\xiuos\model" />
|
||||
</key>
|
||||
<key name="CopyClassDialog.RECENTS_KEY">
|
||||
<recent name="com.aiit.xiuos.socket" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="F:\IdeaProject\xiuos_IoT\xiuosiot-backend\src\main\resources" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.XiuosApplication">
|
||||
<configuration name="MyUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="com.aiit.xiuos.Utils.MyUtils" />
|
||||
<module name="xiuosiot" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.aiit.xiuos.tdengine.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="TDengineJDBCUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="com.aiit.xiuos.tdengine.TDengineJDBCUtil" />
|
||||
<module name="xiuosiot" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.aiit.xiuos.tdengine.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="TaskScheduled" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="com.aiit.xiuos.scheduled.TaskScheduled" />
|
||||
<module name="xiuosiot" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.aiit.xiuos.scheduled.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="MqttTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
||||
<module name="xiuosiot" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.aiit.xiuos.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<option name="PACKAGE_NAME" value="com.aiit.xiuos" />
|
||||
<option name="MAIN_CLASS_NAME" value="com.aiit.xiuos.MqttTest" />
|
||||
<option name="TEST_OBJECT" value="class" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="MqttTest.pushlish" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
||||
<module name="xiuosiot" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="com.aiit.xiuos.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<option name="PACKAGE_NAME" value="com.aiit.xiuos" />
|
||||
<option name="MAIN_CLASS_NAME" value="com.aiit.xiuos.MqttTest" />
|
||||
<option name="METHOD_NAME" value="pushlish" />
|
||||
<option name="TEST_OBJECT" value="method" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
<option name="BSP.BeforeRunTask" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="XiuosApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="xiuosiot" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="com.aiit.xiuos.XiuosApplication" />
|
||||
<option name="VM_PARAMETERS" value="-Dspring.profiles.active=local" />
|
||||
<option name="ALTERNATIVE_JRE_PATH" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Application.MyUtils" />
|
||||
<item itemvalue="Application.TaskScheduled" />
|
||||
<item itemvalue="Application.TDengineJDBCUtil" />
|
||||
<item itemvalue="JUnit.MqttTest" />
|
||||
<item itemvalue="JUnit.MqttTest.pushlish" />
|
||||
<item itemvalue="Spring Boot.XiuosApplication" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Application.MyUtils" />
|
||||
<item itemvalue="JUnit.MqttTest.pushlish" />
|
||||
<item itemvalue="JUnit.MqttTest" />
|
||||
<item itemvalue="Application.TDengineJDBCUtil" />
|
||||
<item itemvalue="Application.TaskScheduled" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration>C:\Users\XIOS\AppData\Roaming\Subversion</configuration>
|
||||
</component>
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="83c94538-6ad4-4e72-85cf-eabaa1e6c548" name="Default Changelist" comment="" />
|
||||
<created>1661333758208</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1661333758208</updated>
|
||||
<workItem from="1661333765657" duration="280000" />
|
||||
<workItem from="1661334061009" duration="151000" />
|
||||
<workItem from="1661334238308" duration="194000" />
|
||||
<workItem from="1661334484199" duration="27000" />
|
||||
<workItem from="1661335230016" duration="352000" />
|
||||
<workItem from="1661335594847" duration="83000" />
|
||||
<workItem from="1661335693515" duration="7157000" />
|
||||
<workItem from="1661417909497" duration="5257000" />
|
||||
<workItem from="1661423357781" duration="21664000" />
|
||||
<workItem from="1661735687440" duration="26565000" />
|
||||
<workItem from="1661839398271" duration="69462000" />
|
||||
<workItem from="1662708416578" duration="3597000" />
|
||||
<workItem from="1663118139588" duration="4935000" />
|
||||
<workItem from="1663148821833" duration="14033000" />
|
||||
<workItem from="1663291666287" duration="9816000" />
|
||||
<workItem from="1663665174349" duration="48164000" />
|
||||
<workItem from="1664433648329" duration="51730000" />
|
||||
<workItem from="1666071998596" duration="6786000" />
|
||||
<workItem from="1666143007785" duration="92465000" />
|
||||
<workItem from="1667351495892" duration="33098000" />
|
||||
<workItem from="1667470518622" duration="19355000" />
|
||||
<workItem from="1667892470010" duration="150000" />
|
||||
<workItem from="1667892743178" duration="2935000" />
|
||||
<workItem from="1667959096843" duration="15311000" />
|
||||
<workItem from="1668044105794" duration="8837000" />
|
||||
<workItem from="1668060856912" duration="24089000" />
|
||||
<workItem from="1668391474765" duration="27822000" />
|
||||
<workItem from="1668763658498" duration="9290000" />
|
||||
<workItem from="1669690598297" duration="26287000" />
|
||||
<workItem from="1669864625320" duration="5166000" />
|
||||
<workItem from="1669972095205" duration="5504000" />
|
||||
<workItem from="1670222235849" duration="16000" />
|
||||
<workItem from="1670222734040" duration="1768000" />
|
||||
<workItem from="1670480572838" duration="7573000" />
|
||||
<workItem from="1673336807089" duration="2852000" />
|
||||
<workItem from="1674972538723" duration="4628000" />
|
||||
<workItem from="1675132295155" duration="19122000" />
|
||||
<workItem from="1675649197683" duration="10081000" />
|
||||
<workItem from="1676253690511" duration="3211000" />
|
||||
<workItem from="1676281331855" duration="5241000" />
|
||||
<workItem from="1676859233700" duration="19433000" />
|
||||
<workItem from="1677461463503" duration="3020000" />
|
||||
<workItem from="1677811781056" duration="19553000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="init">
|
||||
<created>1661504382339</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1661504382340</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="init">
|
||||
<created>1661505205169</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1661505205169</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="新增 日平均数据新增定时器以及查询接口">
|
||||
<created>1663209401377</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1663209401377</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="add plc manage part">
|
||||
<created>1663925693595</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1663925693595</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="5" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="2" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||
<ignored-roots>
|
||||
<path value="$PROJECT_DIR$" />
|
||||
</ignored-roots>
|
||||
<MESSAGE value="init" />
|
||||
<MESSAGE value="新增 日平均数据新增定时器以及查询接口" />
|
||||
<MESSAGE value="add plc manage part" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="add plc manage part" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="-1124" y="382" key="#Notifications" timestamp="1678434158364">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="-1124" y="382" key="#Notifications/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678434158364" />
|
||||
<state x="-1467" y="91" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1677059198349">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="-1467" y="91" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1677059198349" />
|
||||
<state x="362" y="72" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1674976716612" />
|
||||
<state x="-1201" y="150" key="#com.intellij.ide.util.MemberChooser" timestamp="1677050373525">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="-1201" y="150" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1677050373525" />
|
||||
<state x="575" y="119" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669794680996" />
|
||||
<state x="-1230" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1677050117288">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="-1230" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1677050117288" />
|
||||
<state x="-1232" y="211" key="FileChooserDialogImpl" timestamp="1676272012091">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="-1232" y="211" key="FileChooserDialogImpl/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1676272012091" />
|
||||
<state x="550" y="167" key="FileChooserDialogImpl/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669706382687" />
|
||||
<state width="1877" height="474" key="GridCell.Tab.0.bottom" timestamp="1678759361757">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="474" key="GridCell.Tab.0.bottom/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678759361757" />
|
||||
<state width="1493" height="357" key="GridCell.Tab.0.bottom/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669890795194" />
|
||||
<state width="1493" height="402" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1670814821597" />
|
||||
<state width="1877" height="474" key="GridCell.Tab.0.center" timestamp="1678759361756">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="474" key="GridCell.Tab.0.center/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678759361756" />
|
||||
<state width="1493" height="357" key="GridCell.Tab.0.center/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669890795194" />
|
||||
<state width="1493" height="402" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1670814821597" />
|
||||
<state width="1877" height="474" key="GridCell.Tab.0.left" timestamp="1678759361756">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="474" key="GridCell.Tab.0.left/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678759361756" />
|
||||
<state width="1493" height="357" key="GridCell.Tab.0.left/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669890795193" />
|
||||
<state width="1493" height="402" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1670814821597" />
|
||||
<state width="1877" height="474" key="GridCell.Tab.0.right" timestamp="1678759361757">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="474" key="GridCell.Tab.0.right/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678759361757" />
|
||||
<state width="1493" height="357" key="GridCell.Tab.0.right/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669890795194" />
|
||||
<state width="1493" height="402" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1670814821597" />
|
||||
<state width="1877" height="474" key="GridCell.Tab.1.bottom" timestamp="1678759361757">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="474" key="GridCell.Tab.1.bottom/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678759361757" />
|
||||
<state width="1493" height="357" key="GridCell.Tab.1.bottom/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669890795194" />
|
||||
<state width="1493" height="402" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1670814821598" />
|
||||
<state width="1877" height="474" key="GridCell.Tab.1.center" timestamp="1678759361757">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="474" key="GridCell.Tab.1.center/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678759361757" />
|
||||
<state width="1493" height="357" key="GridCell.Tab.1.center/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669890795194" />
|
||||
<state width="1493" height="402" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1670814821597" />
|
||||
<state width="1877" height="474" key="GridCell.Tab.1.left" timestamp="1678759361757">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="474" key="GridCell.Tab.1.left/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678759361757" />
|
||||
<state width="1493" height="357" key="GridCell.Tab.1.left/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669890795194" />
|
||||
<state width="1493" height="402" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1670814821597" />
|
||||
<state width="1877" height="474" key="GridCell.Tab.1.right" timestamp="1678759361757">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="474" key="GridCell.Tab.1.right/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1678759361757" />
|
||||
<state width="1493" height="357" key="GridCell.Tab.1.right/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669890795194" />
|
||||
<state width="1493" height="402" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1670814821598" />
|
||||
<state width="1877" height="317" key="GridCell.Tab.2.bottom" timestamp="1675393728233">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="317" key="GridCell.Tab.2.bottom/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1675393728233" />
|
||||
<state width="1493" height="286" key="GridCell.Tab.2.bottom/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669864548644" />
|
||||
<state width="1877" height="317" key="GridCell.Tab.2.center" timestamp="1675393728233">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="317" key="GridCell.Tab.2.center/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1675393728233" />
|
||||
<state width="1493" height="286" key="GridCell.Tab.2.center/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669864548643" />
|
||||
<state width="1877" height="317" key="GridCell.Tab.2.left" timestamp="1675393728233">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="317" key="GridCell.Tab.2.left/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1675393728233" />
|
||||
<state width="1493" height="286" key="GridCell.Tab.2.left/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669864548643" />
|
||||
<state width="1877" height="317" key="GridCell.Tab.2.right" timestamp="1675393728233">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1877" height="317" key="GridCell.Tab.2.right/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1675393728233" />
|
||||
<state width="1493" height="286" key="GridCell.Tab.2.right/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669864548644" />
|
||||
<state width="216" height="477" key="HiddenNamespacesPopup" timestamp="1674975197665">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="216" height="477" key="HiddenNamespacesPopup/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1674975197665" />
|
||||
<state x="400" y="0" key="SettingsEditor" timestamp="1669270250979">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="400" y="0" key="SettingsEditor/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669270250979" />
|
||||
<state x="-1115" y="139" width="866" height="891" key="find.popup" timestamp="1677120401774">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="-1115" y="139" width="866" height="891" key="find.popup/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1677120401774" />
|
||||
<state x="-1381" y="183" width="840" height="857" key="search.everywhere.popup" timestamp="1677051398004">
|
||||
<screen x="-1920" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="-1381" y="183" width="840" height="857" key="search.everywhere.popup/0.0.1536.824/-1920.0.1920.1040@-1920.0.1920.1040" timestamp="1677051398004" />
|
||||
<state x="431" y="145" width="672" height="679" key="search.everywhere.popup/0.0.1536.824/-1920.0.1920.1040@0.0.1536.824" timestamp="1669689709927" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/Utils/GenerateIdUtil.java</url>
|
||||
<line>27</line>
|
||||
<option name="timeStamp" value="22" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/DeviceController.java</url>
|
||||
<line>65</line>
|
||||
<option name="timeStamp" value="24" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/impl/RequestLogInfoServiceImpl.java</url>
|
||||
<line>36</line>
|
||||
<option name="timeStamp" value="35" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-method">
|
||||
<url>file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/DataForwardService.java</url>
|
||||
<line>7</line>
|
||||
<properties class="com.aiit.xiuos.service.DataForwardService" method="addRecord">
|
||||
<option name="EMULATED" value="true" />
|
||||
</properties>
|
||||
<option name="timeStamp" value="36" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-method">
|
||||
<url>file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/DataForwardService.java</url>
|
||||
<line>8</line>
|
||||
<properties class="com.aiit.xiuos.service.DataForwardService" method="selectRecord">
|
||||
<option name="EMULATED" value="true" />
|
||||
</properties>
|
||||
<option name="timeStamp" value="46" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-method">
|
||||
<url>file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/AlarmInfoService.java</url>
|
||||
<line>15</line>
|
||||
<properties class="com.aiit.xiuos.service.AlarmInfoService" method="addAlarmInfo">
|
||||
<option name="EMULATED" value="true" />
|
||||
</properties>
|
||||
<option name="timeStamp" value="49" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
<watches-manager>
|
||||
<configuration name="SpringBootApplicationConfigurationType">
|
||||
<watch expression="request" />
|
||||
<watch expression="request" language="JAVA" />
|
||||
</configuration>
|
||||
</watches-manager>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -3,7 +3,6 @@ package com.aiit.xiuos;
|
|||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||
import org.springframework.cache.annotation.EnableCaching;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
|
||||
|
|
|
|||
|
|
@ -56,6 +56,18 @@ public class FzDeviceManageController {
|
|||
return new ResultRespons(Constant.SUCCESS_CODE,"查询设备成功！",fzDeviceInfos);
|
||||
}
|
||||
|
||||
@GetMapping("/selectByNo")
|
||||
public ResultRespons selectDeviceByNo(@RequestParam("device_no") String id, HttpServletRequest request){
|
||||
FzDeviceInfo fzDeviceInfos = fzDeviceInfoService.selectById(id);
|
||||
if(fzDeviceInfos!=null){
|
||||
return new ResultRespons(Constant.SUCCESS_CODE,"查询设备成功！",fzDeviceInfos);
|
||||
}else
|
||||
{
|
||||
return new ResultRespons(Constant.SUCCESS_CODE,"设备不存在！");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@GetMapping("/selectAll")
|
||||
public ResultRespons selectDevice(){
|
||||
List<FzDeviceInfo> fzDeviceInfos = fzDeviceInfoService.selectAll();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
package com.aiit.xiuos.dao.mappers;
|
||||
|
||||
import com.aiit.xiuos.model.HaierData;
|
||||
|
||||
public interface HaierDataMapper {
|
||||
int deleteByPrimaryKey(Integer id);
|
||||
|
||||
int insert(HaierData record);
|
||||
|
||||
int insertSelective(HaierData record);
|
||||
|
||||
HaierData selectByPrimaryKey(Integer id);
|
||||
|
||||
int updateByPrimaryKeySelective(HaierData record);
|
||||
|
||||
int updateByPrimaryKey(HaierData record);
|
||||
}
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
package com.aiit.xiuos.model;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
public class HaierData {
|
||||
private Integer id;
|
||||
|
||||
private BigDecimal o3;
|
||||
|
||||
private BigDecimal co2;
|
||||
|
||||
private BigDecimal so2;
|
||||
|
||||
private BigDecimal no2;
|
||||
|
||||
private BigDecimal nh3;
|
||||
|
||||
private BigDecimal tvoc;
|
||||
|
||||
private BigDecimal ch2o;
|
||||
|
||||
private BigDecimal c2h5oh;
|
||||
|
||||
private BigDecimal ch4;
|
||||
|
||||
private BigDecimal o2;
|
||||
|
||||
private BigDecimal aqs;
|
||||
|
||||
private BigDecimal humidness;
|
||||
|
||||
private BigDecimal temperature;
|
||||
|
||||
private BigDecimal pm1d0;
|
||||
|
||||
private BigDecimal pm2d5;
|
||||
|
||||
private BigDecimal pm10;
|
||||
|
||||
private BigDecimal windspeed;
|
||||
|
||||
private BigDecimal winddirection;
|
||||
|
||||
private BigDecimal airpressure;
|
||||
|
||||
private Date time;
|
||||
|
||||
private BigDecimal noise;
|
||||
|
||||
public HaierData(Integer id, BigDecimal o3, BigDecimal co2, BigDecimal so2, BigDecimal no2, BigDecimal nh3, BigDecimal tvoc, BigDecimal ch2o, BigDecimal c2h5oh, BigDecimal ch4, BigDecimal o2, BigDecimal aqs, BigDecimal humidness, BigDecimal temperature, BigDecimal pm1d0, BigDecimal pm2d5, BigDecimal pm10, BigDecimal windspeed, BigDecimal winddirection, BigDecimal airpressure, Date time, BigDecimal noise) {
|
||||
this.id = id;
|
||||
this.o3 = o3;
|
||||
this.co2 = co2;
|
||||
this.so2 = so2;
|
||||
this.no2 = no2;
|
||||
this.nh3 = nh3;
|
||||
this.tvoc = tvoc;
|
||||
this.ch2o = ch2o;
|
||||
this.c2h5oh = c2h5oh;
|
||||
this.ch4 = ch4;
|
||||
this.o2 = o2;
|
||||
this.aqs = aqs;
|
||||
this.humidness = humidness;
|
||||
this.temperature = temperature;
|
||||
this.pm1d0 = pm1d0;
|
||||
this.pm2d5 = pm2d5;
|
||||
this.pm10 = pm10;
|
||||
this.windspeed = windspeed;
|
||||
this.winddirection = winddirection;
|
||||
this.airpressure = airpressure;
|
||||
this.time = time;
|
||||
this.noise = noise;
|
||||
}
|
||||
|
||||
public HaierData() {
|
||||
super();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
package com.aiit.xiuos.scheduled;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.aiit.xiuos.Utils.MyUtils;
|
||||
import com.aiit.xiuos.model.HaierData;
|
||||
import com.aiit.xiuos.service.HaierService;
|
||||
import com.aiit.xiuos.socket.HaiErWebSocketServer;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.text.DecimalFormat;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.Random;
|
||||
@Slf4j
|
||||
@Component
|
||||
public class HaierDataTaskScheduled {
|
||||
@Autowired
|
||||
HaiErWebSocketServer haiErWebSocketServer;
|
||||
|
||||
@Autowired
|
||||
HaierService haierService;
|
||||
|
||||
@Scheduled(cron = "0 0 */1 * * ?")//every hour
|
||||
public void insertHaierData() throws ParseException {
|
||||
HaierData haierData =mockData();
|
||||
haierService.insertData(haierData);
|
||||
|
||||
}
|
||||
|
||||
@Scheduled(cron = "*/1 * * * * ?")//every hour
|
||||
public void sendWebsocket() throws ParseException, IOException {
|
||||
HaierData haierData = mockData();
|
||||
JSONObject jsonObject = JSONUtil.parseObj(haierData,false,true);
|
||||
haiErWebSocketServer.sendInfo(jsonObject.toString());
|
||||
}
|
||||
|
||||
public HaierData mockData() throws ParseException {
|
||||
HaierData haierData =new HaierData();
|
||||
Random rand = new Random();
|
||||
DecimalFormat df = new DecimalFormat("#.00"); //保留两位数，若数据库已截取，java可不作保留
|
||||
//生成在max与min之间的随机数
|
||||
// int randNumber = rand.nextInt(MAX - MIN + 1) + MIN;
|
||||
|
||||
double o3 =rand.nextInt(10)+30+Math.random(); //O3
|
||||
haierData.setO3(new BigDecimal(df.format(o3)));
|
||||
|
||||
double co2 =rand.nextInt(100)+200+Math.random(); //co2
|
||||
haierData.setCo2(new BigDecimal(df.format(co2)));
|
||||
|
||||
double so2=0.0; //so2
|
||||
haierData.setSo2(new BigDecimal(df.format(so2)));
|
||||
|
||||
double no2=0.0; //no2
|
||||
haierData.setNo2(new BigDecimal(df.format(no2)));
|
||||
|
||||
double nh3=0.0; //nh3
|
||||
haierData.setNh3(new BigDecimal(df.format(nh3)));
|
||||
|
||||
double tvoc = rand.nextInt(1)+Math.random(); //tvoc
|
||||
haierData.setTvoc(new BigDecimal(df.format(tvoc)));
|
||||
|
||||
double ch2o =0.0; //ch2o
|
||||
haierData.setCh2o(new BigDecimal(df.format(ch2o)));
|
||||
|
||||
double c2h5oh = rand.nextInt(10)+Math.random(); //c2h5oh
|
||||
haierData.setC2h5oh(new BigDecimal(df.format(c2h5oh)));
|
||||
|
||||
double ch4 = 0.0; //ch4
|
||||
haierData.setCh4(new BigDecimal(df.format(ch4)));
|
||||
|
||||
double o2 = rand.nextInt(10)+20+Math.random(); //o2
|
||||
haierData.setO2(new BigDecimal(df.format(o2)));
|
||||
|
||||
double aqs = rand.nextInt(30)+200+Math.random(); //aqs
|
||||
haierData.setAqs(new BigDecimal(df.format(aqs)));
|
||||
|
||||
double humidness = rand.nextInt(30)+30+Math.random(); //湿度
|
||||
haierData.setHumidness(new BigDecimal(df.format(humidness)));
|
||||
|
||||
double temperature =rand.nextInt(10)+15+Math.random(); //温度
|
||||
haierData.setTemperature(new BigDecimal(df.format(temperature)));
|
||||
|
||||
double pm1_0=rand.nextInt(20)+Math.random(); //pm1.0 ug/m3
|
||||
haierData.setPm1d0(new BigDecimal(df.format(pm1_0)));
|
||||
|
||||
double pm2_5=rand.nextInt(20)+30+Math.random(); //pm2.5 ug/m3
|
||||
haierData.setPm2d5(new BigDecimal(df.format(pm2_5)));
|
||||
|
||||
double pm10=rand.nextInt(20)+50+Math.random(); //pm10 ug/m3
|
||||
haierData.setPm10(new BigDecimal(df.format(pm10)));
|
||||
|
||||
double windspeed = Math.random(); //风速m/s
|
||||
haierData.setWindspeed(new BigDecimal(df.format(windspeed)));
|
||||
|
||||
double winddirection = rand.nextInt(30)+200; //风向
|
||||
haierData.setWinddirection(new BigDecimal(df.format(winddirection)));
|
||||
|
||||
double airpressure=rand.nextInt(100)+900+Math.random(); //气压
|
||||
haierData.setAirpressure(new BigDecimal(df.format(airpressure)));
|
||||
|
||||
double noise =rand.nextInt(71)+30+Math.random(); //噪音 pd
|
||||
haierData.setNoise(new BigDecimal(df.format(noise)));
|
||||
|
||||
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
Date date = sdf.parse(MyUtils.getTime());
|
||||
haierData.setTime(date);
|
||||
return haierData;
|
||||
}
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@ import java.util.List;
|
|||
public interface FzDeviceInfoService {
|
||||
List<FzDeviceInfo> selectAll();
|
||||
List<FzDeviceInfo> selectByType(String type);
|
||||
FzDeviceInfo selectById(String id);
|
||||
int addDevice(FzDeviceInfo fzDeviceInfo);
|
||||
int updateDevice(FzDeviceInfo fzDeviceInfo);
|
||||
int deleteDevice(String deviceNo);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
package com.aiit.xiuos.service;
|
||||
|
||||
import com.aiit.xiuos.model.HaierData;
|
||||
|
||||
public interface HaierService {
|
||||
int insertData(HaierData data);
|
||||
HaierData selectData();
|
||||
}
|
||||
|
|
@ -21,6 +21,11 @@ public class FzDeviceInfoServiceImpl implements FzDeviceInfoService {
|
|||
return fzDeviceInfoMapper.selectByType(type);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FzDeviceInfo selectById(String deviceNo) {
|
||||
return fzDeviceInfoMapper.selectByPrimaryKey( deviceNo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int addDevice(FzDeviceInfo fzDeviceInfo) {
|
||||
return fzDeviceInfoMapper.insert(fzDeviceInfo);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
package com.aiit.xiuos.service.impl;
|
||||
|
||||
import com.aiit.xiuos.dao.mappers.HaierDataMapper;
|
||||
import com.aiit.xiuos.model.HaierData;
|
||||
import com.aiit.xiuos.service.HaierService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class HaierServiceImpl implements HaierService {
|
||||
@Autowired
|
||||
HaierDataMapper haierDataMapper;
|
||||
@Override
|
||||
public int insertData(HaierData data) {
|
||||
return haierDataMapper.insertSelective(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public HaierData selectData() {
|
||||
return haierDataMapper.selectData();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
package com.aiit.xiuos.socket;
|
||||
|
||||
public class SocketServer {
|
||||
}
|
||||
|
|
@ -79,10 +79,6 @@ mqtt:
|
|||
tdengine:
|
||||
url: jdbc:TAOS://taosnode1:6030/xiuosiot?user=root&password=taosdata
|
||||
|
||||
logging:
|
||||
file:
|
||||
name: xiuosiot.log
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -71,9 +71,7 @@ mqtt:
|
|||
default-topic: xiuosiot/#
|
||||
tdengine:
|
||||
url: jdbc:TAOS://xiuosiot.taosnode1:6030/xiuosiot?user=root&password=taosdata
|
||||
logging:
|
||||
file:
|
||||
name: xiuosiot.log
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ spring:
|
|||
profiles:
|
||||
active: {spring.profiles.active}
|
||||
|
||||
|
||||
logging:
|
||||
config:
|
||||
classpath: logback.xml
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!--日志配置-->
|
||||
<configuration>
|
||||
<!--直接定义属性-->
|
||||
<property name="logFile" value="logs/xiuosiot"/>
|
||||
<property name="maxFileSize" value="30MB"/>
|
||||
|
||||
<!--控制台日志-->
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>%d [%thread] %-5level %logger{50} -[%file:%line]- %msg%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<!--滚动文件日志-->
|
||||
<appender name="fileLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${logFile}.log</file>
|
||||
<encoder>
|
||||
<!--日志输出格式-->
|
||||
<pattern>%d [%thread] %-5level -[%file:%line]- %msg%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
||||
<fileNamePattern>${logFile}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
|
||||
<maxFileSize>${maxFileSize}</maxFileSize>
|
||||
</rollingPolicy>
|
||||
</appender>
|
||||
<!--创建一个具体的日志输出-->
|
||||
<logger name="com.aiit" level="info" additivity="true">
|
||||
<!--可以有多个appender-ref，即将日志记录到不同的位置-->
|
||||
<appender-ref ref="STDOUT"/>
|
||||
<appender-ref ref="fileLog"/>
|
||||
</logger>
|
||||
|
||||
<!--基础的日志输出-->
|
||||
<root level="info">
|
||||
</root>
|
||||
</configuration>
|
||||
|
|
@ -0,0 +1,119 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.aiit.xiuos.dao.mappers.DeviceLogInfoMapper">
|
||||
<resultMap id="BaseResultMap" type="com.aiit.xiuos.model.DeviceLogInfo">
|
||||
<constructor>
|
||||
<idArg column="device_no" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<idArg column="log_time" javaType="java.util.Date" jdbcType="TIMESTAMP" />
|
||||
<arg column="device_type" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="thread_no" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="log_level" javaType="java.lang.Integer" jdbcType="INTEGER" />
|
||||
<arg column="device_log" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
<arg column="org" javaType="java.lang.String" jdbcType="VARCHAR" />
|
||||
</constructor>
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
device_no, log_time, device_type, thread_no, log_level, device_log, org
|
||||
</sql>
|
||||
<select id="selectByPrimaryKey" parameterType="map" resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from device_log_info
|
||||
where device_no = #{deviceNo,jdbcType=VARCHAR}
|
||||
and log_time = #{logTime,jdbcType=TIMESTAMP}
|
||||
</select>
|
||||
<delete id="deleteByPrimaryKey" parameterType="map">
|
||||
delete from device_log_info
|
||||
where device_no = #{deviceNo,jdbcType=VARCHAR}
|
||||
and log_time = #{logTime,jdbcType=TIMESTAMP}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.aiit.xiuos.model.DeviceLogInfo">
|
||||
insert into device_log_info (device_no, log_time, device_type,
|
||||
thread_no, log_level, device_log,
|
||||
org)
|
||||
values (#{deviceNo,jdbcType=VARCHAR}, #{logTime,jdbcType=TIMESTAMP}, #{deviceType,jdbcType=VARCHAR},
|
||||
#{threadNo,jdbcType=VARCHAR}, #{logLevel,jdbcType=INTEGER}, #{deviceLog,jdbcType=VARCHAR},
|
||||
#{org,jdbcType=VARCHAR})
|
||||
</insert>
|
||||
<insert id="insertSelective" parameterType="com.aiit.xiuos.model.DeviceLogInfo">
|
||||
insert into device_log_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="deviceNo != null">
|
||||
device_no,
|
||||
</if>
|
||||
<if test="logTime != null">
|
||||
log_time,
|
||||
</if>
|
||||
<if test="deviceType != null">
|
||||
device_type,
|
||||
</if>
|
||||
<if test="threadNo != null">
|
||||
thread_no,
|
||||
</if>
|
||||
<if test="logLevel != null">
|
||||
log_level,
|
||||
</if>
|
||||
<if test="deviceLog != null">
|
||||
device_log,
|
||||
</if>
|
||||
<if test="org != null">
|
||||
org,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="deviceNo != null">
|
||||
#{deviceNo,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="logTime != null">
|
||||
#{logTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="deviceType != null">
|
||||
#{deviceType,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="threadNo != null">
|
||||
#{threadNo,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="logLevel != null">
|
||||
#{logLevel,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="deviceLog != null">
|
||||
#{deviceLog,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="org != null">
|
||||
#{org,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.aiit.xiuos.model.DeviceLogInfo">
|
||||
update device_log_info
|
||||
<set>
|
||||
<if test="deviceType != null">
|
||||
device_type = #{deviceType,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="threadNo != null">
|
||||
thread_no = #{threadNo,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="logLevel != null">
|
||||
log_level = #{logLevel,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="deviceLog != null">
|
||||
device_log = #{deviceLog,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="org != null">
|
||||
org = #{org,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</set>
|
||||
where device_no = #{deviceNo,jdbcType=VARCHAR}
|
||||
and log_time = #{logTime,jdbcType=TIMESTAMP}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.aiit.xiuos.model.DeviceLogInfo">
|
||||
update device_log_info
|
||||
set device_type = #{deviceType,jdbcType=VARCHAR},
|
||||
thread_no = #{threadNo,jdbcType=VARCHAR},
|
||||
log_level = #{logLevel,jdbcType=INTEGER},
|
||||
device_log = #{deviceLog,jdbcType=VARCHAR},
|
||||
org = #{org,jdbcType=VARCHAR}
|
||||
where device_no = #{deviceNo,jdbcType=VARCHAR}
|
||||
and log_time = #{logTime,jdbcType=TIMESTAMP}
|
||||
</update>
|
||||
</mapper>
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
<facet type="web" name="Web">
|
||||
<configuration>
|
||||
<webroots />
|
||||
<sourceRoots>
|
||||
<root url="file://$MODULE_DIR$/src/main/java" />
|
||||
<root url="file://$MODULE_DIR$/src/main/resources" />
|
||||
</sourceRoots>
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
|
||||
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.65" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.65" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.65" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.postgresql:postgresql:42.3.6" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.7.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.7.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.7.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.7.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.22.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.5.1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.12.13" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.12.13" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.5.1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.22" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.22" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.22" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.9.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.generator:mybatis-generator-core:1.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.32" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
Loading…
Reference in New Issue