From 068bd96f9588b93b3610b567b074366e010619d0 Mon Sep 17 00:00:00 2001 From: vickihe Date: Sun, 25 Aug 2019 21:42:37 +0800 Subject: [PATCH 1/4] update --- web/oldPeopleHome.html | 6 +++--- web/style.css | 48 ++++++++++++++++++++++++++--------------- web/图标/箭头01.png | Bin 0 -> 2456 bytes 3 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 web/图标/箭头01.png diff --git a/web/oldPeopleHome.html b/web/oldPeopleHome.html index 7207c0d..03b5806 100644 --- a/web/oldPeopleHome.html +++ b/web/oldPeopleHome.html @@ -15,9 +15,9 @@
- 用户名：

- 密码：

- +


+


+
diff --git a/web/style.css b/web/style.css index 38c6e45..dfb010a 100644 --- a/web/style.css +++ b/web/style.css @@ -8,8 +8,7 @@ body { font-style: italic; font-family: sans-serif; font-size: 125px; - text-align: center; - position: absolute; + position: relative; top: 120px; /* background-color: yellow; */ @@ -20,29 +19,44 @@ body { font-family: youyuan; font-size: 30px; text-align: center; - position: relative; - top: 140px; + position: absolute; + top: 100px; } #name { - width: 120px; + /* width: 120px; */ + width: 100%; color: slategray; font-family: youyuan; font-size: 24px; - position: relative; - left: 490px; - top: 150px; + text-align: center; + position: absolute; + /* left: 490px; */ + top: 230px; } input[name] { - height: 27px; - border: none; - position: absolute; - left: 150px; + background-color: rgba(240, 248, 255, 0); + height: 30px; + border: 0.5px solid rgba(128, 128, 128, 0.5); + border-radius: 15px; + position: relative; font-family: youyuan; + text-align: center; + font-size: 18px; + outline: none; } -input[password] { - height: 27px; +#submit { + background-color: rgba(255, 239, 213); + height: 40px; + width: 40px; border: none; - position: absolute; - left: 150px; - font-family: youyuan; + border-radius: 100%; + font-size: 22px; + color: white; + padding: 0; + outline: none; +} +#submit:hover { + width: 45px; + height: 45px; + background-color: rgba(255, 239, 213, 0.582); } diff --git a/web/图标/箭头01.png b/web/图标/箭头01.png new file mode 100644 index 0000000000000000000000000000000000000000..15a3b9a298737eb9c3ca0c54326a029221d001f2 GIT binary patch literal 2456 zcmd^B`#;nBAD{KXXQVz`lw4<~8eNXuaye{l+0@GYAh(ddE2&oGlFOzv*Je@8wIkt_ ziBxXQC6W_rIE}fT%49{>LBy$iKm8lu?+@?y>+yI$-p}Xr^?tqHkN5MP=6c9kO+`xu zfk3FysAP9IcK;lp50IE4$@y2%-ywhxcIrLe8zj+Z1CT>iN!7j1#padt3wG1 zHSiH^kuKD584h|75sE_~Es_4Dh%rsCO9-|)!JIJyVmVpbx6>ga7k7CZU0VUDJsawY zMuP5TqB4eIGS)IO)7TL~N>|S}KLtRYU0H4v5KGN*yjGrtU=KH#-USr^g8P349-@hm zw$*+OgJdj4g`RJT1VbjfDscc*M*W>OxF7MqA}SLw(z{c{BiF?FKjNdFoE8XW!qy3` z)8bc#-Bo$2`SqN!lLBFcAR(%U;K|jGlea3=2vhvH)G0s1Z!Thj(N33a@lRCn^DLHN*m zZ6*e7y8gf(6nl0yeSHUoycY7Mz-jk~YCQN(q)~U}j5^t^j0cdy<&hODwqqd)am`qkyuV0?qf*yCA z@3x-(i-+Z$v+C7}l$ek(_o z9VoO|?Ojp#7>_jIocm&S`G{WrfCbGL&fUXVS&AXhm`d=kpd) zyek+R7lw8L{5#spMaM;!v3=1Xj1+YhF#PyGQ?)t!rcudd{^4?Btmj9NslIY)x^D-H zjgR=t(Bs866kA6^r@bnoVF21lnR7)ROl{qC4O8Nff(LmGBxfp}+;Up*9rMeLx^Gdc zB&4x(_Y6QLuN}O1|J;K8QzH^2=b`0Es9s|fTO>Me2<`Z@qw=?QgKo)4$|eE}OM9B= zrbm*E)@`~8Ygos}pLxoMJLTA_w?8=51eO=;6~?5Rq!nO$*BbyeJbUwM0EAQ1lI~ zntv|d^iM3fo*2APyek76HzhIwm4R@>Tk=ywTaW_#o$Q~t@xJ{!{Y!280L%MMJK1Lx zw^qFA4bx_wj+ftmyuKDJ-E$#K?ZM@}CAyc1-?YeP8ff9wcykwV?>eLj_+&=t;PX%8 zNqxyhMPJ~pQjFQO#TrP`ZYt+yq;RAFhOW_cYH?k2Z6#n}%POBSH4`g5PE%vN-B^HfRKSX74B z?dY(rG$MKN!12M=H`il@gF?3O!uZFQ86r2}tLBp{Z8B!VM93$FXTxy-yLdaZnd$F! z$%HDLu(O-I6_l{%F=VP&?^TfuNk2#bVZp*$|L_y*tV(aqu&~wpP|?~fi8NTv(V--( zEt83bJAHd8jZAKxjF~xTF#9;&f^+T;c)^TC*^q$rYNamOJq;@E(CDo5?_Ax;l1vey ze49+7k~M^{`t^izU}A-DiA~Ww45NPfq1Km}<20l*QLxc!?G4+x^y0>Mq#VsP2+R## zejIf&4eE5sK05@4<)&DG^f^cDJst4ffF6Jvd7L(|8YRN;upS|U)53Z0eAQ>WX=-Hy#1H@6L9tfJPaAq5>f<`@3~J%jJ^)r%RiJzkBC zM{U#BZ#b2(&}@@U%)&ammPiX(%)%)KabqtmZhCaR^lN=3$g62wF2AIskHU3NM7mfe zO8EC$iKX(=MZ5Awfel@YWOpQZ-iI|RPWmLAu?;J?g~FP6&*(nnMK|AswX$i`PPhz? zV2II;2!GKQmPb!J?pNPya+)*w{P^1yC)L3o7B=3-SmJ|5KhK?5oDiOV4L_~+>h(S| zzIVP$=W*TvNijN3kw@ycrDDCAXG91P3@l-N23C|gR)oGsiI|QJloiG5O!bl zJNO(B31UcjHyNT1b#ro{Ptj5F}hB#!O8C zpn14p(y+-`v}YPW6~Qhe7^RV6M(}RuK_>)hAeTqR!Hj@cNI7iI3>O*>4Kw~f$^KAE X*kd>CZUy}Y|F{q|${}*KV=()_6*&!R literal 0 HcmV?d00001 From 4410650225f17f634aca8b241ca9b17b291cf9ae Mon Sep 17 00:00:00 2001 From: JiangYuWei <739843128@qq.com> Date: Tue, 27 Aug 2019 17:12:20 +0800 Subject: [PATCH 2/4] Update README.md --- server/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/README.md b/server/README.md index 525c719..6a60a5c 100644 --- a/server/README.md +++ b/server/README.md @@ -56,6 +56,8 @@ ### 接口格式 +使用实例：http://39.105.65.209:8080/parent/list + 基本的业务接口已经完成，如下 | 实体 | url示例 | 请求方式 | 功能概述 | 参数格式 | @@ -91,4 +93,4 @@ | Sleep | /sleep/get/1 | GET | 查找id=1的老人睡眠信息 | 参数格式：yyyy-mm-dd 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 | | Sleep | /sleep/add | POST | 添加老人睡眠信息 | parent，date，deep，light，awake | | HeartRate | /heartrate/get/1 | GET | 查找id=1的心率信息 | 参数格式：yyyy-mm-dd hh-mm-ss 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 | -| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate | \ No newline at end of file +| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate | From 1a923fafe82989e10ac94d340db6d60b6b3f6130 Mon Sep 17 00:00:00 2001 From: vickihe Date: Tue, 27 Aug 2019 19:54:52 +0800 Subject: [PATCH 3/4] update --- web/firstPage.html | 15 +++++++++++++++ web/firstPage_style.css | 0 web/{oldPeopleHome.html => login.html} | 2 +- web/{style.css => login_style.css} | 0 web/图标/LOGO.png | Bin 0 -> 4894 bytes 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 web/firstPage.html create mode 100644 web/firstPage_style.css rename web/{oldPeopleHome.html => login.html} (94%) rename web/{style.css => login_style.css} (100%) create mode 100644 web/图标/LOGO.png diff --git a/web/firstPage.html b/web/firstPage.html new file mode 100644 index 0000000..6fabc9f --- /dev/null +++ b/web/firstPage.html @@ -0,0 +1,15 @@ + + + + + + + 首页 + + + + + + \ No newline at end of file diff --git a/web/firstPage_style.css b/web/firstPage_style.css new file mode 100644 index 0000000..e69de29 diff --git a/web/oldPeopleHome.html b/web/login.html similarity index 94% rename from web/oldPeopleHome.html rename to web/login.html index 03b5806..dfab637 100644 --- a/web/oldPeopleHome.html +++ b/web/login.html @@ -5,7 +5,7 @@ oldPeopleHome - +
diff --git a/web/style.css b/web/login_style.css similarity index 100% rename from web/style.css rename to web/login_style.css diff --git a/web/图标/LOGO.png b/web/图标/LOGO.png new file mode 100644 index 0000000000000000000000000000000000000000..26c2b1d548391305b9a7b2708202476264f28e00 GIT binary patch literal 4894 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 Date: Tue, 27 Aug 2019 21:28:36 +0800 Subject: [PATCH 4/4] add column --- server/OldPeopleHome/.idea/workspace.xml | 501 +++++++++++------- .../java/com/oldpeoplehome/entity/Motion.java | 18 +- .../oldpeoplehome/web/MotionController.java | 3 +- .../src/main/resources/jdbc.properties | 4 +- .../src/main/resources/mapper/MotionDao.xml | 5 +- .../OldPeopleHome/src/main/sql/add_table.sql | 28 +- .../com/oldpeoplehome/dao/MotionDaoTest.java | 3 +- server/OldPeopleHome/target/OldPeopleHome.war | Bin 13717220 -> 13716888 bytes .../META-INF/OldPeopleHome.kotlin_module | Bin 16 -> 0 bytes .../WEB-INF/classes/jdbc.properties | 2 +- .../META-INF/OldPeopleHome.kotlin_module | Bin 16 -> 0 bytes .../com/oldpeoplehome/entity/Motion.class | Bin 2732 -> 3019 bytes .../oldpeoplehome/web/MotionController.class | Bin 3370 -> 3419 bytes .../target/classes/mapper/MotionDao.xml | 5 +- .../META-INF/OldPeopleHome.kotlin_module | Bin 16 -> 0 bytes .../com/oldpeoplehome/dao/MotionDaoTest.class | Bin 1535 -> 1602 bytes 16 files changed, 363 insertions(+), 206 deletions(-) delete mode 100644 server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module delete mode 100644 server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module delete mode 100644 server/OldPeopleHome/target/test-classes/META-INF/OldPeopleHome.kotlin_module diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml index 7ca57c6..b2a8e97 100644 --- a/server/OldPeopleHome/.idea/workspace.xml +++ b/server/OldPeopleHome/.idea/workspace.xml @@ -7,7 +7,19 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -100,17 +42,118 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -130,7 +173,15 @@ setRoomName *** + utf8mb4_0900_ai_ci + utf8mb4 + energy + + utf8_general_ci + utf8 + motionEnergy + E:\课设\OldPeopleHome\server\OldPeopleHome\src\main\java\com\oldpeoplehome\service\impl @@ -156,9 +207,6 @@ @@ -210,10 +261,10 @@ - @@ -222,7 +273,6 @@ - @@ -241,6 +291,21 @@ + + + + + + + + + + + + + + + @@ -248,22 +313,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - insert into motion(pid, date, count, distance, time) - values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionTime}) + insert into motion(pid, date, count, distance, energy, time) + values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime}) \ No newline at end of file diff --git a/server/OldPeopleHome/src/main/sql/add_table.sql b/server/OldPeopleHome/src/main/sql/add_table.sql index cfb20aa..34e985e 100644 --- a/server/OldPeopleHome/src/main/sql/add_table.sql +++ b/server/OldPeopleHome/src/main/sql/add_table.sql @@ -10,10 +10,10 @@ DROP TABLE IF EXISTS `sleep`; CREATE TABLE `parent` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '老人id', `longid` char(18) NOT NULL COMMENT '老人身份证', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '姓名', - `sex` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '性别', - `account` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '账号', - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码', + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '姓名', + `sex` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '性别', + `account` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '账号', + `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码', `height` double DEFAULT NULL COMMENT '身高', `weight` double DEFAULT NULL COMMENT '体重', `birth` date NOT NULL COMMENT '生日', @@ -21,16 +21,16 @@ CREATE TABLE `parent` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `index_longid` (`longid`) USING BTREE, KEY `index_name` (`name`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC; CREATE TABLE `room` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '房间id', - `location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '房间位置', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '房间名称(房间号)', + `location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '房间位置', + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '房间名称(房间号)', `pid` bigint(20) DEFAULT NULL COMMENT '房间住人id', PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `index` (`pid`) USING BTREE, CONSTRAINT `room_fk_1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL -) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC; CREATE TABLE `child` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', @@ -43,14 +43,14 @@ CREATE TABLE `child` ( PRIMARY KEY (`id`), UNIQUE KEY `index _longid` (`longid`) USING BTREE, KEY `index_name` (`name`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `cp` ( `pid` bigint(20) DEFAULT NULL, `cid` bigint(20) DEFAULT NULL, `relation` varchar(255) DEFAULT NULL, KEY `index_pid` (`pid`) USING BTREE, KEY `index_cid` (`cid`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `heartrate` ( `pid` bigint(20) DEFAULT NULL, `time` datetime DEFAULT NULL, @@ -58,7 +58,7 @@ CREATE TABLE `heartrate` ( KEY `index_pid` (`pid`) USING BTREE, KEY `time` (`time`) USING BTREE, CONSTRAINT `fk_pid2` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `motion` ( `pid` bigint(20) DEFAULT NULL COMMENT 'parent id', `date` date DEFAULT NULL COMMENT '当日日期', @@ -68,7 +68,7 @@ CREATE TABLE `motion` ( KEY `index_date` (`date`) USING BTREE, KEY `index_pid` (`pid`) USING BTREE, CONSTRAINT `fk_pid` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `rstate` ( `rid` int(11) DEFAULT NULL, @@ -79,7 +79,7 @@ CREATE TABLE `rstate` ( KEY `index_rid` (`rid`) USING BTREE, KEY `index_time` (`time`) USING BTREE, CONSTRAINT `fk_rid1` FOREIGN KEY (`rid`) REFERENCES `room` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `sleep` ( `pid` bigint(20) DEFAULT NULL COMMENT 'parent id', `date` date DEFAULT NULL COMMENT '当天日期', @@ -90,5 +90,5 @@ CREATE TABLE `sleep` ( KEY `index_pid` (`pid`) USING BTREE, KEY `index_pid_date` (`pid`,`date`) USING BTREE, CONSTRAINT `fk_pid1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java index 4209222..bfd3b38 100644 --- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java +++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java @@ -30,8 +30,9 @@ public class MotionDaoTest extends BaseTest { @Test public void testInsert(){ - Motion motion = new Motion(2, "2019-2-2", 1239, 11, "1:1:1"); + Motion motion = new Motion(2, "2019-2-2", 1239, 11,22, "1:1:1"); motionDao.insert(motion); + System.out.println(motionDao.findByParentId(new MotionFilter(1))); } } diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war index 01dbdab548891c265a8ae3400ef6268216418136..66c3f98fa5102aed9203a7a9e7b8981e23568861 100644 GIT binary patch delta 4573 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 delta 4783 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 HDc1iB$|m{l diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module deleted file mode 100644 index 8fb60192d378759239a3ecbf60eac8c8de446e9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties index e9eb37f..a33e43a 100644 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties +++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties @@ -1,4 +1,4 @@ jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 +jdbc.url=jdbc:mysql://localhost:3306/oldpeople?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 jdbc.username=root jdbc.password=root diff --git a/server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module b/server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module deleted file mode 100644 index 8fb60192d378759239a3ecbf60eac8c8de446e9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class index 3160ad78edd1ac9be7f9f2b481e5cd12611621f7..ae920b87cda309bcb29a5ef923647ed4a5c94b2c 100644 GIT binary patch literal 3019 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 diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class index 7ecb67ce6d6620e791361bf02da7920ee52d0c49..3ae8aba54bd3875f6b227785dec7c12c04f923ce 100644 GIT binary patch delta 993 zcmYLG=}r?-7(Fx4*)_2mXaN;00)l{msI(}eD60$L#v)p^77#181woK;K`OY@f4+g5 zm=KJDCO!bK;3N15Cg{0StjWyxefNCZx#xb!`I%#{t$+IgpazQu^3bQD-^67MXt<){ zs(~P`33J_m3paG+B4pww!UhI0B(Py|yd|O$5#81hF>wc@2JRxNp;<$VhE@&j8ah9@hl(c_N-(S9sYuU>Ov1u5%!+8D8gya zExf=>6%(TPRnk@pwF11h@CI*}KPoeFc3DYV$8c~wSUD1mge$w_(V<8<(AJb}&|8Xg zDHk9?7K`b3@}$t`(`V3=H?1%ENzW=S+{gi5>}G5+18P=;VtR>`_pry8{H4E>3X^k2 zz!p`bFj2wUQj~GBpA~yiPTQ5n2GZD68UyAx=8C8SmCmkt>_Zi~CithO7_d=IEEC%> z#`muxpZ(mL&zXMP8C*-7S|OrTtB4M;tOyzFI1CjB`T73vT8fH8D(W1>pTb!uWN~w8 zfHdm+AjQ~pgjfUr%`%OIqaqa}K?#jGMnXPbT&m%XHZh+_u9=5Qa@f8N~&0Pv*@( zVB#CWgs6$}*+1Zef5a#BR1X=G?t5>YI(3&*^}FCxLF(uH*YCh~-n*>gY>0Ca&T}Ee zMTbi+m$_n0!X?1fFa=zT&_%b)b$SeT!z^!_=$46Yhv<#aN59J*20}E1XbjO5qS;~4 zWhF_&8gdwR7_nH?H#3>E-BEu%=5Tj*-fppG+jBo!%ZgcR5f~ayB*h)`xX1mp7u?)A z?(u+!9uuTIih1Nw$ZChj9vhf+cw)Annw@7J&zUsQl*bDuErJ7yWOu*PO?$lLmBXkZ zzqTk!|FDZ(Lw)1%mUpvr!3ldsd0BJot;A@evNzG+Q`s?`yxHGV)0}P%H+2$Y)q?4c}qS}K8H1r`A#%E zM}FKb|4caQej#dOWX|zrjuBE^t(tM&O^pVtr9l-tRIyv72B`P1pxx&UW~CbB00-4b zp5Fc;4y)rL3EkieR7I+eMu7nV6*O@~b9ZR8W^IR+)}w`1^=tIY+^tD>ROyZhu{rL` oQ0U8GFUW9$Hp$VgA{|*l9P@Hc`bRo_dul + @@ -24,7 +25,7 @@ select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate} - insert into motion(pid, date, count, distance, time) - values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionTime}) + insert into motion(pid, date, count, distance, energy, time) + values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime}) \ No newline at end of file diff --git a/server/OldPeopleHome/target/test-classes/META-INF/OldPeopleHome.kotlin_module b/server/OldPeopleHome/target/test-classes/META-INF/OldPeopleHome.kotlin_module deleted file mode 100644 index 8fb60192d378759239a3ecbf60eac8c8de446e9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class index 5b2b4a42c94d41f84709c3d4c5504ddd98189f5c..27fe6cc38d6a492691ef8db67c076c11cc6eed2b 100644 GIT binary patch delta 593 zcmZ9IOHWf#6otQYXnP+$2&p#(#YbBdwY5T9rL?|Uo+79qFFPaw69#TkM#DAIQ;qM;@K#7LW03!|sA5GDvxJWh5eIEEc)j`S6qKnK7i8QFz6XLM1a1i*a}M){XFNAt;~Qt*mQF~O^XU4oKTYDT7EK_wW?wotp$Xa=QPGW2pys%aCrj{PHw8zR=n z;^HpJ9{rjxxOUh_H~bb|dtA_bCw>xongkKCO4BdtGO|ZSp8p@J+6iTEZ%f3p Kq3(!QGyE5RghBKG delta 592 zcmZXROHUJV6vcn@Z_7M7C}}zsl}hWQV4;?_K0s88QXh4E;)cXcR|Fz$Vu;%&?p>Jq z0Dc71XwoQ&3zzO(`EArQP{qWV#P zYSbMXaedL{5|>?$aV5{bRBMZ_^iZ~rp>C&O$&FY zx4YHru624A#c=TEt(C}gDk_?pR-Rk>USFs!RTeAtn$4O|i`)P78a{dM*xdEGN89H( zCv5Kfggmf$=<|rj(I62-?~>!udlNW$p7=av{ljm~cv%5Nb=sX;oFBB}|ovSOX=7f?_-j6Ouw#?+|dAX#J>#+d-xk!#xqB=Ok~MqvO|Kf{1JEV6FI}-_D7n!5}5@unbz8ewuO;x PK$`QE|FfMF&oKWRvIasZ