From 87fa6d06265698e8fa5ddb71fec93cc8148712f7 Mon Sep 17 00:00:00 2001 From: Willfreity Date: Tue, 19 Mar 2024 18:23:41 -0300 Subject: [PATCH 1/4] exercicio resolvido --- src/main/kotlin/Main.kt | 7 +++++++ src/main/kotlin/restaurante.kt | 25 +++++++++++++++++++++++++ src/main/restaurante.json | 22 ++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 src/main/kotlin/restaurante.kt create mode 100644 src/main/restaurante.json diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt index 0a9890e..52694c5 100644 --- a/src/main/kotlin/Main.kt +++ b/src/main/kotlin/Main.kt @@ -1,7 +1,14 @@ package org.example +import java.io.File + fun main() { println("Hello World!") + +val restauranteJso= File("/home/wilker/codelab/src/main/restaurante.json").readText() + println(restauranteJso) + + } /** diff --git a/src/main/kotlin/restaurante.kt b/src/main/kotlin/restaurante.kt new file mode 100644 index 0000000..e849c47 --- /dev/null +++ b/src/main/kotlin/restaurante.kt @@ -0,0 +1,25 @@ +package org.example + +class restaurante ( + var name: String, + var rating :Double +) +class endereco( + var country:String, + var city: String, + var road: String, + var number :String, + var neighborhood: String, + var state: String + +) +class itinerary( + var start_Hourts:String, + var end_Hours:String, + var day:String + +) + + + + diff --git a/src/main/restaurante.json b/src/main/restaurante.json new file mode 100644 index 0000000..b2fdd01 --- /dev/null +++ b/src/main/restaurante.json @@ -0,0 +1,22 @@ +{ + "name": "Comida Mineira", + "rating": "5", + "endereco": { + "country": "Brasil", + "city": "Conceicao do Para", + "road": "Road 01", + "number": "1110", + "neighborhood": "Centro", + "state": "Minas Gerais" + }, + "itinerary": { + "start_Hours": "08:00", + "end_Hours": "20:00", + "day": "Monday, tuesday,Wednesday,thursday,Friday" + } +} + + + + + From 0ed13bdbff72193b7281b4f6d12eaebd578a54f6 Mon Sep 17 00:00:00 2001 From: Willfreity Date: Wed, 20 Mar 2024 17:33:30 -0300 Subject: [PATCH 2/4] parte 1 --- src/main/kotlin/Main.kt | 8 +++-- .../kotlin/{restaurante.kt => restaurant.kt} | 6 ++-- src/main/restaurante.json | 34 ++++++++++--------- 3 files changed, 26 insertions(+), 22 deletions(-) rename src/main/kotlin/{restaurante.kt => restaurant.kt} (83%) diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt index 52694c5..8fe68ef 100644 --- a/src/main/kotlin/Main.kt +++ b/src/main/kotlin/Main.kt @@ -1,13 +1,15 @@ package org.example +import com.google.gson.Gson import java.io.File - fun main() { println("Hello World!") val restauranteJso= File("/home/wilker/codelab/src/main/restaurante.json").readText() - println(restauranteJso) - + //println(restauranteJso) +val gson = Gson() + val restaurant = gson.fromJson(restauranteJso,Restaurant::class.java) + println(restaurant.name) } diff --git a/src/main/kotlin/restaurante.kt b/src/main/kotlin/restaurant.kt similarity index 83% rename from src/main/kotlin/restaurante.kt rename to src/main/kotlin/restaurant.kt index e849c47..ea1a206 100644 --- a/src/main/kotlin/restaurante.kt +++ b/src/main/kotlin/restaurant.kt @@ -1,10 +1,10 @@ package org.example -class restaurante ( +class Restaurant ( var name: String, var rating :Double ) -class endereco( +class Adress( var country:String, var city: String, var road: String, @@ -13,7 +13,7 @@ class endereco( var state: String ) -class itinerary( +class Itinerary( var start_Hourts:String, var end_Hours:String, var day:String diff --git a/src/main/restaurante.json b/src/main/restaurante.json index b2fdd01..ddac17d 100644 --- a/src/main/restaurante.json +++ b/src/main/restaurante.json @@ -1,21 +1,23 @@ { - "name": "Comida Mineira", - "rating": "5", - "endereco": { - "country": "Brasil", - "city": "Conceicao do Para", - "road": "Road 01", - "number": "1110", - "neighborhood": "Centro", - "state": "Minas Gerais" - }, - "itinerary": { - "start_Hours": "08:00", - "end_Hours": "20:00", - "day": "Monday, tuesday,Wednesday,thursday,Friday" - } -} + "Restaurant": { + "name": "Comida Mineira", + "rating": "5", + "Adress": { +"country": "Brasil", +"city": "Conceicao do Para", +"road": "Road 01", +"number": "1110", +"neighborhood": "Centro", +"state": "Minas Gerais" +}, + "Itinerary": { +"start_Hours": "08:00", +"end_Hours": "20:00", +"day": "Monday, tuesday,Wednesday,thursday,Friday" +} +} +} From e56d2da7a5466b11b185af9f7505beef1f3fade7 Mon Sep 17 00:00:00 2001 From: Willfreity Date: Tue, 9 Apr 2024 22:38:47 -0300 Subject: [PATCH 3/4] posto de combustivel --- src/main/kotlin/Main.kt | 18 ++++--- src/main/kotlin/PostoDeCombustivel.Json | 69 +++++++++++++++++++++++++ src/main/kotlin/restaurant.kt | 34 +++++++----- src/main/kotlin/restaurante.json | 20 +++++++ 4 files changed, 120 insertions(+), 21 deletions(-) create mode 100644 src/main/kotlin/PostoDeCombustivel.Json create mode 100644 src/main/kotlin/restaurante.json diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt index 8fe68ef..8d32437 100644 --- a/src/main/kotlin/Main.kt +++ b/src/main/kotlin/Main.kt @@ -1,16 +1,20 @@ package org.example -import com.google.gson.Gson import java.io.File + fun main() { - println("Hello World!") -val restauranteJso= File("/home/wilker/codelab/src/main/restaurante.json").readText() - //println(restauranteJso) -val gson = Gson() - val restaurant = gson.fromJson(restauranteJso,Restaurant::class.java) - println(restaurant.name) +val PostoDeCombustivelJso=File("/home/wilker/codelab/src/main/kotlin/PostoDeCombustivel.Json").readText() + println(PostoDeCombustivelJso) + +//val restauranteJso= File("/home/wilker/codelab/src/main/kotlin/restaurante.json").readText() + // println(restauranteJso) +//val gson = Gson() + // val restaurant = gson.fromJson(restauranteJso,Restaurant::class.java) + // println(restaurant.name) + // println(restaurant.adress.city) + // println(restaurant.itinerary) } /** diff --git a/src/main/kotlin/PostoDeCombustivel.Json b/src/main/kotlin/PostoDeCombustivel.Json new file mode 100644 index 0000000..2b4d623 --- /dev/null +++ b/src/main/kotlin/PostoDeCombustivel.Json @@ -0,0 +1,69 @@ +{ + "name": "Posto Amigão", + "Adress": { + "city": "Conceicao do Para", + "rua": "Rua Martinho Lemos", + "number": "1110", + "neighbord": "Centro", + "registerAnp": "123456789" + }, + "employee": [ + { + "name": "joao bobo", + "dateOfBirth": "01/01/1990", + "nameMOm": "Maria helena", + "nameOfDad": "Jose Luiz", + "salary": "2000,00", + "Adress": { + "city": "Conceicao do Para", + "rua": "Rua dos funcionarios", + "number": "11", + "neighbord": "Parana" + } + }, + { + "name": "Felipe Duarte", + "dateOfBirth": "01/05/1999", + "nameMOm": "Joana Feliz", + "nameOfDad": "Raimundo pinto", + "salary": "2000,00", + "Adress": { + "city": "Pitangui", + "rua": "Rua dos amigos", + "number": "101", + "neighbord": "Chapadao" + } + }, + { + "name": "Fernanda Julia", + "dateOfBirth": "10/08/1975", + "nameMOm": "Maria joana", + "nameOfDad": "Charles Xavier ", + "salary": "2000,00", + "Adress": { + "city": "Para de Minas", + "rua": "Rua dos patos", + "number": "58", + "neighbord": "Jk" + } + } + ], + "bomb": [ + { + "fuel": "gasolina,etanol ", + "nozzle": "06", + "series": "123456" + }, + { + "fuel": "Diesel,Diesel-S10 ", + "nozzle": "06", + "series": "1111" + } + ] +} + + + + + + diff --git a/src/main/kotlin/restaurant.kt b/src/main/kotlin/restaurant.kt index ea1a206..789d949 100644 --- a/src/main/kotlin/restaurant.kt +++ b/src/main/kotlin/restaurant.kt @@ -1,24 +1,30 @@ package org.example -class Restaurant ( - var name: String, - var rating :Double + class Restaurant( + val name: String, + val adress: Adress, + val itinerary: List ) class Adress( - var country:String, - var city: String, - var road: String, - var number :String, - var neighborhood: String, - var state: String + val country:String, + val city: String, + val road: String, + val number :String, + val neighborhood: String, + val state: String ) -class Itinerary( - var start_Hourts:String, - var end_Hours:String, - var day:String -) + class Itinerary( + val startHours:String, + val endHours:String, + val day:String, + ) + + + + + diff --git a/src/main/kotlin/restaurante.json b/src/main/kotlin/restaurante.json new file mode 100644 index 0000000..91aedde --- /dev/null +++ b/src/main/kotlin/restaurante.json @@ -0,0 +1,20 @@ +{ + "name": " Churrascaria do Chef", + "adress": { + "country": "Brasil", + "city": "Conceicao do Para", + "road": "Martinho Lemos", + "number": "1110", + "neighborhood": "centro", + "state": "Minas Gerais" + }, + "itinerary":[ + "day:Segunda", + "startHours:08:00", + "endHours:15:00", + "day:Terça", + "startHours:09:00", + "endHours:15:00" + +] +} \ No newline at end of file From ed49cd8a1bbd3b3a09ad6c3897ae174462caa026 Mon Sep 17 00:00:00 2001 From: Willfreity Date: Tue, 9 Apr 2024 22:56:02 -0300 Subject: [PATCH 4/4] Posto --- src/main/restaurante.json | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 src/main/restaurante.json diff --git a/src/main/restaurante.json b/src/main/restaurante.json deleted file mode 100644 index ddac17d..0000000 --- a/src/main/restaurante.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "Restaurant": { - "name": "Comida Mineira", - "rating": "5", - - "Adress": { -"country": "Brasil", -"city": "Conceicao do Para", -"road": "Road 01", -"number": "1110", -"neighborhood": "Centro", -"state": "Minas Gerais" -}, - "Itinerary": { -"start_Hours": "08:00", -"end_Hours": "20:00", -"day": "Monday, tuesday,Wednesday,thursday,Friday" -} -} -} - - - -