From 73d3c2d09114493a54c685cbb9a56034d0c3904f Mon Sep 17 00:00:00 2001 From: jiangyuwei666 <739843128@qq.com> Date: Wed, 4 Sep 2019 21:36:58 +0800 Subject: [PATCH 1/4] change table --- server/OldPeopleHome/.idea/workspace.xml | 482 +++++++++--------- .../web/ChildParentController.java | 3 +- .../src/main/resources/jdbc.properties | 2 +- .../main/resources/mapper/HeartRateDao.xml | 2 +- .../service/ChildParentServiceTest.java | 23 + .../service/HeartRateServiceTest.java | 8 +- server/OldPeopleHome/target/OldPeopleHome.war | Bin 13721425 -> 13721427 bytes .../WEB-INF/classes/jdbc.properties | 2 +- .../WEB-INF/classes/mapper/HeartRateDao.xml | 2 +- .../target/classes/mapper/HeartRateDao.xml | 2 +- .../service/ChildParentServiceTest.class | Bin 0 -> 934 bytes .../service/HeartRateServiceTest.class | Bin 1052 -> 953 bytes server/README.md | 4 +- 13 files changed, 279 insertions(+), 251 deletions(-) create mode 100644 server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java create mode 100644 server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml index 77e0da2..38548b6 100644 --- a/server/OldPeopleHome/.idea/workspace.xml +++ b/server/OldPeopleHome/.idea/workspace.xml @@ -8,15 +8,17 @@ - - + + - + - - + + + + - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -136,10 +60,19 @@ - + - - + + + + + + + + + + + @@ -147,6 +80,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -166,6 +144,7 @@ utf8mb4_0900_ai_ci utf8mb4 energy + rat2e utf8_general_ci @@ -182,8 +161,6 @@ @@ -262,8 +241,6 @@ - - @@ -297,6 +274,24 @@ + + + + + + + + + + + + + + + + + + @@ -313,6 +308,20 @@ + + + + + + + + + + + + + + @@ -352,17 +361,19 @@ insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) + values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy}) \ No newline at end of file diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java new file mode 100644 index 0000000..43c8add --- /dev/null +++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java @@ -0,0 +1,23 @@ +package com.oldpeoplehome.service; + +import com.oldpeoplehome.BaseTest; +import com.oldpeoplehome.entity.ChildParent; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * Created By Jiangyuwei on 2019/9/4 21:27 + * Description: + */ +public class ChildParentServiceTest extends BaseTest { + + @Autowired + private ChildParentService childParentService; + + @Test + public void test(){ + ChildParent childParent = new ChildParent(1,1,"父子"); + childParentService.combine(childParent); + } + +} diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java index a77f91c..5eeb90d 100644 --- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java +++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java @@ -17,10 +17,10 @@ public class HeartRateServiceTest extends BaseTest { @Test public void test(){ -// HeartRate heartRate = new HeartRate(1, "2019-8-22 10:00:00", 20.3); -// heartRateService.insert(heartRate); - HeartRateFilter heartRateFilter = new HeartRateFilter(1); - System.out.println(heartRateService.findByParent(heartRateFilter)); + HeartRate heartRate = new HeartRate(1, "2019-8-22 10:00:00", 20.3, 21,21); + heartRateService.insert(heartRate); +// HeartRateFilter heartRateFilter = new HeartRateFilter(1); +// System.out.println(heartRateService.findByParent(heartRateFilter)); } } diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war index 54a1a6846ac9820bd06b938846de0eca8fbe224c..47385d0336fa745d0a0a0884ad6c0748d3e8b8ac 100644 GIT binary patch delta 4806 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 IAO^Gl16vg10{{R3 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/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml index d667f5c..d8159f9 100644 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml +++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml @@ -25,6 +25,6 @@ insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) + values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy}) \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml index d667f5c..d8159f9 100644 --- a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml +++ b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml @@ -25,6 +25,6 @@ insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) + values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy}) \ No newline at end of file diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class new file mode 100644 index 0000000000000000000000000000000000000000..9c0e4fb842c01d4d2eab5db656e93b02fcedde51 GIT binary patch literal 934 zcmb7C-D(p-6#izDX4B2u*7PT~^{-lMQl%q$BUFT1@S-dtrUbm4Y^KT7%}$t|ZRs0$ z>5F(Fh(!e-!1oZ}LOi<(wy+lT<{ZwP^L^j>neV^8d;{ih3`Fk+E${bEHDauoZ-Q$aT~kNj-|>Ko2EP#!0?gsNZH-ewD^n z4P{3qsvF6jIM!BJrQ?L*aiC3~CnKZc{(%ugd92MF-jyOw_<;zmHYZ&C0q~vF>SJYO zk7z4TRIKb%hElWDVJPqF9(6Yxs93&8hh1s*1*y>xfeuB~5k_V4u*DU)o zu_Ro!eWSSdoDiA0W*jpp87kafr- z5%+o9X7}9A&T_v9yI6_ArSdLakfGK5w~e+sSfh_yr9aK+7t@&JYZO(;`{W(+v^KJ{ z6mjy5{M6Z=4m0!+nUVu90DPmY4u#woOq8w~~#MHgd ns5m&In?Z@n=813tOIXZlm&VWutxr8JQtqtRMlN=Rtb^s>%dhp` literal 0 HcmV?d00001 diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class index cced0c6c926bc07d7684bdbbcbc2fe3e9590d046..c92eff585cecb2f4eaad3366fe05b676d2fdef3c 100644 GIT binary patch delta 453 zcmZ8cT}uK{5Iy%=tM0DftEJ^8(E@ z1YtoxAnGqgvy?B+9p=oPIh>h!_RYN7=g->*fGt!-$jEq+^&uy;wmV;B-$HALnq(q4 z@_tAtNYmm53;6qnKC#bq+hEvqA}kg*OnYG8t4H&?^T-ZQB8V~+uB?%24X?+BH69v$ zYhb6B^hN@oDe@vB}>Ph8~sjKhq~EQ&+W;; z>^0l%cDd_3aa9rq=B+WY8Hy!$uY<)=&2krcIz*ZJ;meZ??Qt+g2PuXUHa&3P)6yK&H#=0K1d!-A(f!fy$qlKkvr-VPMWZ~n(k4rF9W zHg74C&iPp0DBnuMur`LPYxTuMG9Xcu(n}x4WS^h07MnUY9Z3*!T)sTS1k^Yb$HK)d z<``B-=RZa%0k1izx~QS>n=9%#6iOa$0kE#lZM_jI0c3M>?kF8(vybn(xuVZPOYl0vbqtl=LbW3~o<_-JRi{Fft_07uA29 zdo2@>t@632(p@f&vBTgb|3>SF!)C!((*i=2^a)lpwrC&Sj2V8NR^s%X>$vC`UO;eAornoiV5#C y^7Sv6T>plt9KOQ2V4TGSA(zP5GRjy Date: Thu, 5 Sep 2019 14:49:16 +0800 Subject: [PATCH 2/4] Update README.md --- server/OldPeopleHome/.idea/workspace.xml | 26 ++++++++---------------- server/README.md | 21 ++++++++++++++++++- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml index ee6ece1..2faa744 100644 --- a/server/OldPeopleHome/.idea/workspace.xml +++ b/server/OldPeopleHome/.idea/workspace.xml @@ -6,18 +6,7 @@ - - - - - - - - - - - - + @@ -603,7 +592,7 @@ - @@ -616,6 +605,7 @@ + @@ -1158,8 +1148,8 @@ - - + + diff --git a/server/README.md b/server/README.md index f611c67..4c4ee84 100644 --- a/server/README.md +++ b/server/README.md @@ -77,4 +77,23 @@ | Parent | /parent/add | POST | 添加老人 | parentSex：老人性别，parentPassword：老人密码，parentAccount：账号，parentName：姓名，parentBirth：生日，parentLongId：身份证 | | Parent | /parent/update/1 | POST | 更新id=1的老人信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName | | Parent | /parent/delete/1 | DELETE | 删除id=1的老人 | | - +| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回） account:bao,password:123 | +| Child | /child/get/1 | GET | 查询id=1的子女 | | +| Child | /child/get_longid/111 | GET | 查询身份证=111的child的详细信息 | | +| Child | /child/get_name/小蒋 | GET | 查询姓名=小蒋的child的详细信息 | | +| Child | /child/list | GET | 查询所有子女 | | +| Child | /child/add | POST | | childSex，childPassword，childAccount，childName，childLongId，childPhone | +| Child | /child/update/1 | POST | 更新id=1的子女信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName | +| Child | /child/delete/1 | DELETE | 删除id=1的子女信息 | | +| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) account:bao,password:123 | +| ChildAndParent | /child_parent/child/1 | GET | 查看子女id=1对应的老人 | | +| ChildAndParent | /child_parent/parent/1 | GET | 查看老人id=1对应的子女 | | +| ChildAndParent | /child_parent/add | POST | 添加老人子女对应关系 | 子女id：child，老人id：parent，关系：relation | +| Motion | /motion/get/1 | GET | 查找id=1的老人运动情况 | 参数格式：yyyy-mm-dd 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 | +| Motion | /motion/add | POST | 添加老人运动情况数据 | parent，date，count，distance，time | +| RoomState | /rstate/get/1 | GET | 查找id=1的房间状态 | 参数格式：yyyy-mm-dd hh-mm-ss 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 | +| RoomState | /rstate/add | POST | 添加房间状态 | roomId，time，temperature，humidity，isin(是否在房间内) | +| 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，rate1(收缩压)，rate2(舒张压)，oxy(血氧) | From 44542290722403c947862b596e13105b773de896 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Fri, 6 Sep 2019 08:29:10 +0800 Subject: [PATCH 3/4] zigbee --- .../ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zigbee/ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c b/zigbee/ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c index 7d22340..852b207 100644 --- a/zigbee/ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c +++ b/zigbee/ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c @@ -88,6 +88,10 @@ int main(void) zmain_vdd_check(); // Initialize board I/O + + + + A InitBoard( OB_COLD ); // Initialze HAL drivers From 5537292f0d107af8c72e288f42b62617880f21d4 Mon Sep 17 00:00:00 2001 From: LitterDryFish <45481685+LitterDryFish@users.noreply.github.com> Date: Fri, 6 Sep 2019 08:29:58 +0800 Subject: [PATCH 4/4] zigbee --- zigbee/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zigbee/README.md b/zigbee/README.md index 3a34225..8767183 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -40,7 +40,7 @@ * 传感器：温、湿度传感器两个，人体红外传感器两个，运动手环两个，执行器三个 * 角色：终端，协调器，网关，后台主机 * 协议：zigbee，TCP/IP，BLE 4.0 -* +* wifitricker连通内外网 #### 手环功能 * 步数