Skip to content

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

document controller

parent 74e04ce0
Hide whitespace changes
Inline Side-by-side
Showing with 1067 additions and 458 deletions
.idea/artifacts/iotgateway_cloud_jar.xml 0 → 100644
View file @ a513b3c8
<component name="ArtifactManager">
<artifact type="jar" name="iotgateway.cloud:jar">
<output-path>$PROJECT_DIR$/out/artifacts/iotgateway_cloud_jar</output-path>
<root id="archive" name="iotgateway.cloud.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
</element>
<element id="library" level="project" name="Gradle: org.springframework:spring-webmvc:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-orm:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: antlr:antlr:2.7.7" />
<element id="library" level="project" name="Gradle: ch.qos.logback:logback-classic:1.2.3" />
<element id="library" level="project" name="Gradle: ch.qos.logback:logback-core:1.2.3" />
<element id="library" level="project" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.9.0" />
<element id="library" level="project" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.9.8" />
<element id="library" level="project" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.9.8" />
<element id="library" level="project" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" />
<element id="library" level="project" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" />
<element id="library" level="project" name="Gradle: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" />
<element id="library" level="project" name="Gradle: com.fasterxml:classmate:1.4.0" />
<element id="library" level="project" name="Gradle: com.h2database:h2:1.4.199" />
<element id="library" level="project" name="Gradle: com.zaxxer:HikariCP:3.2.0" />
<element id="library" level="project" name="Gradle: javax.activation:javax.activation-api:1.2.0" />
<element id="library" level="project" name="Gradle: javax.annotation:javax.annotation-api:1.3.2" />
<element id="library" level="project" name="Gradle: javax.persistence:javax.persistence-api:2.2" />
<element id="library" level="project" name="Gradle: javax.transaction:javax.transaction-api:1.3" />
<element id="library" level="project" name="Gradle: javax.validation:validation-api:2.0.1.Final" />
<element id="library" level="project" name="Gradle: javax.xml.bind:jaxb-api:2.3.1" />
<element id="library" level="project" name="Gradle: net.bytebuddy:byte-buddy:1.9.12" />
<element id="library" level="project" name="Gradle: org.apache.logging.log4j:log4j-api:2.11.2" />
<element id="library" level="project" name="Gradle: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" />
<element id="library" level="project" name="Gradle: org.apache.tomcat.embed:tomcat-embed-core:9.0.17" />
<element id="library" level="project" name="Gradle: org.apache.tomcat.embed:tomcat-embed-el:9.0.17" />
<element id="library" level="project" name="Gradle: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.17" />
<element id="library" level="project" name="Gradle: org.aspectj:aspectjweaver:1.9.2" />
<element id="library" level="project" name="Gradle: org.dom4j:dom4j:2.1.1" />
<element id="library" level="project" name="Gradle: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" />
<element id="library" level="project" name="Gradle: org.hibernate.validator:hibernate-validator:6.0.16.Final" />
<element id="library" level="project" name="Gradle: org.hibernate:hibernate-core:5.3.9.Final" />
<element id="library" level="project" name="Gradle: org.javassist:javassist:3.23.1-GA" />
<element id="library" level="project" name="Gradle: org.jboss.logging:jboss-logging:3.3.2.Final" />
<element id="library" level="project" name="Gradle: org.jboss:jandex:2.0.5.Final" />
<element id="library" level="project" name="Gradle: org.mapstruct:mapstruct:1.3.0.Final" />
<element id="library" level="project" name="Gradle: org.slf4j:jul-to-slf4j:1.7.26" />
<element id="library" level="project" name="Gradle: org.slf4j:slf4j-api:1.7.26" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-autoconfigure:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-devtools:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-starter-aop:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-starter-data-jpa:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-starter-jdbc:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-starter-json:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-starter-logging:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-starter-tomcat:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-starter-web:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot-starter:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.boot:spring-boot:2.1.4.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.data:spring-data-commons:2.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework.data:spring-data-jpa:2.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-aop:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-aspects:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-beans:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-context:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-core:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-expression:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-jcl:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-jdbc:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-tx:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.springframework:spring-web:5.1.6.RELEASE" />
<element id="library" level="project" name="Gradle: org.yaml:snakeyaml:1.23" />
<element id="module-output" name="iotgateway.cloud.main" />
</root>
</artifact>
</component>
\ No newline at end of file
.idea/workspace.xml
View file @ a513b3c8
This source diff could not be displayed because it is too large. You can view the blob instead.
build.gradle
View file @ a513b3c8
...@@ -15,8 +15,6 @@ repositories { ...@@ -15,8 +15,6 @@ repositories {
dependencies { dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
compile project(':gateway')
testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.boot:spring-boot-starter-test'
} }
cloud/build.gradle
View file @ a513b3c8
...@@ -14,6 +14,7 @@ buildscript { ...@@ -14,6 +14,7 @@ buildscript {
} }
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'org.springframework.boot' apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
...@@ -37,7 +38,6 @@ dependencies { ...@@ -37,7 +38,6 @@ dependencies {
implementation "org.mapstruct:mapstruct:${mapstructVersion}" implementation "org.mapstruct:mapstruct:${mapstructVersion}"
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.h2database:h2' runtimeOnly 'com.h2database:h2'
runtimeOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'org.springframework.boot:spring-boot-devtools'
...@@ -45,3 +45,15 @@ dependencies { ...@@ -45,3 +45,15 @@ dependencies {
annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}" annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.boot:spring-boot-starter-test'
} }
jar {
enabled = true
}
bootJar {
enabled = false
classifier = 'boot'
manifest {
attributes 'Start-Class': 'edu.prlab.tyler.iotgateway.cloud.CloudApplication'
attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher'
}
}
\ No newline at end of file
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/CloudApplication.java
View file @ a513b3c8
package edu.prlab.tyler.iotgateway.cloud; package edu.prlab.tyler.iotgateway.cloud;
import edu.prlab.tyler.iotgateway.cloud.pojo.Document;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@SpringBootApplication @SpringBootApplication
public class CloudApplication { public class CloudApplication {
......
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/config/DefaultData.java
View file @ a513b3c8
...@@ -13,7 +13,7 @@ import org.springframework.boot.ApplicationArguments; ...@@ -13,7 +13,7 @@ import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner; import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Arrays; import static java.util.Arrays.asList;
@Component @Component
public class DefaultData implements ApplicationRunner { public class DefaultData implements ApplicationRunner {
...@@ -61,35 +61,39 @@ public class DefaultData implements ApplicationRunner { ...@@ -61,35 +61,39 @@ public class DefaultData implements ApplicationRunner {
.email("[email protected]") .email("[email protected]")
.phone("0987654177") .phone("0987654177")
.build()) .build())
.remedies(Arrays.asList(Remedy.builder() .access(Access.NON_IDENT)
.dispute(Dispute.builder()
.relatedOrganization("地方法院")
.type(Dispute.Type.LAW).build())
.remedies(asList(Remedy.builder()
.type(Remedy.Type.LAW) .type(Remedy.Type.LAW)
.build())) .build()))
.statements(Arrays.asList(Statement.builder() .statements(asList(Statement.builder()
.consequence("a1252c49-4188-4e6d-a32e-66604c664fb9") .consequence("a1252c49-4188-4e6d-a32e-66604c664fb9")
.purposes(Arrays.asList(Purpose.builder() .purposes(asList(Purpose.builder()
.type(Purpose.Type.PSEUDO_ANALYSIS) .type(Purpose.Type.PSEUDO_ANALYSIS)
.description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。") .description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。")
.build())) .build()))
.data(Arrays.asList(Datum.builder() .data(asList(Datum.builder()
.type(Datum.Type.OTHER_CATEGORY) .type(Datum.Type.OTHER_CATEGORY)
.description("室溫資料") .description("室溫資料")
.build())) .build()))
.recipients(Arrays.asList(Recipient.builder() .recipients(asList(Recipient.builder()
.entity("AirRadio") .entity("AirRadio")
.type(Recipient.Type.OURS) .type(Recipient.Type.OURS)
.build())) .build()))
.retention(Retention.STATED_PURPOSE) .retention(Retention.STATED_PURPOSE)
.build(), Statement.builder() .build(), Statement.builder()
.consequence("a1252c49-4188-4e6d-a32e-66604c664fb9") .consequence("a1252c49-4188-4e6d-a32e-66604c664fb9")
.purposes(Arrays.asList(Purpose.builder() .purposes(asList(Purpose.builder()
.type(Purpose.Type.PSEUDO_ANALYSIS) .type(Purpose.Type.PSEUDO_ANALYSIS)
.description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。") .description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。")
.build())) .build()))
.data(Arrays.asList(Datum.builder() .data(asList(Datum.builder()
.type(Datum.Type.OTHER_CATEGORY) .type(Datum.Type.OTHER_CATEGORY)
.description("室溫資料") .description("室溫資料")
.build())) .build()))
.recipients(Arrays.asList(Recipient.builder() .recipients(asList(Recipient.builder()
.entity("AirRadio") .entity("AirRadio")
.type(Recipient.Type.OURS) .type(Recipient.Type.OURS)
.build())) .build()))
...@@ -103,10 +107,136 @@ public class DefaultData implements ApplicationRunner { ...@@ -103,10 +107,136 @@ public class DefaultData implements ApplicationRunner {
.version("1.0") .version("1.0")
.description("本APP會蒐集使用者周遭溫度、濕度及空氣品質作為第三方資料之地區環境分析資料。") .description("本APP會蒐集使用者周遭溫度、濕度及空氣品質作為第三方資料之地區環境分析資料。")
.device(oxygenDevice) .device(oxygenDevice)
.policies(Arrays.asList(oxygenPrivacyPolicy)) .policies(asList(oxygenPrivacyPolicy))
.build(); .build();
privacyPolicyReportService.add(oxygenPrivacyPolicyReport); privacyPolicyReportService.add(oxygenPrivacyPolicyReport);
Device sensorDevice = Device.builder()
.udn("40ceb1e7-6834-4e6a-9305-57348a2b8d0c")
.name("AirRadio多功能空氣品質感測器")
.type(Device.Type.Sensor)
.manufacturer(Manufacturer.builder()
.name("AirRadio")
.serialNumber("1234532545")
.url("http://www.airradio.cn/")
.build())
.model(Model.builder()
.name("AirRadio Multi-functional air quality monitor")
.description("彩屏顯示、APP應用、多參數可選、本地歷史記錄、微信綁定、大屏顯示、遠程韌體升級、新版鐳射感測器、橫豎屏切換、綜合滿足用戶的多種需求。")
.url("https://www.amazon.com/AirRadio-Multi-functional-Humidity-Temperature-detector/dp/B0744D6C8X?pd_rd_wg=EKVyv&pd_rd_r=6cc9cf6f-635c-4be8-b973-ccc269ad6312&pd_rd_w=CGN5l&ref_=pd_gw_simh&pf_rd_r=7K2X6MZBXT0Y27KV4M6Z&pf_rd_p=b841581f-e864-5164-afa6-4c18a8348879")
.build())
.upc("B0744D6C8X")
.location("25.013068, 121.541651")
.status(Device.Status.Disconnected)
.build();
deviceService.add(sensorDevice);
PrivacyPolicy sensorPrivacyPolicy1 = PrivacyPolicy.builder()
.id("abe5ca7b-780e-4857-87e6-014870fe0a3e")
.description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。")
.collector(Collector.builder()
.name("AirRadio")
.email("[email protected]")
.phone("0987654177")
.build())
.access(Access.NON_IDENT)
.dispute(Dispute.builder()
.relatedOrganization("地方法院")
.type(Dispute.Type.LAW).build())
.remedies(asList(Remedy.builder()
.type(Remedy.Type.LAW).build()))
.statements(asList(Statement.builder()
.consequence("a1252c49-4188-4e6d-a32e-66604c664fb9")
.purposes(asList(Purpose.builder()
.type(Purpose.Type.PSEUDO_ANALYSIS)
.description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。")
.build()))
.data(asList(Datum.builder()
.type(Datum.Type.OTHER_CATEGORY)
.description("室溫資料")
.build()))
.recipients(asList(Recipient.builder()
.entity("AirRadio")
.type(Recipient.Type.OURS)
.build()))
.retention(Retention.STATED_PURPOSE)
.build()))
.build();
PrivacyPolicy sensorPrivacyPolicy2 = PrivacyPolicy.builder()
.id("abe5ca7b-780e-4857-87e6-014870fe0a3f")
.description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。")
.collector(Collector.builder()
.name("AirRadio")
.email("[email protected]")
.phone("0987654177")
.build())
.access(Access.NON_IDENT)
.dispute(Dispute.builder()
.relatedOrganization("地方法院")
.type(Dispute.Type.LAW).build())
.remedies(asList(Remedy.builder()
.type(Remedy.Type.LAW).build()))
.statements(asList(Statement.builder()
.consequence("a1252c49-4188-4e6d-a32e-66604c664fba")
.purposes(asList(Purpose.builder()
.type(Purpose.Type.PSEUDO_ANALYSIS)
.description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。")
.build()))
.data(asList(Datum.builder()
.type(Datum.Type.OTHER_CATEGORY)
.description("室溫資料")
.build()))
.recipients(asList(Recipient.builder()
.entity("AirRadio")
.type(Recipient.Type.OURS)
.build()))
.retention(Retention.STATED_PURPOSE)
.build()))
.build();
PrivacyPolicy sensorPrivacyPolicy3 = PrivacyPolicy.builder()
.id("abe5ca7b-780e-4857-87e6-014870fe0a3g")
.description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。")
.collector(Collector.builder()
.name("AirRadio")
.email("[email protected]")
.phone("0987654177")
.build())
.access(Access.NON_IDENT)
.dispute(Dispute.builder()
.relatedOrganization("地方法院")
.type(Dispute.Type.LAW).build())
.remedies(asList(Remedy.builder()
.type(Remedy.Type.LAW).build()))
.statements(asList(Statement.builder()
.consequence("a1252c49-4188-4e6d-a32e-66604c664fba")
.purposes(asList(Purpose.builder()
.type(Purpose.Type.PSEUDO_ANALYSIS)
.description("本APP會蒐集使用者周遭溫度作為第三方資料之地區環境分析資料。")
.build()))
.data(asList(Datum.builder()
.type(Datum.Type.OTHER_CATEGORY)
.description("室溫資料")
.build()))
.recipients(asList(Recipient.builder()
.entity("AirRadio")
.type(Recipient.Type.OURS)
.build()))
.retention(Retention.STATED_PURPOSE)
.build()))
.build();
PrivacyPolicyReport sensorPrivacyPolicyReport = PrivacyPolicyReport.builder()
.id("0cfb6be3-6f0f-4e63-85b8-e9c936707c0a")
.version("1.0")
.description("本APP會蒐集使用者周遭溫度、濕度及空氣品質作為第三方資料之地區環境分析資料。")
.device(sensorDevice)
.policies(asList(sensorPrivacyPolicy1,sensorPrivacyPolicy2,sensorPrivacyPolicy3))
.build();
privacyPolicyReportService.add(sensorPrivacyPolicyReport);
} }
} }
\ No newline at end of file
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/DocumentController.java 0 → 100644
View file @ a513b3c8
package edu.prlab.tyler.iotgateway.cloud.controllers;
import edu.prlab.tyler.iotgateway.cloud.pojo.Document;
import edu.prlab.tyler.iotgateway.cloud.services.DocumentService;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@RestController
@RequestMapping("/document")
public class DocumentController {
private DocumentService documentService;
public DocumentController(DocumentService documentService) {
this.documentService = documentService;
}
@PostMapping
public ResponseEntity<Document> uploadFile(@RequestPart MultipartFile file) throws IOException {
System.out.println(file.getName());
return documentService.add(file)
.map(ResponseEntity::ok)
.orElseGet(() -> ResponseEntity.noContent().build());
}
// @GetMapping("/{id}")
// public ResponseEntity<InputStreamResource> getFile(@PathVariable(value = "id") Long id) {
// return
// }
}
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/controllers/GatewayController.java
View file @ a513b3c8
...@@ -4,10 +4,7 @@ import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice; ...@@ -4,10 +4,7 @@ import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
import edu.prlab.tyler.iotgateway.cloud.services.PrivacyChoiceService; import edu.prlab.tyler.iotgateway.cloud.services.PrivacyChoiceService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.Optional; import java.util.Optional;
...@@ -33,4 +30,11 @@ public class GatewayController { ...@@ -33,4 +30,11 @@ public class GatewayController {
.map(ResponseEntity::ok) .map(ResponseEntity::ok)
.orElseGet(() -> ResponseEntity.noContent().build()); .orElseGet(() -> ResponseEntity.noContent().build());
} }
@GetMapping("/choice/{udn}")
public ResponseEntity<Iterable<PrivacyChoice>> readPrivacyChoiceByDevice(@PathVariable String udn) {
return Optional.ofNullable(privacyChoiceService.readPrivacyChoiceByDevice(udn))
.map(ResponseEntity::ok)
.orElseGet(() -> ResponseEntity.noContent().build());
}
} }
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/Document.java 0 → 100644
View file @ a513b3c8
package edu.prlab.tyler.iotgateway.cloud.pojo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Entity
public class Document {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private String id;
private String fileName;
}
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/device/Model.java
View file @ a513b3c8
...@@ -6,10 +6,7 @@ import lombok.Builder; ...@@ -6,10 +6,7 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.persistence.Entity; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@Data @Data
@Builder @Builder
...@@ -23,6 +20,7 @@ public class Model { ...@@ -23,6 +20,7 @@ public class Model {
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private long id; private long id;
private String name; private String name;
@Column(length=1024)
private String url; private String url;
private String description; private String description;
} }
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/pojo/privacy/PrivacyPolicyReport.java
View file @ a513b3c8
package edu.prlab.tyler.iotgateway.cloud.pojo.privacy; package edu.prlab.tyler.iotgateway.cloud.pojo.privacy;
import edu.prlab.tyler.iotgateway.cloud.pojo.Document;
import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device; import edu.prlab.tyler.iotgateway.cloud.pojo.device.Device;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -31,4 +32,8 @@ public class PrivacyPolicyReport { ...@@ -31,4 +32,8 @@ public class PrivacyPolicyReport {
@JoinColumn(name = "policy_id") @JoinColumn(name = "policy_id")
@ElementCollection(targetClass = PrivacyPolicy.class) @ElementCollection(targetClass = PrivacyPolicy.class)
private List<PrivacyPolicy> policies ; private List<PrivacyPolicy> policies ;
@OneToOne
@JoinColumn(name = "document_id")
private Document document;
} }
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/repositories/DocumentRepository.java 0 → 100644
View file @ a513b3c8
package edu.prlab.tyler.iotgateway.cloud.repositories;
import edu.prlab.tyler.iotgateway.cloud.pojo.Document;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface DocumentRepository extends CrudRepository<Document, Long> {
}
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/repositories/PrivacyChoiceRepository.java
View file @ a513b3c8
package edu.prlab.tyler.iotgateway.cloud.repositories; package edu.prlab.tyler.iotgateway.cloud.repositories;
import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice; import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyChoice;
import edu.prlab.tyler.iotgateway.cloud.pojo.privacy.PrivacyContent;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.Optional;
@Repository @Repository
public interface PrivacyChoiceRepository extends CrudRepository<PrivacyChoice, Long> { public interface PrivacyChoiceRepository extends CrudRepository<PrivacyChoice, Long> {
Optional<Iterable<PrivacyChoice>> findPrivacyChoicesByPrivacyContent(PrivacyContent privacyContent);
} }
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/services/DocumentService.java 0 → 100644
View file @ a513b3c8
package edu.prlab.tyler.iotgateway.cloud.services;
import edu.prlab.tyler.iotgateway.cloud.pojo.Document;
import edu.prlab.tyler.iotgateway.cloud.repositories.DocumentRepository;
import edu.prlab.tyler.iotgateway.cloud.services.storage.StorageService;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.util.Optional;
@Service
public class DocumentService {
private DocumentRepository documentRepository;
private StorageService storageService;
public DocumentService(DocumentRepository repository,
StorageService storageService) {
this.documentRepository = repository;
this.storageService = storageService;
}
public Optional<Document> add(MultipartFile file) {
return Optional.ofNullable(storageService.store(file))
.map(filename -> Document.builder()
.fileName(filename)
.build())
.map(document->documentRepository.save(document));
}
}
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/services/PrivacyChoiceService.java
View file @ a513b3c8
...@@ -5,10 +5,20 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -5,10 +5,20 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Optional;
import java.util.stream.StreamSupport;
@Service @Service
public class PrivacyChoiceService extends CrudService<PrivacyChoice, Long>{ public class PrivacyChoiceService extends CrudService<PrivacyChoice, Long>{
@Autowired @Autowired
public PrivacyChoiceService(CrudRepository<PrivacyChoice, Long> repository) { public PrivacyChoiceService(CrudRepository<PrivacyChoice, Long> repository) {
super(repository); super(repository);
} }
public Iterable<PrivacyChoice> readPrivacyChoiceByDevice(String udn) {
return ()-> StreamSupport.stream(readll().spliterator(),false)
.filter(choice->choice.getPrivacyContent().getDevice().getUdn().equals(udn))
.iterator();
}
} }
cloud/src/main/java/edu/prlab/tyler/iotgateway/cloud/services/storage/StorageService.java 0 → 100644
View file @ a513b3c8
package edu.prlab.tyler.iotgateway.cloud.services.storage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.stereotype.Service;
import org.springframework.util.FileSystemUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.PostConstruct;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.stream.Stream;
@Service
public class StorageService {
private final Path rootLocation;
@Autowired
public StorageService(@Value("${storage.location}") String rootLocation) {
this.rootLocation = Paths.get(rootLocation);
}
@PostConstruct
public void init() {
try {
deleteAll();
Files.createDirectories(rootLocation);
} catch (IOException e) {
throw new RuntimeException("Could not initialize storage location", e);
}
}
public String store(MultipartFile file) {
String filename = StringUtils.cleanPath(file.getOriginalFilename());
try {
if (file.isEmpty()) {
throw new RuntimeException("Failed to store empty file " + filename);
}
if (filename.contains("..")) {
// This is a security check
throw new RuntimeException(
"Cannot store file with relative path outside current directory "
+ filename);
}
try (InputStream inputStream = file.getInputStream()) {
Files.copy(inputStream, this.rootLocation.resolve(filename),
StandardCopyOption.REPLACE_EXISTING);
}
} catch (IOException e) {
throw new RuntimeException("Failed to store file " + filename, e);
}
return filename;
}
public Stream<Path> loadAll() {
try {
return Files.walk(this.rootLocation, 1)
.filter(path -> !path.equals(this.rootLocation))
.map(this.rootLocation::relativize);
} catch (IOException e) {
throw new RuntimeException("Failed to read stored files", e);
}
}
public Path load(String filename) {
return rootLocation.resolve(filename);
}
public Resource loadAsResource(String filename) {
try {
Path file = load(filename);
Resource resource = new UrlResource(file.toUri());
if (resource.exists() || resource.isReadable()) {
return resource;
} else {
throw new RuntimeException(
"Could not read file: " + filename);
}
} catch (MalformedURLException e) {
throw new RuntimeException("Could not read file: " + filename, e);
}
}
public void deleteAll() {
FileSystemUtils.deleteRecursively(rootLocation.toFile());
}
}
cloud/src/main/resources/application.properties
View file @ a513b3c8
...@@ -5,4 +5,8 @@ spring.datasource.username=sa ...@@ -5,4 +5,8 @@ spring.datasource.username=sa
spring.datasource.password= spring.datasource.password=
spring.h2.console.enabled=true spring.h2.console.enabled=true
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
spring.jpa.generate-ddl=true spring.jpa.generate-ddl=true
\ No newline at end of file
spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB
storage.location=./uploads
\ No newline at end of file
cloud/src/test/java/edu/prlab/tyler/iotgateway/cloud/CloudHttpApiTest.java
View file @ a513b3c8
...@@ -209,5 +209,16 @@ public class CloudHttpApiTest { ...@@ -209,5 +209,16 @@ public class CloudHttpApiTest {
new TypeReference<Iterable<PrivacyChoice>>(){}); new TypeReference<Iterable<PrivacyChoice>>(){});
Assert.assertNotNull(privacyChoices); Assert.assertNotNull(privacyChoices);
result = mvc.perform(MockMvcRequestBuilders
.get("/choice/"+device.getUdn())
.accept(MediaType.APPLICATION_JSON_UTF8))
.andDo(print())
.andExpect(status().isOk())
.andReturn();
privacyChoices = mapper.readValue(result.getResponse().getContentAsString(),
new TypeReference<Iterable<PrivacyChoice>>(){});
Assert.assertNotNull(privacyChoices);
} }
} }
contract/build.gradle
View file @ a513b3c8
buildscript { buildscript {
ext { ext {
springBootVersion = '2.1.4.RELEASE' springBootVersion = '2.1.4.RELEASE'
web3jQuorumVersion = '4.0.6' web3jQuorumVersion = '4.0.6'
} }
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
} }
} }
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'org.springframework.boot' apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
group = 'edu.prlab.tyler.iotgateway' group = 'edu.prlab.tyler.iotgateway'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
configurations { configurations {
compileOnly { compileOnly {
extendsFrom annotationProcessor extendsFrom annotationProcessor
} }
} }
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation "org.web3j:quorum:${web3jQuorumVersion}" implementation "org.web3j:quorum:${web3jQuorumVersion}"
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test' annotationProcessor 'org.projectlombok:lombok'
testCompile("org.junit.jupiter:junit-jupiter-api:5.4.2")
testRuntime("org.junit.jupiter:junit-jupiter-engine:5.4.2") testImplementation 'org.springframework.boot:spring-boot-starter-test'
} testCompile("org.junit.jupiter:junit-jupiter-api:5.4.2")
testRuntime("org.junit.jupiter:junit-jupiter-engine:5.4.2")
}
\ No newline at end of file
gateway/.gradle/buildOutputCleanup/cache.properties
View file @ a513b3c8
#Fri Apr 19 15:42:32 CST 2019 #Thu May 16 18:00:30 CST 2019
gradle.version=5.2.1 gradle.version=4.10.3
gateway/build.gradle
View file @ a513b3c8
...@@ -12,6 +12,7 @@ buildscript { ...@@ -12,6 +12,7 @@ buildscript {
} }
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'org.springframework.boot' apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
...@@ -19,25 +20,34 @@ group = 'edu.prlab.tyler.iotgateway' ...@@ -19,25 +20,34 @@ group = 'edu.prlab.tyler.iotgateway'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
repositories {
mavenCentral()
}
configurations { configurations {
compileOnly { compileOnly {
extendsFrom annotationProcessor extendsFrom annotationProcessor
} }
} }
repositories {
mavenCentral()
}
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.mapstruct:mapstruct:${mapstructVersion}" implementation "org.mapstruct:mapstruct:${mapstructVersion}"
implementation project(":cloud") implementation project(":cloud")
implementation project(":contract")
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.h2database:h2' runtimeOnly 'com.h2database:h2'
testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.boot:spring-boot-starter-test'
} }
jar {
enabled = true
}
bootJar {
enabled = false
classifier = 'boot'
manifest {
attributes 'Start-Class': 'edu.prlab.tyler.iotgateway.gateway.GatewayApplication'
attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher'
}
}
\ No newline at end of file
gateway/build/resources/main/application.properties
View file @ a513b3c8
server.port=8080 server.port=8080
iotgateway.cloud.address = http://127.0.0.1:8081
\ No newline at end of file
gateway/settings.gradle
View file @ a513b3c8
...@@ -8,5 +8,5 @@ rootProject.name = 'gateway' ...@@ -8,5 +8,5 @@ rootProject.name = 'gateway'
include ":cloud" include ":cloud"
project(":cloud").projectDir = file("../cloud") project(":cloud").projectDir = file("../cloud")
include ":contract" //include ":contract"
project(":contract").projectDir = file("../contract") //project(":contract").projectDir = file("../contract")
\ No newline at end of file \ No newline at end of file
gateway/src/main/java/edu/prlab/tyler/iotgateway/gateway/GatewayApplication.java
View file @ a513b3c8
...@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.domain.EntityScan; ...@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
import javax.persistence.Entity; import javax.persistence.Entity;
@SpringBootApplication @SpringBootApplication
@EntityScan(basePackages = "edu.prlab.tyler.iotgateway")
public class GatewayApplication { public class GatewayApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(GatewayApplication.class, args); SpringApplication.run(GatewayApplication.class, args);
......
settings.gradle
View file @ a513b3c8
rootProject.name = 'iotgateway' rootProject.name = 'iotgateway'
include ':gateway' include ':gateway', ':cloud', ':contract'
include ':cloud' \ No newline at end of file
include ':contract'
\ No newline at end of file
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