From 9b1d20ca282f9fd3d75965cc8ba009f7296ee41a Mon Sep 17 00:00:00 2001
From: jiangyuwei666 <739843128@qq.com>
Date: Fri, 6 Sep 2019 14:07:56 +0800
Subject: [PATCH 1/2] add location
---
server/OldPeopleHome/.idea/workspace.xml | 779 +++++++++---------
.../com/oldpeoplehome/dao/LocationDao.java | 20 +
.../com/oldpeoplehome/dto/LocationFilter.java | 64 ++
.../com/oldpeoplehome/entity/Location.java | 80 ++
.../service/LocationService.java | 20 +
.../service/impl/LocationServiceImpl.java | 41 +
.../oldpeoplehome/web/LocationController.java | 61 ++
.../src/main/resources/jdbc.properties | 2 +-
.../src/main/resources/mapper/LocationDao.xml | 29 +
.../OldPeopleHome/src/main/sql/add_table.sql | 8 +
.../service/HeartRateServiceTest.java | 2 +-
.../service/LocationServiceTest.java | 26 +
12 files changed, 744 insertions(+), 388 deletions(-)
create mode 100644 server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/LocationDao.java
create mode 100644 server/OldPeopleHome/src/main/java/com/oldpeoplehome/dto/LocationFilter.java
create mode 100644 server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Location.java
create mode 100644 server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/LocationService.java
create mode 100644 server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/LocationServiceImpl.java
create mode 100644 server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/LocationController.java
create mode 100644 server/OldPeopleHome/src/main/resources/mapper/LocationDao.xml
create mode 100644 server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java
diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index 2faa744..a5f8a68 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -6,7 +6,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -16,20 +29,59 @@
-
-
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -38,47 +90,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -86,47 +101,50 @@
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -151,11 +169,13 @@
utf8mb4
energy
rat2e
+ longtitude
utf8_general_ci
utf8
motionEnergy
+ longitude
E:\课设\OldPeopleHome\server\OldPeopleHome\src\main\java\com\oldpeoplehome\service\impl
@@ -167,14 +187,6 @@
@@ -236,10 +256,10 @@
-
-
-
-
+
+
+
+
@@ -247,6 +267,8 @@
+
+
@@ -287,7 +309,16 @@
+
@@ -555,44 +597,45 @@
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -605,9 +648,8 @@
-
-
+
@@ -681,175 +723,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -865,13 +738,6 @@
-
-
-
-
-
-
-
@@ -889,16 +755,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -952,16 +808,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -990,13 +836,6 @@
-
-
-
-
-
-
-
@@ -1014,26 +853,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1075,12 +894,8 @@
-
-
-
-
-
-
+
+
@@ -1096,43 +911,82 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1141,15 +995,168 @@
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/LocationDao.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/LocationDao.java
new file mode 100644
index 0000000..d3e76aa
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/LocationDao.java
@@ -0,0 +1,20 @@
+package com.oldpeoplehome.dao;
+
+import com.oldpeoplehome.dto.LocationFilter;
+import com.oldpeoplehome.entity.Location;
+
+import java.util.List;
+
+/**
+ * Created By Jiangyuwei on 2019/9/6 11:30
+ * Description:
+ */
+public interface LocationDao {
+
+ List findByParent(LocationFilter locationFilter);
+ List findByTime(LocationFilter locationFilter);
+ List findByParentAndTime(LocationFilter locationFilter);
+
+ void insert(Location location);
+
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dto/LocationFilter.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dto/LocationFilter.java
new file mode 100644
index 0000000..2cc52d0
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dto/LocationFilter.java
@@ -0,0 +1,64 @@
+package com.oldpeoplehome.dto;
+
+import java.sql.Date;
+import java.sql.Timestamp;
+
+/**
+ * Created By Jiangyuwei on 2019/9/6 11:27
+ * Description:
+ */
+public class LocationFilter {
+
+ private Timestamp startTime;
+ private Timestamp endTime;
+ private long parentId;
+
+ public LocationFilter() {
+ }
+
+ public LocationFilter(long parentId) {
+ this.parentId = parentId;
+ }
+
+ public LocationFilter(String startTime, long parentId) {
+ this.startTime = Timestamp.valueOf(startTime);
+ this.parentId = parentId;
+ }
+
+ public LocationFilter(String startTime, String endTime, long parentId) {
+ this.startTime = Timestamp.valueOf(startTime);
+ this.endTime = Timestamp.valueOf(endTime);
+ this.parentId = parentId;
+ }
+
+ public Timestamp getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = Timestamp.valueOf(startTime);
+ }
+ public void setStartTime(Timestamp startTime) {
+ this.startTime = startTime;
+ }
+
+ public Timestamp getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Timestamp endTime) {
+ this.endTime = endTime;
+ }
+ public void setEndTime(String endTime) {
+ this.endTime = Timestamp.valueOf(endTime);
+ }
+
+ public long getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(long parentId) {
+ this.parentId = parentId;
+ }
+
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Location.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Location.java
new file mode 100644
index 0000000..542686c
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Location.java
@@ -0,0 +1,80 @@
+package com.oldpeoplehome.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.sql.Timestamp;
+
+/**
+ * Created By Jiangyuwei on 2019/9/6 11:15
+ * Description:
+ */
+public class Location {
+
+ private Long parentId;
+ private Float longitude;
+ private Float latitude;
+ private Timestamp time;
+
+ public Location() {
+ }
+
+ public Location(Long parentId, Float longitude, Float latitude, Timestamp time) {
+ this.parentId = parentId;
+ this.longitude = longitude;
+ this.latitude = latitude;
+ this.time = time;
+ }
+ public Location(Long parentId, Float longitude, Float latitude, String time) {
+ this.parentId = parentId;
+ this.longitude = longitude;
+ this.latitude = latitude;
+ this.time = Timestamp.valueOf(time);
+ }
+
+ public Long getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId) {
+ this.parentId = parentId;
+ }
+
+ public Float getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(Float longitude) {
+ this.longitude = longitude;
+ }
+
+ public Float getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(Float latitude) {
+ this.latitude = latitude;
+ }
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ public Timestamp getTime() {
+ return time;
+ }
+
+ public void setTime(Timestamp time) {
+ this.time = time;
+ }
+
+ public void setTime(String time) {
+ this.time = Timestamp.valueOf(time);
+ }
+
+ @Override
+ public String toString() {
+ return "Location{" +
+ "parentId=" + parentId +
+ ", longitude=" + longitude +
+ ", latitude=" + latitude +
+ ", time=" + time +
+ '}';
+ }
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/LocationService.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/LocationService.java
new file mode 100644
index 0000000..56baace
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/LocationService.java
@@ -0,0 +1,20 @@
+package com.oldpeoplehome.service;
+
+import com.oldpeoplehome.dto.LocationFilter;
+import com.oldpeoplehome.entity.Location;
+
+import java.util.List;
+
+/**
+ * Created By Jiangyuwei on 2019/9/6 11:35
+ * Description:
+ */
+public interface LocationService {
+
+
+ List findByParent(LocationFilter locationFilter);
+ List findByTime(LocationFilter locationFilter);
+ List findByParentAndTime(LocationFilter locationFilter);
+
+ void insert(Location location);
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/LocationServiceImpl.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/LocationServiceImpl.java
new file mode 100644
index 0000000..1b0fef6
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/LocationServiceImpl.java
@@ -0,0 +1,41 @@
+package com.oldpeoplehome.service.impl;
+
+import com.oldpeoplehome.dao.LocationDao;
+import com.oldpeoplehome.dto.LocationFilter;
+import com.oldpeoplehome.entity.Location;
+import com.oldpeoplehome.service.LocationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created By Jiangyuwei on 2019/9/6 11:36
+ * Description:
+ */
+@Service
+public class LocationServiceImpl implements LocationService {
+
+ @Autowired
+ private LocationDao locationDao;
+
+ @Override
+ public List findByParent(LocationFilter locationFilter) {
+ return locationDao.findByParent(locationFilter);
+ }
+
+ @Override
+ public List findByTime(LocationFilter locationFilter) {
+ return locationDao.findByTime(locationFilter);
+ }
+
+ @Override
+ public List findByParentAndTime(LocationFilter locationFilter) {
+ return locationDao.findByParentAndTime(locationFilter);
+ }
+
+ @Override
+ public void insert(Location location) {
+ locationDao.insert(location);
+ }
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/LocationController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/LocationController.java
new file mode 100644
index 0000000..c948b00
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/LocationController.java
@@ -0,0 +1,61 @@
+package com.oldpeoplehome.web;
+
+import com.oldpeoplehome.dto.LocationFilter;
+import com.oldpeoplehome.entity.Location;
+import com.oldpeoplehome.service.LocationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created By Jiangyuwei on 2019/9/6 13:51
+ * Description:
+ */
+@RestController
+@RequestMapping("/location")
+public class LocationController {
+
+ @Autowired
+ private LocationService locationService;
+
+ @RequestMapping("/get/{id}")
+ @ResponseBody
+ public List findByParentId(HttpServletRequest request, @PathVariable("id") String id) {
+ List list;
+ String startDate = request.getParameter("start");
+ String endDate = request.getParameter("end");
+ if (endDate == null){
+ if (startDate == null) {
+ LocationFilter locationFilter = new LocationFilter(Long.valueOf(id));
+ list = locationService.findByParent(locationFilter);
+ }
+ else {
+ LocationFilter locationFilter = new LocationFilter(startDate, Long.valueOf(id));
+ list = locationService.findByParentAndTime(locationFilter);
+ }
+ }
+ else{
+ LocationFilter locationFilter = new LocationFilter(startDate, endDate, Long.valueOf(id));
+ list = locationService.findByTime(locationFilter);
+ }
+ return list;
+ }
+
+ @RequestMapping(value = "/add", method = RequestMethod.POST)
+ @ResponseBody
+ public Location add(@RequestParam Map params){
+ long parentId = Long.valueOf(String.valueOf(params.get("parent")));
+ float longitude = Float.valueOf(String.valueOf(params.get("longitude")));
+ float latitude = Float.valueOf(String.valueOf(params.get("latitude")));
+ String time = String.valueOf(params.get("time"));
+ Location location = new Location(parentId,longitude,latitude,time);
+ locationService.insert(location);
+ return location;
+ }
+
+}
diff --git a/server/OldPeopleHome/src/main/resources/jdbc.properties b/server/OldPeopleHome/src/main/resources/jdbc.properties
index 1ca04db..e9eb37f 100644
--- a/server/OldPeopleHome/src/main/resources/jdbc.properties
+++ b/server/OldPeopleHome/src/main/resources/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.username=root
-jdbc.password=
+jdbc.password=root
diff --git a/server/OldPeopleHome/src/main/resources/mapper/LocationDao.xml b/server/OldPeopleHome/src/main/resources/mapper/LocationDao.xml
new file mode 100644
index 0000000..2b0282a
--- /dev/null
+++ b/server/OldPeopleHome/src/main/resources/mapper/LocationDao.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into location(pid, longitude,latitude, time)
+ values (#{parentId}, #{longitude},#{latitude}, #{time})
+
+
\ 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 3f81b62..d4681e0 100644
--- a/server/OldPeopleHome/src/main/sql/add_table.sql
+++ b/server/OldPeopleHome/src/main/sql/add_table.sql
@@ -106,4 +106,12 @@ CREATE TABLE `admin` (
PRIMARY KEY (`account`),
UNIQUE INDEX `index_acc`(`account`) USING BTREE
);
+CREATE TABLE `location` (
+ `pid` bigint(0) NOT NULL,
+ `longitude` float NULL COMMENT '经度',
+ `latitude` float NULL COMMENT '纬度',
+ `time` datetime(0) NULL,
+ INDEX `date`(`time`) USING BTREE,
+ CONSTRAINT `pid_2` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+);
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 5eeb90d..799f0e5 100644
--- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java
@@ -17,7 +17,7 @@ public class HeartRateServiceTest extends BaseTest {
@Test
public void test(){
- HeartRate heartRate = new HeartRate(1, "2019-8-22 10:00:00", 20.3, 21,21);
+ HeartRate heartRate = new HeartRate(1, "2019-8-22 10:00:00", 1,20.3, 21,21);
heartRateService.insert(heartRate);
// HeartRateFilter heartRateFilter = new HeartRateFilter(1);
// System.out.println(heartRateService.findByParent(heartRateFilter));
diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java
new file mode 100644
index 0000000..b23aabe
--- /dev/null
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java
@@ -0,0 +1,26 @@
+package com.oldpeoplehome.service;
+
+import com.oldpeoplehome.BaseTest;
+import com.oldpeoplehome.dto.LocationFilter;
+import com.oldpeoplehome.entity.Location;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Created By Jiangyuwei on 2019/9/6 11:38
+ * Description:
+ */
+public class LocationServiceTest extends BaseTest {
+
+ @Autowired
+ private LocationService locationService;
+
+ @Test
+ public void test(){
+// Location location = new Location(new Long(1),13.2323f,123.45f,"2019-4-5 19:2:2");
+// locationService.insert(location);
+ LocationFilter locationFilter = new LocationFilter("2019-4-5 19:2:7","2019-4-6 19:2:2",1);
+ System.out.println(locationService.findByTime(locationFilter));
+ }
+
+}
From 4a431eb734f93930cea73cd3baa08c62aa7f279a Mon Sep 17 00:00:00 2001
From: jiangyuwei666 <739843128@qq.com>
Date: Fri, 6 Sep 2019 14:12:35 +0800
Subject: [PATCH 2/2] Update README.md
---
server/OldPeopleHome/.idea/workspace.xml | 199 ++++++++++++-----------
server/README.md | 6 +-
2 files changed, 104 insertions(+), 101 deletions(-)
diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index a5f8a68..b771d8e 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -6,20 +6,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -29,59 +16,20 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
@@ -131,17 +79,17 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -149,6 +97,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -325,7 +294,9 @@