From 5d417a10d6319d183a8f5a482cae0b23734d740d Mon Sep 17 00:00:00 2001 From: Toolsten Date: Mon, 29 May 2017 23:36:13 +0300 Subject: [PATCH 1/2] =?UTF-8?q?Kodut=C3=B6=C3=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- T05/pom.xml | 40 +++++++++++++ T05/src/main/java/kodune/Rakendus.java | 56 ++++++++++++++++++ T05/src/main/java/kodune/RiigiHaldur.java | 8 +++ T05/src/main/java/kodune/Riigid.java | 14 +++++ T05/target/classes/kodune/Rakendus.class | Bin 0 -> 2857 bytes T05/target/classes/kodune/RiigiHaldur.class | Bin 0 -> 372 bytes T05/target/classes/kodune/Riigid.class | Bin 0 -> 498 bytes T05/target/kodune-0.0.1-SNAPSHOT.jar.original | Bin 0 -> 4199 bytes T05/target/maven-archiver/pom.properties | 5 ++ .../compile/default-compile/createdFiles.lst | 3 + .../compile/default-compile/inputFiles.lst | 3 + 11 files changed, 129 insertions(+) create mode 100644 T05/pom.xml create mode 100644 T05/src/main/java/kodune/Rakendus.java create mode 100644 T05/src/main/java/kodune/RiigiHaldur.java create mode 100644 T05/src/main/java/kodune/Riigid.java create mode 100644 T05/target/classes/kodune/Rakendus.class create mode 100644 T05/target/classes/kodune/RiigiHaldur.class create mode 100644 T05/target/classes/kodune/Riigid.class create mode 100644 T05/target/kodune-0.0.1-SNAPSHOT.jar.original create mode 100644 T05/target/maven-archiver/pom.properties create mode 100644 T05/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 T05/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/T05/pom.xml b/T05/pom.xml new file mode 100644 index 0000000..dedb844 --- /dev/null +++ b/T05/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + kodune + kodune + 0.0.1-SNAPSHOT + + 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 + + + + \ No newline at end of file diff --git a/T05/src/main/java/kodune/Rakendus.java b/T05/src/main/java/kodune/Rakendus.java new file mode 100644 index 0000000..52002c2 --- /dev/null +++ b/T05/src/main/java/kodune/Rakendus.java @@ -0,0 +1,56 @@ +package kodune; + +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 RiigiHaldur haldur; + + + @RequestMapping("/kokku") + public String kokku1(){ + return "Andmebaasist leiti "+haldur.count()+" riigi andmed."; + } + + + @RequestMapping("/v6rdlus") + public String v6rdlus1(String riik1, String riik2){ + if (riik1==null || riik2==null){ + return "V6rdlemiseks on vaja kahte riiki!"; + } + Riigid r1 = haldur.findOne(riik1); + Riigid r2 = haldur.findOne(riik2); + if(r1 == null || r2 == null){ + if(r1 == null){ + return "Andmebaasist ei leitud esimest sisestatud riiki."; + } + return "Andmebaasist ei leitud teist sisestatud riiki."; + } + + int tihedus1 = r1.rahvaarv/r1.pindala; + int tihedus2 = r2.rahvaarv/r2.pindala; + if(tihedus1 >= tihedus2){ + return riik1+" rahvastikutihedus(~"+tihedus1+" inimest ruutkilomeetri kohta) on suurem kui "+riik2+" rahvastikutihedus(~"+tihedus2+" inimest ruutkilomeetri kohta)."; + } + return riik2+" rahvastikutihedus(~"+tihedus2+" inimest ruutkilomeetri kohta) on suurem kui "+riik1+" rahvastikutihedus(~"+tihedus1+" inimest ruutkilomeetri kohta)."; + + } + + + + public static void main(String[] args) { + System.getProperties().put("server.port", 4208); + System.getProperties().put("spring.datasource.url", + "jdbc:mysql://localhost:3306/if16_StenT_2?useSSL=false"); + System.getProperties().put("spring.datasource.username", "if16"); + System.getProperties().put("spring.datasource.password", "ifikad16"); + SpringApplication.run(Rakendus.class); + } + +} diff --git a/T05/src/main/java/kodune/RiigiHaldur.java b/T05/src/main/java/kodune/RiigiHaldur.java new file mode 100644 index 0000000..fea9f7c --- /dev/null +++ b/T05/src/main/java/kodune/RiigiHaldur.java @@ -0,0 +1,8 @@ +package kodune; + +import javax.transaction.Transactional; +import org.springframework.data.repository.CrudRepository; +@Transactional +public interface RiigiHaldur extends CrudRepository{ + +} \ No newline at end of file diff --git a/T05/src/main/java/kodune/Riigid.java b/T05/src/main/java/kodune/Riigid.java new file mode 100644 index 0000000..ef4b747 --- /dev/null +++ b/T05/src/main/java/kodune/Riigid.java @@ -0,0 +1,14 @@ +package kodune; + +import javax.persistence.*; + + + +@Entity +@Table(name="riigiandmed") +public class Riigid{ + @Id + public String riik; + public int rahvaarv; + public int pindala; +} diff --git a/T05/target/classes/kodune/Rakendus.class b/T05/target/classes/kodune/Rakendus.class new file mode 100644 index 0000000000000000000000000000000000000000..001f01322f0b22b7335d5cedf50cfa1ab30aade5 GIT binary patch literal 2857 zcmb7GYjYFV8Gep0(qd!`0wD1J;^L9byNlp`}0^oLZ@ALR)&IJ(7=iwJUbd znmE_CxwM^r?H}mm573zmmn7};4)J~qWl5N>mGt(LST;Kcio=5xd|9<&T0O#@N z5xjt#dAv4)0o-)3Xy@1Wp@duev4l75_U8_k?Ob*6rak;c9xD!RJNV^3jN&ajyzStQ z75SBeUpx5C2=3yy4&(@GsE@#da?o(lbg=3`J6Lnz=Mm)58bOFCkG4Q=RR&%f3mjSW zBQFh=yR3CnU(ZhG1tyl$(CC(0(TT1FY9S0GBaM#2MBu_=6gSE-%rmlo$}P;np~G|Aj76xH8w`x_Ye8L zs<|~CdcDyut9z+R%o2+1``B5e>&$`!rG9 zD=&~;o)s8~DKWN{uSLjKaUkZMWAv(G_LLAewzs?)tr}VPnL$=JwhwRJZqTfGOX^VI zsq&q@o-<5j++>vx_qi4rsYYpBSJ$)!X>_>@K*d&E;8Op-h$7=k_CP%f8@ids%B^Ot zbA=ZR?RKE+S!4a5C?)1<6q+~+0u|2}P{x$N)4P$slIp-y?DE44q1RG1DHENTQlPZa zr2_6DF5m}vF^{AGgVdg^3mhmBo2D*FtK(G)xQ`iu$rTH`YUxDzNhu0T>vBz&e7S0r zmG|{z0qdw?oPw+Qi-$m@e`4Wj^CHHNFm_mQs8oB|lm^!^qy(r{@>5+B zIPv}Rl{`Ku;6r>Qus>1px{539C^mWgu7Ka;4|#lCz$f@rV7$W>6;B$OWDQhF<3Qm2 znpdmOwKkG_!JO*`_Q|hCiJ3chZf4fijWe@%RjliG&t6UwRjn>wY{(#C-yQ2?j{ZY3 z5!>79^_6MMBq37~5l1()FFh+awh30Zl?4v&ZlXLsE8vg#(~hg9+M22xvI2R6B*fbG zp@O{+zuS=P_2Q=EZQA9#uScZaj2&+Z953JeJ`0YCI{YS(Z;-{7LZ*MR8-|YDDvKur z{jO!u`Cdbv*cpS9wTg_{^LetJCj-9XDzsbM*3hwH8c)sAFpyUejn?UcpZLBieKdZ?{? z(woy(0Z#V)A+vG5G1jo0&- zdH zJ3*BhN?GOCFqqvNpbt=R9S;KJ^Xqr@uw6xc`Cmb?ONU1Naw4Z`s}H&E4G4^fz!O zhQ7tBZEA7bLR z-5x7Gv$;H8e0FpBT=9fm7E6Qwz~o~*e|x*zjxiLltHzlAF~a^LVV_|c=9t)a2hQUs W_$lQEn2H^LmbJD0lD*FT4d6TTQturA literal 0 HcmV?d00001 diff --git a/T05/target/classes/kodune/RiigiHaldur.class b/T05/target/classes/kodune/RiigiHaldur.class new file mode 100644 index 0000000000000000000000000000000000000000..e4b363b6e5f154dd964480fad5353f22aa5a7372 GIT binary patch literal 372 zcmb7=OG?B*5QhIAHE~7-ap%$t*dXpAf(YUwASB|xCf$ab$#f5uZXZ{3;Q>69*omNn zI~VmXzIuFozP$rD$3c!+j=dcF3e%cfM6N=JHtNXREYafMH z_Swr)8w#Ywu6@tJ%d5VYXsVy^qFj0toz)d{%cj_X)?ok@mxaQt_E8#p!(AGDIJVwW zXQG@AJ187i(FI=F2kv>^*(>LKpupbs3MV7-MF%0*Q!`}s{jX15;va1;@l8&1{@$l> f_WuJj1%*kHt@KSKy`A&~JIF?xV>j6>)u+H0B`|X? literal 0 HcmV?d00001 diff --git a/T05/target/classes/kodune/Riigid.class b/T05/target/classes/kodune/Riigid.class new file mode 100644 index 0000000000000000000000000000000000000000..7179b3e0876e76e3721ecbdfd1026586e103397c GIT binary patch literal 498 zcmZutO-sW-5PjRPXg^G?T5UafQxE3iO%X&C3Pqun-nYq;PMd5>vMKtrJP98B0sbg) zHWoxE%g)=Gc{6WkzP>*`0bJs^jxvrM^c?gBDk;%IpfjAymGmO1LvL(S(&3drZs-&o^C#0d|dK;$OaDpaiwR7$G4gq0U4R85Cgj0c= z`qttJJIY`}U~2xsxQ&t*s%B+*WP8O+fPIvKe4VGYsp-CvAV2(#>3UIsAIr8{tH#;x2KAUGAlg6ju#@3fUd74<-$Uu+|56&)rwhk;qfYCHfcuIe0>k(c+R+g zNNUecFv$VVZYv1A5p^z$ds#qq(d@{v8^BnMX^ zXym-XAnz56GRo+`q)6J|t_uCU0uE+k!awhOK%7{Fy&|?gmL?a_h{R8h=FbT z{86!Y$TN-1i)}7@#n+G}jV(8iRm1FTCkhvy?-QooB9NTEUsl%t9GyGyAnjf?**bYQ zI(W3jBYoohc9HMF-bgw?b1KA&tqIM>n0hJ18Yt%Zd>{}aRDO-YaC3_t=;GPKRPiuu zwOPbrG6l1p(i^_yS&5j;W$>7I0V0vHYZmmj^gGKHaYYPD3iJRH1HmNO7)78Pn649klr@<|V;Y$}_aKG3+ zGvR=^Gh_1O?-Yw?K9waO8>Q@&>f!4#`{R=fv5S=6c-&@?qLszL%DqX@N<(9PFWL*;RnXZuNDCjbxAxa9`!u*JJG%C2RBQjPw>}nng@F*ZVz7 zdq2KtCy--xF{(DOh9Tf?bRD@f090xXdA zDYa9VO>dxitXdL6YrBgjb}_~Axtw{mZ4q;d*wy)WjoAZRC{sZ>6E)Gh*fGX?dFqu-x`%#;(5(4`KB3t(Yj8ANwV%OIDwKtn zeV3}CO;I3~l}`v%o<`e`-i$X}Bb0ESYMdi9-R&b#j*&<;g`8K^#mo`$ z(UnOk)x8cevsYQ%nt5HUwkq?kZzw8vTD+m|{Q{%0aDpMHNaMz)jFl<;c{xk)W+w%v zh26uD8bg_(XFkY~Y4BEN%lmF_S`+)@8qJ#4B~SM|K<@B?HR6oNJ6BbA;Nm?errn|~T)H`6>KnRi z*+9W&M;lqHNdd)N^nE5pwetzNF2h$exuX@-dSgalCC(m+fMD<7c9s zFY($J=^a|cMFah>-3>KP<41#Nk8nfY_|oP4z7=BlRryF~^m`ljf3!Jb`W4GH@}Ha6 zQ~zb^=wL78Zg1D5XQ~w-4DmVpK^E%e0KRp~3Kk~~?Xz@=V4AiCv0DU`l@XWuI#?4R zE{Ms}dHDCcte(#k9Gv#ISIH--hUTohRTzZdrfGMC@iwxB*b*j(_L<8l81`bidqtHc zlS`MMKoK6+?u^mXnMuRqy+O<*WQpYcG4uS%k=X=!&_;g5CQ)&nNVBFA15q$&Yr9ug zmX+dJq~a-`)ABaN6Hw3m5M~3YQTHmBZ%5``I%s#8;qEx4S(o=#=9!b#9YN9Tp{-hbUADr5w+MPz_H43z?8~w5QAk}w` z2@zBmJS}@RWo6dZGh9G{h%-y?phMk{QmFQAE^v6`F+!U4T%Yvr&HIa#6RWSHLOfNx za;lo_JCOIXrO!%rSx9qJl^E{;_Fr+{a*c6IFzVtOF$lR(`bzFe*Vrj>N$n_u14?|u zM&U4>8i%`kmbjcfoILozKVvNL|6uIs?BIxWMq49YbltSN)CA#BRgFt35A__OD(c-T z`fD0cwXSI$Dn4S72ndA+gn|Masg9)(Ja)xY0TM|;(N)>56A>=9v0+EKNwG=c8nDj> z^q2liq2gu4x*AwY*REtk7rvoWNf!YZ?Wc=ZqdEDd<7_gX7e?WZ=Y;!es}T@FfWN=t z_!;Y~&;V9o_|=bu`f7H_R7WQc{LJ-TvN1fkN^8q)v zemnS=GaRMte|vpAb$u0l+&OXJ{0QK8BKv31@Kknatof_)Poexh@OWxF^x^-HK7Mj_ zNOeaO1W$F}r4&>1U#`9p-_aQ36YJ=W#V6KxDaB+^{1TmSr~3B5dpt}tZ8c&NyfGN} MS;Zl2PKp2ZKOBQ*zW@LL literal 0 HcmV?d00001 diff --git a/T05/target/maven-archiver/pom.properties b/T05/target/maven-archiver/pom.properties new file mode 100644 index 0000000..adaee96 --- /dev/null +++ b/T05/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Apache Maven +#Tue Mar 14 01:25:19 EET 2017 +version=0.0.1-SNAPSHOT +groupId=kodune +artifactId=kodune diff --git a/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..ce672f5 --- /dev/null +++ b/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +kodune/Rakendus.class +kodune/RiigiHaldur.class +kodune/Riigid.class diff --git a/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..32a7046 --- /dev/null +++ b/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +/home/ericskri/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/RiigiHaldur.java +/home/ericskri/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/Rakendus.java +/home/ericskri/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/Riigid.java From 7f1d633b1f8212797f1eac69c501332c6099419a Mon Sep 17 00:00:00 2001 From: Toolsten Date: Tue, 30 May 2017 00:12:18 +0300 Subject: [PATCH 2/2] Update inputFiles.lst --- .../compile/default-compile/inputFiles.lst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 32a7046..9133210 100644 --- a/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/T05/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,3 @@ -/home/ericskri/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/RiigiHaldur.java -/home/ericskri/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/Rakendus.java -/home/ericskri/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/Riigid.java +/home/Toolsten/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/RiigiHaldur.java +/home/Toolsten/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/Rakendus.java +/home/Toolsten/public_html/Programmeerimise_pohikursus/Kodutood/t05veebirakendus/veeb3/src/main/java/kodune/Riigid.java