Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>app</groupId>
<artifactId>app</artifactId>
<packaging>jar</packaging>
<version>1</version>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.1.RELEASE</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies>

<properties>
<java.version>1.8</java.version>
</properties>


<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
10 changes: 10 additions & 0 deletions src/main/java/elle/ladu.txt
Original file line number Diff line number Diff line change
@@ -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);
8 changes: 8 additions & 0 deletions src/main/java/elle/laohaldur.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package elle;

import javax.transaction.Transactional;
import org.springframework.data.repository.CrudRepository;
@Transactional
public interface laohaldur extends CrudRepository<tooted, String>{

}
58 changes: 58 additions & 0 deletions src/main/java/elle/rakendus.java
Original file line number Diff line number Diff line change
@@ -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
12 changes: 12 additions & 0 deletions src/main/java/elle/tooted.java
Original file line number Diff line number Diff line change
@@ -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;
}
Binary file added target/app-1.jar
Binary file not shown.
Binary file added target/app-1.jar.original
Binary file not shown.
Binary file added target/classes/elle/laohaldur.class
Binary file not shown.
Binary file added target/classes/elle/rakendus.class
Binary file not shown.
Binary file added target/classes/elle/tooted.class
Binary file not shown.
5 changes: 5 additions & 0 deletions target/maven-archiver/pom.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by Apache Maven
#Tue May 23 12:13:29 EEST 2017
version=1
groupId=app
artifactId=app
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
elle/laohaldur.class
elle/rakendus.class
elle/tooted.class
Original file line number Diff line number Diff line change
@@ -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