Skip to content

I
iotgateway
Commit de08a87e authored by 0Tyler's avatar 0Tyler
Browse files
Options

defaultData

parent cd8a5094
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 137 deletions
.idea/workspace.xml
View file @ de08a87e
...@@ -7,21 +7,14 @@ ...@@ -7,21 +7,14 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d3a5f2c9-d22f-4974-88fb-d506b4e5feaf" name="Default Changelist" comment=""> <list default="true" id="d3a5f2c9-d22f-4974-88fb-d506b4e5feaf" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/cloud/src/main/resources/document/溫溼度感測器檢測報告.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cloud/src/main/resources/document/粉塵濃度感測器檢測報告.pdf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.3/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/cloud/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/cloud/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DocumentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DocumentController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/gateway/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gateway/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/gateway/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/gateway/build/test-results/test/binary/output.bin" beforeDir="false" afterPath="$PROJECT_DIR$/gateway/build/test-results/test/binary/output.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gateway/out/production/classes/META-INF/iotgateway.gateway.main.kotlin_module" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/gateway/build/test-results/test/binary/output.bin.idx" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/gateway/out/production/classes/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.class" beforeDir="false" afterPath="$PROJECT_DIR$/gateway/out/production/classes/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gateway/out/production/classes/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.class" beforeDir="false" afterPath="$PROJECT_DIR$/gateway/out/production/classes/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java" beforeDir="false" afterPath="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/build/" /> <ignored path="$PROJECT_DIR$/build/" />
...@@ -145,11 +138,11 @@ ...@@ -145,11 +138,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java"> <entry file="file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1033"> <state relative-caret-position="145">
<caret line="69" column="25" lean-forward="true" selection-start-line="69" selection-start-column="25" selection-end-line="69" selection-end-column="25" /> <caret line="44" lean-forward="true" selection-start-line="44" selection-end-line="44" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -157,10 +150,10 @@ ...@@ -157,10 +150,10 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java"> <entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="-51">
<caret line="33" column="29" selection-start-line="33" selection-start-column="29" selection-end-line="33" selection-end-column="29" /> <caret line="33" column="29" selection-start-line="33" selection-start-column="29" selection-end-line="33" selection-end-column="29" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
...@@ -169,6 +162,24 @@ ...@@ -169,6 +162,24 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cloud/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="39" selection-start-line="39" selection-end-line="39" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gateway/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="717">
<caret line="50" column="14" selection-start-line="50" selection-start-column="14" selection-end-line="50" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java"> <entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -217,24 +228,6 @@ ...@@ -217,24 +228,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="jar://C:/Program Files/Java/jdk1.8.0_201/src.zip!/java/net/SocketInputStream.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1530">
<caret line="115" selection-start-line="115" selection-end-line="115" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/Document.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/services/DocumentService.java"> <entry file="file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/services/DocumentService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -350,14 +343,14 @@ ...@@ -350,14 +343,14 @@
<option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/pojo/PrivacyChoiceIndex.java" /> <option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/pojo/PrivacyChoiceIndex.java" />
<option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/model/PrivacyPolicyReportResponse.java" /> <option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/model/PrivacyPolicyReportResponse.java" />
<option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/DocumentController.java" /> <option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/DocumentController.java" />
<option value="$PROJECT_DIR$/cloud/build.gradle" />
<option value="$PROJECT_DIR$/gateway/build.gradle" /> <option value="$PROJECT_DIR$/gateway/build.gradle" />
<option value="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DocumentController.java" /> <option value="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DocumentController.java" />
<option value="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/Document.java" /> <option value="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/Document.java" />
<option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java" /> <option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java" />
<option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java" /> <option value="$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java" />
<option value="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java" />
<option value="$PROJECT_DIR$/gateway/src/test/java/edu/prlab/tyler/iotgateway/gateway/GatewayHttpApiTest.java" /> <option value="$PROJECT_DIR$/gateway/src/test/java/edu/prlab/tyler/iotgateway/gateway/GatewayHttpApiTest.java" />
<option value="$PROJECT_DIR$/cloud/build.gradle" />
<option value="$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -540,65 +533,6 @@ ...@@ -540,65 +533,6 @@
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="document" type="462c0819:PsiDirectoryNode" /> <item name="document" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="cloud" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="cloud" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="cloud" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="cloud" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="contract" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="contract" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="contract" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="contract" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="contract" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="contract" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="iotgateway" type="b2602c69:ProjectViewProjectNode" /> <item name="iotgateway" type="b2602c69:ProjectViewProjectNode" />
<item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="iotgateway" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
...@@ -801,8 +735,8 @@ ...@@ -801,8 +735,8 @@
</option> </option>
<option name="contentProportion" value="0.18181819" /> <option name="contentProportion" value="0.18181819" />
</component> </component>
<component name="RunManager" selected="JUnit.GatewayHttpApiTest"> <component name="RunManager" selected="Multirun.iotgateway">
<configuration name="iotgateway:cloud [bootJar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <configuration name="iotgateway:cloud [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/cloud" /> <option name="externalProjectPath" value="$PROJECT_DIR$/cloud" />
...@@ -813,7 +747,7 @@ ...@@ -813,7 +747,7 @@
</option> </option>
<option name="taskNames"> <option name="taskNames">
<list> <list>
<option value="bootJar" /> <option value="build" />
</list> </list>
</option> </option>
<option name="vmOptions" /> <option name="vmOptions" />
...@@ -821,10 +755,10 @@ ...@@ -821,10 +755,10 @@
<GradleScriptDebugEnabled>true</GradleScriptDebugEnabled> <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="iotgateway:cloud [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <configuration name="iotgateway:gateway [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/cloud" /> <option name="externalProjectPath" value="$PROJECT_DIR$/gateway" />
<option name="externalSystemIdString" value="GRADLE" /> <option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" /> <option name="scriptParameters" />
<option name="taskDescriptions"> <option name="taskDescriptions">
...@@ -840,10 +774,10 @@ ...@@ -840,10 +774,10 @@
<GradleScriptDebugEnabled>true</GradleScriptDebugEnabled> <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="iotgateway:cloud [clean]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <configuration name="iotgateway:gateway [clean]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/cloud" /> <option name="externalProjectPath" value="$PROJECT_DIR$/gateway" />
<option name="externalSystemIdString" value="GRADLE" /> <option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" /> <option name="scriptParameters" />
<option name="taskDescriptions"> <option name="taskDescriptions">
...@@ -917,8 +851,6 @@ ...@@ -917,8 +851,6 @@
</method> </method>
</configuration> </configuration>
<list> <list>
<item itemvalue="Gradle.iotgateway:cloud [bootJar]" />
<item itemvalue="Gradle.iotgateway:cloud [clean]" />
<item itemvalue="Gradle.iotgateway:cloud [build]" /> <item itemvalue="Gradle.iotgateway:cloud [build]" />
<item itemvalue="JUnit.GatewayHttpApiTest" /> <item itemvalue="JUnit.GatewayHttpApiTest" />
<item itemvalue="JUnit.ContractTester" /> <item itemvalue="JUnit.ContractTester" />
...@@ -926,14 +858,16 @@ ...@@ -926,14 +858,16 @@
<item itemvalue="Spring Boot.GatewayApplication" /> <item itemvalue="Spring Boot.GatewayApplication" />
<item itemvalue="Spring Boot.CloudApplication" /> <item itemvalue="Spring Boot.CloudApplication" />
<item itemvalue="Spring Boot.ContractApplication" /> <item itemvalue="Spring Boot.ContractApplication" />
<item itemvalue="Gradle.iotgateway:gateway [clean]" />
<item itemvalue="Gradle.iotgateway:gateway [build]" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Gradle.iotgateway:gateway [build]" />
<item itemvalue="Gradle.iotgateway:gateway [clean]" />
<item itemvalue="JUnit.GatewayHttpApiTest" /> <item itemvalue="JUnit.GatewayHttpApiTest" />
<item itemvalue="JUnit.ContractTester" /> <item itemvalue="JUnit.ContractTester" />
<item itemvalue="Gradle.iotgateway:cloud [build]" /> <item itemvalue="Gradle.iotgateway:cloud [build]" />
<item itemvalue="Gradle.iotgateway:cloud [clean]" />
<item itemvalue="Gradle.iotgateway:cloud [bootJar]" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -956,7 +890,7 @@ ...@@ -956,7 +890,7 @@
<workItem from="1558076620952" duration="30942000" /> <workItem from="1558076620952" duration="30942000" />
<workItem from="1558531083647" duration="61839000" /> <workItem from="1558531083647" duration="61839000" />
<workItem from="1559030426004" duration="26881000" /> <workItem from="1559030426004" duration="26881000" />
<workItem from="1559534946076" duration="2078000" /> <workItem from="1559534946076" duration="2991000" />
</task> </task>
<task id="LOCAL-00001" summary="git init"> <task id="LOCAL-00001" summary="git init">
<created>1556204675975</created> <created>1556204675975</created>
...@@ -1119,7 +1053,14 @@ ...@@ -1119,7 +1053,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1559028497214</updated> <updated>1559028497214</updated>
</task> </task>
<option name="localTasksCounter" value="24" /> <task id="LOCAL-00024" summary="defaultData">
<created>1559537091307</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1559537091307</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -1155,7 +1096,7 @@ ...@@ -1155,7 +1096,7 @@
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="321780000" /> <option name="totallyTimeSpent" value="322693000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1168,6 +1109,7 @@ ...@@ -1168,6 +1109,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1988273" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1988273" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
...@@ -1175,11 +1117,11 @@ ...@@ -1175,11 +1117,11 @@
<window_info id="UI Designer" order="3" /> <window_info id="UI Designer" order="3" />
<window_info id="Favorites" order="4" side_tool="true" /> <window_info id="Favorites" order="4" side_tool="true" />
<window_info id="Web" order="5" side_tool="true" /> <window_info id="Web" order="5" side_tool="true" />
<window_info anchor="bottom" id="Run Dashboard" order="0" sideWeight="0.49946696" visible="true" weight="0.422049" /> <window_info anchor="bottom" id="Run Dashboard" order="0" sideWeight="0.49946696" weight="0.422049" />
<window_info anchor="bottom" id="Messages" order="1" sideWeight="0.49733475" weight="0.2806236" /> <window_info anchor="bottom" id="Messages" order="1" sideWeight="0.49733475" weight="0.2806236" />
<window_info anchor="bottom" id="Message" order="2" /> <window_info anchor="bottom" id="Message" order="2" />
<window_info anchor="bottom" id="Find" order="3" sideWeight="0.4989339" weight="0.3596882" /> <window_info anchor="bottom" id="Find" order="3" sideWeight="0.4989339" weight="0.3596882" />
<window_info anchor="bottom" id="Run" order="4" sideWeight="0.49840087" weight="0.5935412" /> <window_info anchor="bottom" id="Run" order="4" sideWeight="0.49840087" visible="true" weight="0.28396437" />
<window_info anchor="bottom" id="Debug" order="5" weight="0.2962138" /> <window_info anchor="bottom" id="Debug" order="5" weight="0.2962138" />
<window_info anchor="bottom" id="Cvs" order="6" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="7" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
...@@ -1197,7 +1139,7 @@ ...@@ -1197,7 +1139,7 @@
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Maven" order="3" /> <window_info anchor="right" id="Maven" order="3" />
<window_info anchor="right" id="Palette" order="4" /> <window_info anchor="right" id="Palette" order="4" />
<window_info anchor="right" id="Gradle" order="5" visible="true" weight="0.0858209" /> <window_info anchor="right" id="Gradle" order="5" visible="true" weight="0.20042644" />
<window_info anchor="right" id="Database" order="6" weight="0.17430703" /> <window_info anchor="right" id="Database" order="6" weight="0.17430703" />
<window_info anchor="right" id="Palette&#9;" order="7" /> <window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Bean Validation" order="8" weight="0.32932165" /> <window_info anchor="right" id="Bean Validation" order="8" weight="0.32932165" />
...@@ -1225,7 +1167,8 @@ ...@@ -1225,7 +1167,8 @@
<MESSAGE value="document controller" /> <MESSAGE value="document controller" />
<MESSAGE value="gateway:DeviceService:addfilter &amp; gateway:PrivacyService:addfilter" /> <MESSAGE value="gateway:DeviceService:addfilter &amp; gateway:PrivacyService:addfilter" />
<MESSAGE value="getPrivacyPolicyReportResponse" /> <MESSAGE value="getPrivacyPolicyReportResponse" />
<option name="LAST_COMMIT_MESSAGE" value="getPrivacyPolicyReportResponse" /> <MESSAGE value="defaultData" />
<option name="LAST_COMMIT_MESSAGE" value="defaultData" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1430,20 +1373,6 @@ ...@@ -1430,20 +1373,6 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/DocumentController.java" /> <entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/DocumentController.java" />
<entry file="file://$PROJECT_DIR$/cloud/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="50" column="1" selection-start-line="50" selection-start-column="1" selection-end-line="50" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gateway/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="362">
<caret line="48" column="18" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework/spring-core/5.1.6.RELEASE/aa74700198d24e1ed8b3c8ad663ad50733658ac6/spring-core-5.1.6.RELEASE-sources.jar!/org/springframework/core/io/Resource.java"> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework/spring-core/5.1.6.RELEASE/aa74700198d24e1ed8b3c8ad663ad50733658ac6/spring-core-5.1.6.RELEASE-sources.jar!/org/springframework/core/io/Resource.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293"> <state relative-caret-position="293">
...@@ -1598,16 +1527,6 @@ ...@@ -1598,16 +1527,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1033">
<caret line="69" column="25" lean-forward="true" selection-start-line="69" selection-start-column="25" selection-end-line="69" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java"> <entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/services/PrivacyService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326"> <state relative-caret-position="326">
...@@ -1641,7 +1560,7 @@ ...@@ -1641,7 +1560,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java"> <entry file="file://$PROJECT_DIR$/gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/controllers/GatewayController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="-51">
<caret line="33" column="29" selection-start-line="33" selection-start-column="29" selection-end-line="33" selection-end-column="29" /> <caret line="33" column="29" selection-start-line="33" selection-start-column="29" selection-end-line="33" selection-end-column="29" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
...@@ -1649,6 +1568,30 @@ ...@@ -1649,6 +1568,30 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/gateway/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="717">
<caret line="50" column="14" selection-start-line="50" selection-start-column="14" selection-end-line="50" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cloud/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="39" selection-start-line="39" selection-end-line="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="44" lean-forward="true" selection-start-line="44" selection-end-line="44" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="gradleExecuteTaskHistory"> <component name="gradleExecuteTaskHistory">
<option value="" /> <option value="" />
......
cloud/build.gradle
View file @ de08a87e
...@@ -35,6 +35,7 @@ repositories { ...@@ -35,6 +35,7 @@ repositories {
dependencies { dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework:spring-test'
implementation "org.mapstruct:mapstruct:${mapstructVersion}" implementation "org.mapstruct:mapstruct:${mapstructVersion}"
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
......
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java
View file @ de08a87e
...@@ -40,6 +40,11 @@ public class DefaultData implements ApplicationRunner { ...@@ -40,6 +40,11 @@ public class DefaultData implements ApplicationRunner {
this.privacyPolicyReportService = privacyPolicyReportService; this.privacyPolicyReportService = privacyPolicyReportService;
this.documentService = documentService; this.documentService = documentService;
} }
@Value("classpath:document/心跳血氧機檢測報告.pdf")
Resource oxygenResource;
@Value("classpath:document/紫外線傳感器檢測報告.pdf")
Resource sensorResource;
@Value("classpath:document/粉塵濃度感測器檢測報告.pdf") @Value("classpath:document/粉塵濃度感測器檢測報告.pdf")
Resource dustResource; Resource dustResource;
...@@ -47,6 +52,9 @@ public class DefaultData implements ApplicationRunner { ...@@ -47,6 +52,9 @@ public class DefaultData implements ApplicationRunner {
@Value("classpath:document/溫溼度感測器檢測報告.pdf") @Value("classpath:document/溫溼度感測器檢測報告.pdf")
Resource tempResource; Resource tempResource;
@Value("classpath:document/氣體感測器檢測報告.pdf")
Resource gasResource;
@Override @Override
public void run(ApplicationArguments args) { public void run(ApplicationArguments args) {
//心跳血氧機 //心跳血氧機
...@@ -169,7 +177,7 @@ public class DefaultData implements ApplicationRunner { ...@@ -169,7 +177,7 @@ public class DefaultData implements ApplicationRunner {
)) ))
.build(); .build();
Document document = resourceToMultipartFile(tempResource) Document document = resourceToMultipartFile(oxygenResource)
.flatMap(documentService::add) .flatMap(documentService::add)
.orElse(Document.builder().build()); .orElse(Document.builder().build());
...@@ -238,6 +246,10 @@ public class DefaultData implements ApplicationRunner { ...@@ -238,6 +246,10 @@ public class DefaultData implements ApplicationRunner {
.build())) .build()))
.build(); .build();
document = resourceToMultipartFile(sensorResource)
.flatMap(documentService::add)
.orElse(Document.builder().build());
PrivacyPolicyReport sensorPrivacyPolicyReport = PrivacyPolicyReport.builder() PrivacyPolicyReport sensorPrivacyPolicyReport = PrivacyPolicyReport.builder()
.id("0cfb6be3-6f0f-4e63-85b8-e9c936707c0a") .id("0cfb6be3-6f0f-4e63-85b8-e9c936707c0a")
.version("1.0") .version("1.0")
...@@ -461,6 +473,10 @@ public class DefaultData implements ApplicationRunner { ...@@ -461,6 +473,10 @@ public class DefaultData implements ApplicationRunner {
.build())) .build()))
.build(); .build();
document = resourceToMultipartFile(gasResource)
.flatMap(documentService::add)
.orElse(Document.builder().build());
PrivacyPolicyReport gasPrivacyPolicyReport = PrivacyPolicyReport.builder() PrivacyPolicyReport gasPrivacyPolicyReport = PrivacyPolicyReport.builder()
.id("0cfb6be3-6f0f-4e63-85b8-e9c936707c0a") .id("0cfb6be3-6f0f-4e63-85b8-e9c936707c0a")
.version("1.0") .version("1.0")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment