diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..f495f7a --- /dev/null +++ b/pom.xml @@ -0,0 +1,41 @@ + + 4.0.0 + app + app + jar + 1 + + org.springframework.boot + spring-boot-starter-parent + 1.5.1.RELEASE + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + mysql + mysql-connector-java + + + + + 1.8 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/src/main/java/elle/ladu.txt b/src/main/java/elle/ladu.txt new file mode 100644 index 0000000..fe9f47e --- /dev/null +++ b/src/main/java/elle/ladu.txt @@ -0,0 +1,10 @@ + +CREATE TABLE tooted( +jook VARCHAR(30)NOT NULL PRIMARY KEY, +nimi VARCHAR(30) NOT NULL, +kogus FLOAT (10) +); + +INSERT INTO tooted VALUES("karastusjook","Coca-Cola", 0.250); +INSERT INTO tooted VALUES("karastusjook","Aura õunamahl", 1); +INSERT INTO tooted VALUES("alkohoolne jook","Bacardi Superior", 1); diff --git a/src/main/java/elle/laohaldur.java b/src/main/java/elle/laohaldur.java new file mode 100644 index 0000000..96e234d --- /dev/null +++ b/src/main/java/elle/laohaldur.java @@ -0,0 +1,8 @@ +package elle; + +import javax.transaction.Transactional; +import org.springframework.data.repository.CrudRepository; +@Transactional +public interface laohaldur extends CrudRepository{ + +} diff --git a/src/main/java/elle/rakendus.java b/src/main/java/elle/rakendus.java new file mode 100644 index 0000000..b65c512 --- /dev/null +++ b/src/main/java/elle/rakendus.java @@ -0,0 +1,58 @@ +package elle; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; + + +@SpringBootApplication +@RestController +public class rakendus{ + @Autowired + private laohaldur haldur; + //Otsing + @RequestMapping("/find") + String find(String jook){ + if(jook == null){ + return "Tyhi sisestus"; + } + tooted toode = haldur.findOne(jook); + if(toode == null){ + return "Selline jook puudub."; + } + return "Jook " + jook + " toote nimi " + toode.nimi + " kogus " + toode.kogus; + } + //Total + @RequestMapping("/total") + public String total(){ + return "Andmebaasis on " + haldur.count() + " tulemust"; + } + //Uue toote lisamine + @RequestMapping("/addNewItem") + public String new_item(String jook, String nimi, double kogus){ + if(jook == null || nimi == null || kogus == 0){ + return "Lisa andmed"; + } + tooted n_tooted = new tooted(); + n_tooted.jook = jook; + n_tooted.nimi = nimi; + n_tooted.kogus = kogus; + haldur.save(n_tooted); + return "Lisatud on toode " + jook + "mille nimetus on "+ nimi +"ja kogus "+kogus; + } + public static void main(String[] args) { + System.getProperties().put("server.port", 4022); + System.getProperties().put("spring.datasource.url", + "jdbc:mysql://localhost/if16_elleivan"); + System.getProperties().put("spring.datasource.username", "if16"); + System.getProperties().put("spring.datasource.password", "ifikad16"); + SpringApplication.run(rakendus.class); + } +} + + +//scl enable rh-maven33 bash +//mvn package +//java -jar target/app-1.jar diff --git a/src/main/java/elle/tooted.java b/src/main/java/elle/tooted.java new file mode 100644 index 0000000..74c5c98 --- /dev/null +++ b/src/main/java/elle/tooted.java @@ -0,0 +1,12 @@ +package elle; + +import javax.persistence.*; + +@Entity +@Table (name="tooted") +public class tooted{ + @Id + public String jook; + public String nimi; + public Double kogus; +} diff --git a/target/app-1.jar b/target/app-1.jar new file mode 100644 index 0000000..1f7d23e Binary files /dev/null and b/target/app-1.jar differ diff --git a/target/app-1.jar.original b/target/app-1.jar.original new file mode 100644 index 0000000..a5ec01a Binary files /dev/null and b/target/app-1.jar.original differ diff --git a/target/classes/elle/laohaldur.class b/target/classes/elle/laohaldur.class new file mode 100644 index 0000000..0e24047 Binary files /dev/null and b/target/classes/elle/laohaldur.class differ diff --git a/target/classes/elle/rakendus.class b/target/classes/elle/rakendus.class new file mode 100644 index 0000000..9698ab9 Binary files /dev/null and b/target/classes/elle/rakendus.class differ diff --git a/target/classes/elle/tooted.class b/target/classes/elle/tooted.class new file mode 100644 index 0000000..bd34e2e Binary files /dev/null and b/target/classes/elle/tooted.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..94bc0ff --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Apache Maven +#Tue May 23 12:13:29 EEST 2017 +version=1 +groupId=app +artifactId=app diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..2f9b6d9 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +elle/laohaldur.class +elle/rakendus.class +elle/tooted.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..b5c819a --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +/home/elleivan/public_html/Programmeerimise_pohikursus_S2/Kodutood/t05veebirakendus/src/main/java/elle/rakendus.java +/home/elleivan/public_html/Programmeerimise_pohikursus_S2/Kodutood/t05veebirakendus/src/main/java/elle/tooted.java +/home/elleivan/public_html/Programmeerimise_pohikursus_S2/Kodutood/t05veebirakendus/src/main/java/elle/laohaldur.java