diff --git a/android/OldPeopleHome/.idea/workspace.xml b/android/OldPeopleHome/.idea/workspace.xml
index eec02b5..3340892 100644
--- a/android/OldPeopleHome/.idea/workspace.xml
+++ b/android/OldPeopleHome/.idea/workspace.xml
@@ -64,50 +64,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -125,81 +81,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -208,40 +94,111 @@
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -257,18 +214,6 @@
- 断开
- 断开li
- 断开lian
- 断开lian'jie
- step
- send
- 4389
- 断开连接
- -4389
- gong'l
- gong'li
- g
公里
callRemoteDisconnect
disc
@@ -287,6 +232,18 @@
parent
"parent
latitu
+ d
+ dialog
+ vdialog
+ vodialog
+ voiddialog
+ void dialog
+ log
+ login
+ case 1
+ callRemoteConnect
+ Y-
+ 断开连接
@color/choosed
@@ -2095,15 +2052,11 @@
@@ -2171,6 +2128,8 @@
+
+
@@ -2225,28 +2184,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2272,6 +2209,10 @@
+
+
+
+
@@ -2324,6 +2265,10 @@
+
+
+
+
@@ -2381,31 +2326,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2474,7 +2396,6 @@
-
@@ -2599,7 +2520,7 @@
-
+
@@ -2646,7 +2567,7 @@
-
+
@@ -2828,7 +2749,7 @@
-
+
@@ -2885,32 +2806,33 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
+
-
-
-
@@ -2918,7 +2840,6 @@
-
@@ -2932,35 +2853,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2969,44 +2861,44 @@
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
@@ -3016,24 +2908,24 @@
+
+
+
+
+
-
-
-
-
-
@@ -3049,32 +2941,24 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3090,16 +2974,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -3114,50 +2988,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3184,13 +3033,6 @@
-
-
-
-
-
-
-
@@ -3205,13 +3047,6 @@
-
-
-
-
-
-
-
@@ -3230,26 +3065,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3269,32 +3084,73 @@
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3303,108 +3159,158 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java
index 0c0bab0..3d1bfc6 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java
@@ -1,12 +1,16 @@
package com.scorpiomiku.oldpeoplehome.modules.children.fragment;
import android.annotation.SuppressLint;
+import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
import android.widget.TextView;
import com.github.mikephil.charting.charts.LineChart;
@@ -25,6 +29,7 @@ import java.util.ArrayList;
import butterknife.BindView;
import butterknife.ButterKnife;
+import butterknife.OnClick;
import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Callback;
@@ -46,8 +51,11 @@ public class EnvironmentFragment extends BaseFragment {
Unbinder unbinder;
@BindView(R.id.now_time_text)
TextView nowTimeText;
+ @BindView(R.id.change_button)
+ Button changeButton;
private RoomState roomState;
+ private OldPeople oldPeople;
@SuppressLint("HandlerLeak")
@Override
@@ -126,7 +134,8 @@ public class EnvironmentFragment extends BaseFragment {
@Override
public void refreshUi(OldPeople oldPeople) {
super.refreshUi(oldPeople);
- getWebUtils().getRoomData(oldPeople.getParentId(), new Callback() {
+ this.oldPeople = oldPeople;
+ getWebUtils().getRoomData(oldPeople.getParentRoomId(), new Callback() {
@Override
public void onFailure(Call call, IOException e) {
LogUtils.loge(e.getMessage());
@@ -146,4 +155,46 @@ public class EnvironmentFragment extends BaseFragment {
}
});
}
+
+
+ /**
+ * 弹出dialog进行老人绑定
+ */
+ private void dialog() {
+ final EditText editText = new EditText(getContext());
+ AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ builder.setTitle("设置房间温度").setIcon(R.drawable.ic_bind).setView(editText)
+ .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ dialogInterface.dismiss();
+ }
+ });
+ builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ String temp = editText.getText().toString();
+ data.clear();
+ data.put("temp", temp);
+
+ getWebUtils().changeTem(oldPeople.getParentRoomId(), data, new Callback() {
+ @Override
+ public void onFailure(Call call, IOException e) {
+ LogUtils.loge(e.getMessage());
+ }
+
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ LogUtils.loge("temp");
+ }
+ });
+ }
+ });
+ builder.show();
+ }
+
+ @OnClick(R.id.change_button)
+ public void onViewClicked() {
+ dialog();
+ }
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java
index 6fe731c..07772cd 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java
@@ -23,6 +23,8 @@ import com.google.gson.JsonArray;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
import com.scorpiomiku.oldpeoplehome.bean.Location;
+import com.scorpiomiku.oldpeoplehome.bean.OldPeople;
+import com.scorpiomiku.oldpeoplehome.modules.children.activity.ChildMainActivity;
import com.scorpiomiku.oldpeoplehome.modules.oldpeople.activity.OldPeopleMainActivity;
import com.scorpiomiku.oldpeoplehome.utils.LogUtils;
@@ -48,6 +50,7 @@ public class MapFragment extends BaseFragment {
MapView map;
Unbinder unbinder;
LatLng GEO_ZHONGBEI = new LatLng(38.019467, 112.455778);
+ private OldPeople oldPeople;
private ArrayList locations = new ArrayList<>();
@@ -61,6 +64,7 @@ public class MapFragment extends BaseFragment {
switch (msg.what) {
case 1:
drawLine();
+// refreshUi(oldPeople);
break;
}
}
@@ -74,26 +78,7 @@ public class MapFragment extends BaseFragment {
@Override
protected void refreshData() {
- getWebUtils().getLocation(((OldPeopleMainActivity) getActivity()).getOldPeopleUser().getParentId(), new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
- LogUtils.loge(e.getMessage());
- }
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- try {
- JsonArray jsonElements = getWebUtils().getJsonArray(response);
- Gson gson = new Gson();
- Location[] locas = gson.fromJson(jsonElements, Location[].class);
- locations.clear();
- locations.addAll(Arrays.asList(locas));
- handler.sendEmptyMessage(1);
- } catch (Exception e) {
- LogUtils.loge(e.getMessage());
- }
- }
- });
}
@Override
@@ -105,6 +90,7 @@ public class MapFragment extends BaseFragment {
MapStatus.Builder builder = new MapStatus.Builder();
builder.zoom(16.5f);
map.getMap().setMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+ refreshData();
}
@Override
@@ -149,7 +135,7 @@ public class MapFragment extends BaseFragment {
*/
private void drawLine() {
List points = new ArrayList();
- for (int i = 0; i < locations.size(); i++) {
+ for (int i = 0; i < locations.size() / 2; i++) {
points.add(new LatLng(
Double.valueOf(locations.get(i).getLatitude()),
Double.valueOf(locations.get(i).getLongitude())
@@ -164,4 +150,38 @@ public class MapFragment extends BaseFragment {
//mPloyline 折线对象
Overlay mPolyline = map.getMap().addOverlay(mOverlayOptions);
}
+
+ @Override
+ public void refreshUi(OldPeople oldPeople) {
+ super.refreshUi(oldPeople);
+ this.oldPeople = oldPeople;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ getWebUtils().getLocation(oldPeople.getParentId(), new Callback() {
+ @Override
+ public void onFailure(Call call, IOException e) {
+ LogUtils.loge(e.getMessage());
+ }
+
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ try {
+ JsonArray jsonElements = getWebUtils().getJsonArray(response);
+ Gson gson = new Gson();
+ Location[] locas = gson.fromJson(jsonElements, Location[].class);
+ for (int i = 0; i < locas.length; i++) {
+ LogUtils.loge(locas[i].toString());
+ }
+ locations.clear();
+ locations.addAll(Arrays.asList(locas));
+ handler.sendEmptyMessage(1);
+ } catch (Exception e) {
+ LogUtils.loge(e.getMessage());
+ }
+ }
+ });
+ }
+ }).start();
+ }
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java
index cb02a1b..10e422e 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java
@@ -139,9 +139,6 @@ public class SleepFragment extends BaseFragment {
Gson gson = new Gson();
SleepData[] sleeps = gson.fromJson(jsonElements, SleepData[].class);
Arrays.sort(sleeps);
- for (int i = 0; i < sleeps.length; i++) {
- LogUtils.loge(sleeps[i].toString());
- }
yesterday = sleeps[sleeps.length - 1];
sleepDatas.clear();
sleepDatas.addAll(Arrays.asList(sleeps));
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java
index 5d263be..28c8fd5 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java
@@ -1,13 +1,16 @@
package com.scorpiomiku.oldpeoplehome.modules.loginregister;
import android.annotation.SuppressLint;
+import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.support.v7.app.AlertDialog;
import android.widget.Button;
import android.widget.EditText;
import android.widget.RadioButton;
import android.widget.RadioGroup;
+import android.widget.Toast;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseActivity;
@@ -107,6 +110,7 @@ public class RegisterActivity extends BaseActivity {
@OnClick(R.id.register_button)
public void onViewClicked() {
+ dialog();
getText();
data.clear();
data.put("childSex", sexText);
@@ -115,17 +119,18 @@ public class RegisterActivity extends BaseActivity {
data.put("childName", nameText);
data.put("childLongId", idCardText);
data.put("childPhone", phoneText);
- getWebUtils().registerChild(data, new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
- LogUtils.loge(e.getMessage());
- }
-
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- handler.sendEmptyMessage(1);
- }
- });
+// getWebUtils().registerChild(data, new Callback() {
+// @Override
+// public void onFailure(Call call, IOException e) {
+// LogUtils.loge(e.getMessage());
+// }
+//
+// @Override
+// public void onResponse(Call call, Response response) throws IOException {
+// handler.sendEmptyMessage(1);
+//
+// }
+// });
}
/**
@@ -139,4 +144,21 @@ public class RegisterActivity extends BaseActivity {
passwordText = password.getText().toString();
}
+ private void dialog() {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this).setIcon(R.mipmap.ic_launcher).setTitle("错误提醒")
+ .setMessage("注册失败，该账户已存在").setPositiveButton("确定", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ //ToDo: 你想做的事情
+ }
+ }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ //ToDo: 你想做的事情
+ dialogInterface.dismiss();
+ }
+ });
+ builder.create().show();
+ }
+
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java
index e5b7673..bd80579 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java
@@ -89,6 +89,7 @@ public class OldPeopleMainActivity extends BaseActivity {
private Location location;
private Boolean mIsBound = false;
+ private BleDeviceItem targetItem;
private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener;
private FragmentManager fragmentManager;
@@ -138,6 +139,7 @@ public class OldPeopleMainActivity extends BaseActivity {
@Override
public void onResponse(Call call, Response response) throws IOException {
LogUtils.logd("上传位置成功");
+ changeLoc();
}
});
break;
@@ -177,7 +179,7 @@ public class OldPeopleMainActivity extends BaseActivity {
};
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
initFragmentManager();
- initBlueSDK();
+// initBlueSDK();
setUser((OldPeople) getIntent().getSerializableExtra("user"));
for (int i = 0; i < fragments.length; i++) {
fragments[i].refreshUi((OldPeople) getIntent().getSerializableExtra("user"));
@@ -280,6 +282,7 @@ public class OldPeopleMainActivity extends BaseActivity {
LogUtils.logList(nearbyItemList);
if (item.getBleDeviceName().equals("Y1-4389")) {
callRemoteDisconnect();
+ targetItem = item;
mac = item.getBleDeviceAddress();
callRemoteConnect(item.getBleDeviceName(), item.getBleDeviceAddress());
}
@@ -664,7 +667,6 @@ public class OldPeopleMainActivity extends BaseActivity {
LogUtils.logd("callRemoteConnect: ble device mac address is not correctly!");
return;
}
-
if (mService != null) {
try {
mService.connectBt(name, mac);
@@ -724,7 +726,10 @@ public class OldPeopleMainActivity extends BaseActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.floating_button:
- getNewHandData();
+// LogUtils.loge(targetItem.toString());
+ initBlueSDK();
+
+// getNewHandData();
break;
case R.id.close_button:
callRemoteDisconnect();
@@ -741,6 +746,8 @@ public class OldPeopleMainActivity extends BaseActivity {
}
}
+ private boolean upLoc = true;
+
private void startLocation() {
mLocationClient = new LocationClient(getApplicationContext());
mLocationClient.registerLocationListener(new BDAbstractLocationListener() {
@@ -759,7 +766,10 @@ public class OldPeopleMainActivity extends BaseActivity {
location.setLongitude(longitude + "");
location.setParent(getOldPeopleUser().getParentId());
location.setTime(TimeUtils.getTime());
- handler.sendEmptyMessage(3);
+ if (upLoc) {
+ handler.sendEmptyMessage(3);
+ upLoc = false;
+ }
}
});
LocationClientOption option = new LocationClientOption();
@@ -775,5 +785,19 @@ public class OldPeopleMainActivity extends BaseActivity {
mLocationClient.start();
}
+ private void changeLoc() {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ upLoc = true;
+ }
+ }).start();
+ }
+
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java
index 33dfffa..99f860b 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java
@@ -1,12 +1,16 @@
package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt;
import android.annotation.SuppressLint;
+import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
import android.widget.TextView;
import com.github.mikephil.charting.charts.LineChart;
@@ -14,6 +18,7 @@ import com.github.mikephil.charting.data.Entry;
import com.google.gson.JsonObject;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
+import com.scorpiomiku.oldpeoplehome.bean.OldPeople;
import com.scorpiomiku.oldpeoplehome.utils.ChartUtils;
import com.scorpiomiku.oldpeoplehome.utils.LogUtils;
import com.scorpiomiku.oldpeoplehome.utils.TimeUtils;
@@ -23,6 +28,7 @@ import java.util.ArrayList;
import butterknife.BindView;
import butterknife.ButterKnife;
+import butterknife.OnClick;
import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Callback;
@@ -46,10 +52,13 @@ public class EnvironmentFragment extends BaseFragment {
TextView titleTimeText;
@BindView(R.id.get_data_time)
TextView getDataTime;
+ @BindView(R.id.change_button)
+ Button changeButton;
private String temperature;
private String humidity;
private Boolean first = true;
+ private OldPeople oldPeople;
@SuppressLint("HandlerLeak")
@Override
@@ -66,6 +75,8 @@ public class EnvironmentFragment extends BaseFragment {
upWeather();
initChart();
break;
+ case 2:
+ break;
}
}
};
@@ -83,7 +94,6 @@ public class EnvironmentFragment extends BaseFragment {
@Override
protected void initView() {
- getWeatherData();
titleTimeText.setText(TimeUtils.getUpDate());
}
@@ -101,6 +111,12 @@ public class EnvironmentFragment extends BaseFragment {
unbinder.unbind();
}
+ @Override
+ public void onResume() {
+ super.onResume();
+ getWeatherData();
+ }
+
/**
* 初始化Chart
*/
@@ -183,8 +199,54 @@ public class EnvironmentFragment extends BaseFragment {
@Override
public void onResponse(Call call, Response response) throws IOException {
LogUtils.logd("上传天气数据成功");
- getWeatherData();
}
});
}
+
+ @Override
+ public void refreshUi(OldPeople oldPeople) {
+ super.refreshUi(oldPeople);
+ this.oldPeople = oldPeople;
+ }
+
+ @OnClick(R.id.change_button)
+ public void onViewClicked() {
+ dialog();
+ }
+
+ /**
+ * 弹出dialog进行老人绑定
+ */
+ private void dialog() {
+ final EditText editText = new EditText(getContext());
+ AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ builder.setTitle("设置房间温度").setIcon(R.drawable.ic_bind).setView(editText)
+ .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ dialogInterface.dismiss();
+ }
+ });
+ builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ String temp = editText.getText().toString();
+ data.clear();
+ data.put("temp", temp);
+
+ getWebUtils().changeTem(oldPeople.getParentRoomId(), data, new Callback() {
+ @Override
+ public void onFailure(Call call, IOException e) {
+ LogUtils.loge(e.getMessage());
+ }
+
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ LogUtils.loge("temp");
+ }
+ });
+ }
+ });
+ builder.show();
+ }
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java
index 628f4e7..7e63233 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java
@@ -114,12 +114,16 @@ public class HeartRateFragment extends BaseFragment {
@Override
public void onResponse(Call call, Response response) throws IOException {
- JsonArray jsonElements = getWebUtils().getJsonArray(response);
- LogUtils.loge(jsonElements.toString());
- Gson gson = new Gson();
- HeartRate[] heartRates = gson.fromJson(jsonElements, HeartRate[].class);
- firstHeart = Float.valueOf(heartRates[heartRates.length - 1].getRate());
- handler.sendEmptyMessage(2);
+ try {
+ JsonArray jsonElements = getWebUtils().getJsonArray(response);
+ LogUtils.loge(jsonElements.toString());
+ Gson gson = new Gson();
+ HeartRate[] heartRates = gson.fromJson(jsonElements, HeartRate[].class);
+ firstHeart = Float.valueOf(heartRates[heartRates.length - 1].getRate());
+ handler.sendEmptyMessage(2);
+ }catch (Exception e){
+ LogUtils.loge(e.getMessage());
+ }
}
});
}
@@ -199,8 +203,8 @@ public class HeartRateFragment extends BaseFragment {
handler.sendEmptyMessage(1);
}
heartRateText.setText(heart);
- this.diastolic.setText(diastolic);
- this.systolic.setText(systolic);
+ this.diastolic.setText(systolic);
+ this.systolic.setText(diastolic);
this.oxy.setText(oxy);
}
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java
index 5e4e331..f55d399 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java
@@ -1,15 +1,31 @@
package com.scorpiomiku.oldpeoplehome.modules.oldpeople.fragmemt;
+import android.content.Intent;
+import android.os.Bundle;
import android.os.Handler;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
import com.scorpiomiku.oldpeoplehome.R;
import com.scorpiomiku.oldpeoplehome.base.BaseFragment;
+import com.scorpiomiku.oldpeoplehome.modules.loginregister.LoginActivity;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
/**
* Created by ScorpioMiku on 2019/8/18.
*/
public class MyInformationFragment extends BaseFragment {
+ @BindView(R.id.change)
+ RelativeLayout change;
+ Unbinder unbinder;
+
@Override
protected Handler initHandle() {
return null;
@@ -29,4 +45,25 @@ public class MyInformationFragment extends BaseFragment {
protected void initView() {
}
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ // TODO: inflate a fragment view
+ View rootView = super.onCreateView(inflater, container, savedInstanceState);
+ unbinder = ButterKnife.bind(this, rootView);
+ return rootView;
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ unbinder.unbind();
+ }
+
+ @OnClick(R.id.change)
+ public void onViewClicked() {
+ getActivity().finish();
+ Intent intent = new Intent(getContext(), LoginActivity.class);
+ startActivity(intent);
+ }
}
diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java
index 6278a02..d994b5f 100644
--- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java
+++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java
@@ -275,4 +275,19 @@ public class WebUtils {
Call call = mClient.newCall(request);
call.enqueue(callback);
}
+
+ /**
+ * 修改温度阈值
+ *
+ * @param roomId
+ * @param hashMap
+ * @param callback
+ */
+ public void changeTem(String roomId, HashMap hashMap, Callback callback) {
+ Request request = new Request.Builder().post(getRequestBody(hashMap))
+ .url(webHost + "/room/update/" + roomId).build();
+ LogUtils.loge(webHost + "/room/update/" + roomId);
+ Call call = mClient.newCall(request);
+ call.enqueue(callback);
+ }
}
diff --git a/android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml b/android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml
index 11756fc..8a68ef0 100644
--- a/android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml
+++ b/android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml
@@ -27,10 +27,10 @@
android:textSize="14sp" />
@@ -107,9 +107,21 @@
-
+
+
+
+
-
+
+
+
+
@@ -224,7 +225,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
- android:text="关联的亲人"
+ android:text="切换账号"
android:textSize="16sp" />
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -36,7 +53,11 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -54,7 +75,11 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -66,8 +91,13 @@
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -98,6 +128,7 @@
+
@@ -110,17 +141,28 @@
+<<<<<<< HEAD
+=======
+
+
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -138,8 +180,11 @@
+<<<<<<< HEAD
+=======
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -169,7 +214,7 @@
-
+
@@ -178,6 +223,11 @@
+
+
+
+
+
@@ -216,9 +266,14 @@
+
+
@@ -234,15 +289,22 @@
1567753931598
-
+
+
+
-
+
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -252,10 +314,20 @@
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -289,8 +361,125 @@
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -371,7 +560,11 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -408,6 +601,7 @@
+<<<<<<< HEAD
@@ -460,6 +654,9 @@
+=======
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -531,7 +728,11 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
@@ -539,8 +740,19 @@
+
+
+
+
+
+
+
+
+
+
+<<<<<<< HEAD
@@ -639,6 +851,10 @@
+=======
+
+
+>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
diff --git a/android/OldPeopleInterServer/src/Main.java b/android/OldPeopleInterServer/src/Main.java
index b2e9fde..fd0123c 100644
--- a/android/OldPeopleInterServer/src/Main.java
+++ b/android/OldPeopleInterServer/src/Main.java
@@ -96,4 +96,7 @@ public class Main {
return jsonObject;
}
+
+
+
}
diff --git a/android/OldPeopleInterServer/src/test.java b/android/OldPeopleInterServer/src/test.java
new file mode 100644
index 0000000..e9308a1
--- /dev/null
+++ b/android/OldPeopleInterServer/src/test.java
@@ -0,0 +1,23 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class test {
+ public static void main(String[] args) {
+ int size = 6;
+ int i = 0, step = 0;
+ List list = new ArrayList<>();
+ for (int j = 0; j < size; j++) {
+ list.add(j);
+ }
+ while (step < size / 2) {
+ System.out.println(list.get(i));
+ System.out.println(list.get(i + 1));
+ i += 2;
+ System.out.println("------------");
+ step += 1;
+ }
+ if (step * 2 < size) {
+ System.out.println(list.get(i));
+ }
+ }
+}
diff --git a/android/WIFITrick/.idea/workspace.xml b/android/WIFITrick/.idea/workspace.xml
index 1c373e6..91ed1d2 100644
--- a/android/WIFITrick/.idea/workspace.xml
+++ b/android/WIFITrick/.idea/workspace.xml
@@ -36,9 +36,15 @@
-
+
-
+
+
+
+
+
+
+
@@ -71,32 +77,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
@@ -107,8 +110,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -119,7 +132,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,8 +164,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -142,7 +188,9 @@
-
+
+
+
@@ -1922,10 +1970,9 @@
-
-
-
-
+
+
+
@@ -1943,6 +1990,9 @@
+
+
+
@@ -1955,85 +2005,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2124,7 +2097,7 @@
-
+
@@ -2171,7 +2144,7 @@
-
+
@@ -2331,9 +2304,7 @@
-
-
-
+
-
-
+
@@ -2388,12 +2358,12 @@
-
+
-
+
@@ -2423,7 +2393,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2432,8 +2423,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2442,7 +2445,9 @@
-
+
+
+
@@ -2458,7 +2463,13 @@
-
+
+
+
+
+
+
+
@@ -2471,21 +2482,22 @@
+
+
+
-
-
-
-
-
+
+
+
@@ -2493,10 +2505,7 @@
-
-
-
-
+
@@ -2512,9 +2521,7 @@
-
-
-
+
@@ -2522,7 +2529,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2531,8 +2559,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2541,7 +2581,9 @@
-
+
+
+
@@ -2549,7 +2591,13 @@
-
+
+
+
+
+
+
+
@@ -2562,21 +2610,22 @@
+
+
+
-
-
-
-
-
+
+
+
@@ -2584,10 +2633,7 @@
-
-
-
-
+
@@ -2595,9 +2641,7 @@
-
-
-
+
@@ -2605,7 +2649,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2614,8 +2679,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2631,7 +2708,9 @@
-
+
+
+
@@ -2639,7 +2718,13 @@
-
+
+
+
+
+
+
+
@@ -2652,21 +2737,22 @@
+
+
+
-
-
-
-
-
+
+
+
@@ -2674,10 +2760,7 @@
-
-
-
-
+
@@ -2685,9 +2768,7 @@
-
-
-
+
@@ -2695,7 +2776,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2704,8 +2806,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2721,7 +2835,9 @@
-
+
+
+
@@ -2750,15 +2866,14 @@
+
+
+
-
-
-
-
@@ -2792,8 +2907,20 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2802,7 +2929,9 @@
-
+
+
+
@@ -2810,7 +2939,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2819,17 +2969,33 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
@@ -2837,28 +3003,25 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index a3cd406..9a99521 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -8,25 +8,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -40,83 +25,35 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -124,68 +61,53 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -211,8 +133,8 @@
energy
rat2e
longtitude
- mySet
myset
+ mySet
utf8_general_ci
@@ -230,11 +152,6 @@
@@ -299,10 +221,10 @@
-
-
-
-
+
+
+
+
@@ -310,7 +232,6 @@
-
@@ -353,24 +274,6 @@
-
+
@@ -659,20 +595,15 @@
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
@@ -694,9 +625,18 @@
+
+
+
+
+
+
+
+
+
-
+
@@ -711,7 +651,7 @@
-
+
@@ -785,84 +725,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -982,13 +844,6 @@
-
-
-
-
-
-
-
@@ -1043,13 +898,6 @@
-
-
-
-
-
-
-
@@ -1081,13 +929,6 @@
-
-
-
-
-
-
-
@@ -1136,118 +977,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
@@ -1257,15 +1013,126 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
index 113a3d7..45ea7bd 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
@@ -20,7 +20,6 @@ public class Parent {
private String parentPhone;
private int parentRoomId;
private Room parentRoom;
- private Child child;
public Parent() {
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java
new file mode 100644
index 0000000..922d44e
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java
@@ -0,0 +1,40 @@
+package com.oldpeoplehome.utils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * Created By Jiangyuwei on 2019/9/9 16:27
+ * Description:
+ */
+public class SimpleCORSFilter implements Filter {
+
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException {
+ HttpServletResponse response = (HttpServletResponse) resp;
+ HttpServletRequest request=(HttpServletRequest)req;
+ // 处理简单请求
+ // 跨域请求默认不携带cookie,如果要携带cookie，需要设置下边2个响应头
+ response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));// 必选，所有有效的跨域响应都必须包含这个请求头, 没有的话会导致跨域请求失败
+ response.setHeader("Access-Control-Allow-Credentials", "true");//可选，此处设置为true,对应前端 xhr.withCredentials = true;
+ //处理非简单请求
+ // 非简单请求：浏览器会发送两个请求, 第一个请求(成为预检请求)会像服务器确定是否接受这个跨域请求, 第二个才是真正的发出请求. 浏览器自动的处理这两个请求, 同时预检请求也是可以被缓存的, 而不用每次请求都需要发送预检请求.
+ // 预检请求是在实际的请求发出前先向服务器确认是否能够处理这个请求. 服务器应该检查上边两个请求头的值, 来判断这个请求是否有效.
+ response.setHeader("Access-Control-Allow-Methods", "POST,GET,OPTIONS,DELETE");// 必选
+ response.setHeader("Access-Control-Allow-Headers",
+ "Origin,No-Cache,X-Requested-With,If-Modified-Since," +
+ "Pragma,Last-Modified,Cache-Control,Expires,Content-Type,X-E4M-With,userId,token");
+
+ response.setHeader("Access-Control-Max-Age", "0");// 可选,在每个请求前面都发送一个预检请求是很浪费资源的, 这个值允许你设置预检请求的缓存时间, 单位是秒.
+ response.setHeader("XDomainRequestAllowed","1");
+ chain.doFilter(req,resp);
+ }
+
+ public void init(FilterConfig filterConfig) {}
+
+ public void destroy() {}
+
+}
+
+
diff --git a/server/OldPeopleHome/src/main/resources/mapper/ChildParentDao.xml b/server/OldPeopleHome/src/main/resources/mapper/ChildParentDao.xml
index 4dafdab..a6a6eca 100644
--- a/server/OldPeopleHome/src/main/resources/mapper/ChildParentDao.xml
+++ b/server/OldPeopleHome/src/main/resources/mapper/ChildParentDao.xml
@@ -15,15 +15,6 @@
-
-
-
-
-
-
-
-
-
@@ -33,24 +24,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
insert into cp(pid, cid, relation)
diff --git a/server/OldPeopleHome/src/main/resources/spring/spring-web.xml b/server/OldPeopleHome/src/main/resources/spring/spring-web.xml
index f7feb12..87e4caa 100644
--- a/server/OldPeopleHome/src/main/resources/spring/spring-web.xml
+++ b/server/OldPeopleHome/src/main/resources/spring/spring-web.xml
@@ -22,6 +22,15 @@
-->
+
+
+
+
+
@@ -34,4 +43,6 @@
+
+
\ 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 b24dcfb..ec5caee 100644
--- a/server/OldPeopleHome/src/main/sql/add_table.sql
+++ b/server/OldPeopleHome/src/main/sql/add_table.sql
@@ -52,6 +52,10 @@ CREATE TABLE `cp` (
KEY `index_pid` (`pid`) USING BTREE,
KEY `index_cid` (`cid`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
+ALTER TABLE `cp`
+DROP PRIMARY KEY,
+ADD CONSTRAINT `1pid` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ADD CONSTRAINT `2cid` FOREIGN KEY (`cid`) REFERENCES `child` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
CREATE TABLE `heartrate` (
`pid` bigint(20) DEFAULT NULL,
`time` datetime DEFAULT NULL,
diff --git a/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml b/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
index 41174cb..8c6f3b0 100644
--- a/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
+++ b/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
@@ -34,8 +34,22 @@
true
+
+ SimpleCORSFilter
+ com.oldpeoplehome.utils.SimpleCORSFilter
+
+ IsCross
+ true
+
+
+
SpringEncodingFilter
/*
+
+ SimpleCORSFilter
+ /*
+
+
\ 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
index 43c8add..5fd34de 100644
--- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java
@@ -20,4 +20,9 @@ public class ChildParentServiceTest extends BaseTest {
childParentService.combine(childParent);
}
+ @Test
+ public void add(){
+ System.out.println(childParentService.findByParent(1));
+}
+
}
diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
index 07bb78f..80ccf3c 100644
--- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
@@ -32,4 +32,9 @@ public class ParentServiceTest extends BaseTest {
System.out.println(parentService.findByLongId("a"));
}
+ @Test
+ public void delete(){
+ parentService.delete(Long.valueOf(22));
+ System.out.println(parentService.findAll());
+ }
}
diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war
new file mode 100644
index 0000000..84273bc
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome.war differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF b/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6f7f877
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Built-By: Jiangyuwei
+Created-By: IntelliJ IDEA
+Build-Jdk: 1.8.0_161
+
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/AdminDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/AdminDao.class
new file mode 100644
index 0000000..87f12c5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/AdminDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class
new file mode 100644
index 0000000..40bd5a1
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildParentDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildParentDao.class
new file mode 100644
index 0000000..a47613a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildParentDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/HeartRateDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/HeartRateDao.class
new file mode 100644
index 0000000..230c7fb
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/HeartRateDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/LocationDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/LocationDao.class
new file mode 100644
index 0000000..82d8e4f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/LocationDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/MotionDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/MotionDao.class
new file mode 100644
index 0000000..12c0207
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/MotionDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class
new file mode 100644
index 0000000..e3a3326
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class
new file mode 100644
index 0000000..15ff3f0
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomStateDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomStateDao.class
new file mode 100644
index 0000000..1aa6c68
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomStateDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/SleepDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/SleepDao.class
new file mode 100644
index 0000000..27df01b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/SleepDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/ChangeRoom.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/ChangeRoom.class
new file mode 100644
index 0000000..434de64
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/ChangeRoom.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/HeartRateFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/HeartRateFilter.class
new file mode 100644
index 0000000..af3f4c3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/HeartRateFilter.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/LocationFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/LocationFilter.class
new file mode 100644
index 0000000..49328cb
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/LocationFilter.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/MotionFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/MotionFilter.class
new file mode 100644
index 0000000..ba07154
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/MotionFilter.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/RoomStateFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/RoomStateFilter.class
new file mode 100644
index 0000000..ad89e24
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/RoomStateFilter.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/SleepFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/SleepFilter.class
new file mode 100644
index 0000000..9993dc5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/SleepFilter.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Admin.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Admin.class
new file mode 100644
index 0000000..46ead89
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Admin.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Child.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Child.class
new file mode 100644
index 0000000..53b2b83
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Child.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/ChildParent.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/ChildParent.class
new file mode 100644
index 0000000..2b1a64b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/ChildParent.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class
new file mode 100644
index 0000000..ef5b169
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Location.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Location.class
new file mode 100644
index 0000000..8971e9a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Location.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class
new file mode 100644
index 0000000..ae920b8
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class
new file mode 100644
index 0000000..74024c6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class
new file mode 100644
index 0000000..93f08a5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/RoomState.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/RoomState.class
new file mode 100644
index 0000000..654840c
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/RoomState.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Sleep.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Sleep.class
new file mode 100644
index 0000000..897f11f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Sleep.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/AdminService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/AdminService.class
new file mode 100644
index 0000000..82931e6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/AdminService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildParentService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildParentService.class
new file mode 100644
index 0000000..912131d
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildParentService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class
new file mode 100644
index 0000000..a17490a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/HeartRateService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/HeartRateService.class
new file mode 100644
index 0000000..c8ddcee
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/HeartRateService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/LocationService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/LocationService.class
new file mode 100644
index 0000000..fd7f9dd
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/LocationService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/MotionService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/MotionService.class
new file mode 100644
index 0000000..42056c8
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/MotionService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class
new file mode 100644
index 0000000..421d057
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class
new file mode 100644
index 0000000..4cc356f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomStateService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomStateService.class
new file mode 100644
index 0000000..e7d116e
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomStateService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/SleepService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/SleepService.class
new file mode 100644
index 0000000..f2d6a25
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/SleepService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class
new file mode 100644
index 0000000..966b3a3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class
new file mode 100644
index 0000000..618038a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class
new file mode 100644
index 0000000..b3148e6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class
new file mode 100644
index 0000000..d9d5bd2
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class
new file mode 100644
index 0000000..5631356
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class
new file mode 100644
index 0000000..b9ae282
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class
new file mode 100644
index 0000000..284eda1
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class
new file mode 100644
index 0000000..3926325
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class
new file mode 100644
index 0000000..431b748
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class
new file mode 100644
index 0000000..57d5fbe
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class
new file mode 100644
index 0000000..248039f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class
new file mode 100644
index 0000000..e0e2a2b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class
new file mode 100644
index 0000000..f7d2687
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class
new file mode 100644
index 0000000..6b211bf
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/AdminController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/AdminController.class
new file mode 100644
index 0000000..4711e23
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/AdminController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class
new file mode 100644
index 0000000..1ab1d70
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class
new file mode 100644
index 0000000..19bf3dc
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class
new file mode 100644
index 0000000..7b4d633
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/LocationController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/LocationController.class
new file mode 100644
index 0000000..60088a4
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/LocationController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class
new file mode 100644
index 0000000..3ae8aba
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class
new file mode 100644
index 0000000..2cb4f65
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class
new file mode 100644
index 0000000..377e641
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomStateController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomStateController.class
new file mode 100644
index 0000000..5417eb5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomStateController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/SleepController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/SleepController.class
new file mode 100644
index 0000000..4415246
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/SleepController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
new file mode 100644
index 0000000..e9eb37f
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
@@ -0,0 +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=root
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml
new file mode 100644
index 0000000..4480ac6
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/AdminDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/AdminDao.xml
new file mode 100644
index 0000000..b85b118
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/AdminDao.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml
new file mode 100644
index 0000000..298dc84
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into child(longid,name,sex,account,password,phone)
+ values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone})
+
+
+
+ delete from child where id = #{childId}
+
+
+
+ update child
+ set longid = #{childLongId},
+ name = #{childName},
+ sex = #{childSex},
+ account = #{childAccount},
+ password = #{childPassword},
+ phone = #{childPhone}
+ where id =#{childId}
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildParentDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildParentDao.xml
new file mode 100644
index 0000000..a6a6eca
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildParentDao.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into cp(pid, cid, relation)
+ values (#{parentId}, #{childId}, #{relation})
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml
new file mode 100644
index 0000000..cc2a7e7
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into heartrate(pid, time,rate, rate1,rate2,oxy)
+ values (#{parentId}, #{time},#{rate}, #{rate1}, #{rate2}, #{oxy})
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/LocationDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/LocationDao.xml
new file mode 100644
index 0000000..2b0282a
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/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/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml
new file mode 100644
index 0000000..c735e83
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml
new file mode 100644
index 0000000..42a628b
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into parent(longid,name,sex,account,password,height,weight,birth,phone)
+ values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone})
+
+
+
+ update parent
+ set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}
+ where id=#{parentId}
+
+
+
+ delete from parent where id=#{parentId}
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml
new file mode 100644
index 0000000..bf4a273
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into room(location, name) values (#{roomLocation}, #{roomName})
+
+
+
+ delete from room where id = #{roomId}
+
+
+
+ update room
+ set location = #{roomLocation},
+ name = #{roomName},
+ pid = #{parentId},
+ temp = #{temp}
+ where id =#{roomId}
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomStateDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomStateDao.xml
new file mode 100644
index 0000000..06c2ac2
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomStateDao.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into rstate(rid, time, temperature, humidity, isin)
+ values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin})
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/SleepDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/SleepDao.xml
new file mode 100644
index 0000000..5d34f26
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/SleepDao.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into sleep(pid, date, deep, light, awake)
+ values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime})
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml
new file mode 100644
index 0000000..4b92325
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml
new file mode 100644
index 0000000..96c91b2
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml
new file mode 100644
index 0000000..10d4e5f
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml
new file mode 100644
index 0000000..87e4caa
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar
new file mode 100644
index 0000000..0f42d60
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar
new file mode 100644
index 0000000..75580be
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar
new file mode 100644
index 0000000..93a3b9f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar
new file mode 100644
index 0000000..fdf8b6f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar
new file mode 100644
index 0000000..0a18c34
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar
new file mode 100644
index 0000000..5ee8d20
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar
new file mode 100644
index 0000000..feb8bba
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar
new file mode 100644
index 0000000..6b14c3d
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar
new file mode 100644
index 0000000..f4d27d3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar
new file mode 100644
index 0000000..0fd275e
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar
new file mode 100644
index 0000000..39f68c4
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar
new file mode 100644
index 0000000..893962d
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar
new file mode 100644
index 0000000..1cc5f4e
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar
new file mode 100644
index 0000000..7ddda85
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar
new file mode 100644
index 0000000..7a19168
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar
new file mode 100644
index 0000000..1c3cfb8
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar
new file mode 100644
index 0000000..a0ee347
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar
new file mode 100644
index 0000000..cd78554
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar
new file mode 100644
index 0000000..c31fa4b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar
new file mode 100644
index 0000000..9bbadf3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar
new file mode 100644
index 0000000..4099308
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar
new file mode 100644
index 0000000..19aaf37
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..e054cf6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..f52417f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..f303583
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..883ce39
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..1d6abd1
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..a3876b5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..cc34fde
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..379a761
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..1f5e468
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..bfc0bcf
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar
new file mode 100644
index 0000000..bc528ac
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml
new file mode 100644
index 0000000..8c6f3b0
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml
@@ -0,0 +1,55 @@
+
+
+
+
+ mvc-dispatcher
+ org.springframework.web.servlet.DispatcherServlet
+
+
+ contextConfigLocation
+ classpath:spring/spring-*.xml
+
+
+
+ mvc-dispatcher
+
+ /
+
+
+
+ SpringEncodingFilter
+ org.springframework.web.filter.CharacterEncodingFilter
+
+ encoding
+ UTF-8
+
+
+ forceEncoding
+ true
+
+
+
+ SimpleCORSFilter
+ com.oldpeoplehome.utils.SimpleCORSFilter
+
+ IsCross
+ true
+
+
+
+
+ SpringEncodingFilter
+ /*
+
+
+ SimpleCORSFilter
+ /*
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/index.jsp b/server/OldPeopleHome/target/OldPeopleHome/index.jsp
new file mode 100644
index 0000000..c38169b
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/index.jsp
@@ -0,0 +1,5 @@
+
+
+Hello World!
+
+
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class
new file mode 100644
index 0000000..87f12c5
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class
new file mode 100644
index 0000000..40bd5a1
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class
new file mode 100644
index 0000000..a47613a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class
new file mode 100644
index 0000000..230c7fb
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/LocationDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/LocationDao.class
new file mode 100644
index 0000000..82d8e4f
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/LocationDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class
new file mode 100644
index 0000000..12c0207
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class
new file mode 100644
index 0000000..e3a3326
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class
new file mode 100644
index 0000000..15ff3f0
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class
new file mode 100644
index 0000000..1aa6c68
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class
new file mode 100644
index 0000000..27df01b
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class
new file mode 100644
index 0000000..434de64
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class
new file mode 100644
index 0000000..af3f4c3
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/LocationFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/LocationFilter.class
new file mode 100644
index 0000000..49328cb
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/LocationFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class
new file mode 100644
index 0000000..ba07154
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class
new file mode 100644
index 0000000..ad89e24
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class
new file mode 100644
index 0000000..9993dc5
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class
new file mode 100644
index 0000000..46ead89
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class
new file mode 100644
index 0000000..53b2b83
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class
new file mode 100644
index 0000000..2b1a64b
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class
new file mode 100644
index 0000000..ef5b169
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Location.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Location.class
new file mode 100644
index 0000000..8971e9a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Location.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class
new file mode 100644
index 0000000..ae920b8
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class
new file mode 100644
index 0000000..74024c6
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class
new file mode 100644
index 0000000..93f08a5
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class
new file mode 100644
index 0000000..654840c
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class
new file mode 100644
index 0000000..897f11f
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class
new file mode 100644
index 0000000..82931e6
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class
new file mode 100644
index 0000000..912131d
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class
new file mode 100644
index 0000000..a17490a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class
new file mode 100644
index 0000000..c8ddcee
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/LocationService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/LocationService.class
new file mode 100644
index 0000000..fd7f9dd
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/LocationService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class
new file mode 100644
index 0000000..42056c8
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class
new file mode 100644
index 0000000..421d057
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class
new file mode 100644
index 0000000..4cc356f
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class
new file mode 100644
index 0000000..e7d116e
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class
new file mode 100644
index 0000000..f2d6a25
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class
new file mode 100644
index 0000000..966b3a3
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class
new file mode 100644
index 0000000..618038a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class
new file mode 100644
index 0000000..b3148e6
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class
new file mode 100644
index 0000000..d9d5bd2
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class
new file mode 100644
index 0000000..5631356
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class
new file mode 100644
index 0000000..b9ae282
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class
new file mode 100644
index 0000000..284eda1
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class
new file mode 100644
index 0000000..3926325
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class
new file mode 100644
index 0000000..431b748
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class
new file mode 100644
index 0000000..57d5fbe
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class
new file mode 100644
index 0000000..248039f
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class
new file mode 100644
index 0000000..e0e2a2b
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class
new file mode 100644
index 0000000..f7d2687
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class
new file mode 100644
index 0000000..6b211bf
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class
new file mode 100644
index 0000000..4711e23
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class
new file mode 100644
index 0000000..1ab1d70
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class
new file mode 100644
index 0000000..19bf3dc
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class
new file mode 100644
index 0000000..7b4d633
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/LocationController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/LocationController.class
new file mode 100644
index 0000000..60088a4
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/LocationController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class
new file mode 100644
index 0000000..3ae8aba
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class
new file mode 100644
index 0000000..2cb4f65
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class
new file mode 100644
index 0000000..377e641
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class
new file mode 100644
index 0000000..5417eb5
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class
new file mode 100644
index 0000000..4415246
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class differ
diff --git a/server/OldPeopleHome/target/classes/jdbc.properties b/server/OldPeopleHome/target/classes/jdbc.properties
new file mode 100644
index 0000000..e9eb37f
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/jdbc.properties
@@ -0,0 +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=root
diff --git a/server/OldPeopleHome/target/classes/logback.xml b/server/OldPeopleHome/target/classes/logback.xml
new file mode 100644
index 0000000..4480ac6
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/logback.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/AdminDao.xml b/server/OldPeopleHome/target/classes/mapper/AdminDao.xml
new file mode 100644
index 0000000..b85b118
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/AdminDao.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/ChildDao.xml b/server/OldPeopleHome/target/classes/mapper/ChildDao.xml
new file mode 100644
index 0000000..298dc84
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/ChildDao.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into child(longid,name,sex,account,password,phone)
+ values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone})
+
+
+
+ delete from child where id = #{childId}
+
+
+
+ update child
+ set longid = #{childLongId},
+ name = #{childName},
+ sex = #{childSex},
+ account = #{childAccount},
+ password = #{childPassword},
+ phone = #{childPhone}
+ where id =#{childId}
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml b/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml
new file mode 100644
index 0000000..a6a6eca
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into cp(pid, cid, relation)
+ values (#{parentId}, #{childId}, #{relation})
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
new file mode 100644
index 0000000..cc2a7e7
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into heartrate(pid, time,rate, rate1,rate2,oxy)
+ values (#{parentId}, #{time},#{rate}, #{rate1}, #{rate2}, #{oxy})
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/LocationDao.xml b/server/OldPeopleHome/target/classes/mapper/LocationDao.xml
new file mode 100644
index 0000000..2b0282a
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/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/target/classes/mapper/MotionDao.xml b/server/OldPeopleHome/target/classes/mapper/MotionDao.xml
new file mode 100644
index 0000000..c735e83
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/MotionDao.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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/classes/mapper/ParentDao.xml b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
new file mode 100644
index 0000000..42a628b
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into parent(longid,name,sex,account,password,height,weight,birth,phone)
+ values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone})
+
+
+
+ update parent
+ set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}
+ where id=#{parentId}
+
+
+
+ delete from parent where id=#{parentId}
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/RoomDao.xml b/server/OldPeopleHome/target/classes/mapper/RoomDao.xml
new file mode 100644
index 0000000..bf4a273
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/RoomDao.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into room(location, name) values (#{roomLocation}, #{roomName})
+
+
+
+ delete from room where id = #{roomId}
+
+
+
+ update room
+ set location = #{roomLocation},
+ name = #{roomName},
+ pid = #{parentId},
+ temp = #{temp}
+ where id =#{roomId}
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml b/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml
new file mode 100644
index 0000000..06c2ac2
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into rstate(rid, time, temperature, humidity, isin)
+ values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin})
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/SleepDao.xml b/server/OldPeopleHome/target/classes/mapper/SleepDao.xml
new file mode 100644
index 0000000..5d34f26
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/SleepDao.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into sleep(pid, date, deep, light, awake)
+ values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime})
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mybatis-config.xml b/server/OldPeopleHome/target/classes/mybatis-config.xml
new file mode 100644
index 0000000..4b92325
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mybatis-config.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/spring/spring-dao.xml b/server/OldPeopleHome/target/classes/spring/spring-dao.xml
new file mode 100644
index 0000000..96c91b2
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/spring/spring-dao.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/spring/spring-service.xml b/server/OldPeopleHome/target/classes/spring/spring-service.xml
new file mode 100644
index 0000000..10d4e5f
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/spring/spring-service.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/spring/spring-web.xml b/server/OldPeopleHome/target/classes/spring/spring-web.xml
new file mode 100644
index 0000000..87e4caa
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/spring/spring-web.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/BaseTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/BaseTest.class
new file mode 100644
index 0000000..e322610
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/BaseTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildDaoTest.class
new file mode 100644
index 0000000..63ee2ed
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildDaoTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildParentDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildParentDaoTest.class
new file mode 100644
index 0000000..16831a4
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildParentDaoTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class
new file mode 100644
index 0000000..27fe6cc
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class
new file mode 100644
index 0000000..94442cd
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class
new file mode 100644
index 0000000..98d5a30
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/AdminServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/AdminServiceTest.class
new file mode 100644
index 0000000..9d0f221
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/AdminServiceTest.class differ
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 0000000..6f27950
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class
new file mode 100644
index 0000000..1aeb125
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/LocationServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/LocationServiceTest.class
new file mode 100644
index 0000000..173f98d
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/LocationServiceTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class
new file mode 100644
index 0000000..207ca8f
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/RoomServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/RoomServiceTest.class
new file mode 100644
index 0000000..396d647
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/RoomServiceTest.class differ
diff --git a/server/README.md b/server/README.md
index bede992..32b0cd7 100644
--- a/server/README.md
+++ b/server/README.md
@@ -96,6 +96,6 @@
| 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(血氧) |
+| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate(心率)，rate1(收缩压)，rate2(舒张压)，oxy(血氧) |
| Location | /location/get/1 | GET | 查找id=1的老人位置信息 | 参数格式：yyyy-mm-dd hh-mm-ss 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
| Location | /location/add | POST | 添加老人位置信息 | parent，longitude，latitude，time。添加成功返回Location对象 |
diff --git a/web/html/css/styles.css b/web/html/css/styles.css
deleted file mode 100644
index a63c69e..0000000
--- a/web/html/css/styles.css
+++ /dev/null
@@ -1,1466 +0,0 @@
-*
- {
- margin:0;
- padding:0;
- border:0;
- }
-
-body
- {
- font-family:PingFangSC-Regular, Verdana, Arial, '微软雅黑','宋体';
- font-size:15px;
- }
-
-div#maincontent div#intro {
- padding-top: 45px;
- padding-bottom: 45px;
- font-size:24px;
- font-family:'微软雅黑';
- color:#3f3f3f;
- font-weight:400;
- }
-
-span.parameter {
- font-style: italic;
- color: #000;
-}
-
-div#maincontent h2
- {
- font-size: 30px;
- font-weight: 400;
- color:#3f3f3f;
- }
-
-body#homefirst div#maincontent, div#maincontent h1, div#maincontent h2, div#sidebar div#ad h2
- {
- font-family:'微软雅黑';
- }
-
-pre, pre code, div#maincontent input, div#maincontent select, div#maincontent textarea
- {
- font-family:Consolas, "Courier New", Courier, monospace;
- }
-
-h2, h3, h4, h5, h6, em
- {
- font-weight: bold;
- }
-
-p.note span, p.important span, p.tip span, p.inherited, p.inherited span, p.gototop, .html5_new_note span
- {
- font-weight: bold;
- }
-
-p.tip span {
- color:#ff9955;
- }
-
-p.tip2 {
- background: #BBEDB8 url(/ui2017/tip.png) top left no-repeat;
- display:block;
- padding:15px 15px 15px 50px;
- color:#000;
- border-radius:5px;
- background-position:15px 15px;
- }
-
-body#homesecond div#navsecond li
- {
- font-weight:bold;
- }
-
- div#sidebar div#ad h2, body#homefirst div#maincontent h3
- {
- font-size: 14px;
- }
-
-div#maincontent h3
- {
- font-size: 16px;
- }
-
-div#maincontent h4
- {
- font-size: 14px;
- }
-
-div#maincontent button, div#maincontent input, div#maincontent select, div#maincontent textarea
- {
- font-size:12px;
- }
-
-body#homefirst div#maincontent div#w3 h2
- {
- font-size:20px;
- }
-
-em
- {
- font-style:normal;
- }
-
-pre code
- {
- color:#0000dd;
- }
-
-.html5_new_note
- {
- background: #ffffff url(/i/html5_new_note.png) top left no-repeat;
- padding-left:20px;
- }
-
-.html5_new_note span
- {
- color:blue;
- }
-
-p.gototop
- {
- text-align:right;
- }
-
-div#maincontent button
- {
- margin-top:15px;
- }
-
-
-
-
- /* ----------------------------------- layout ----------------------------------- */
-html {
- min-width: 1210px;
- background-color: #fdfcf8;
- overflow:scroll;
- overflow-x:hidden;
- }
-
-body
- {
- text-align: center;
- margin: 0;
- padding: 0;
- border: 0;
- background: #fdfcf8;
- }
-
-div#wrapper
- {
- margin: 0 auto;
- padding: 0;
- border: 0;
- width: 1239px;
- text-align: left;
- background: transparent url(/ui2017/wrapper.png) top left repeat-y;
- }
-
-div#navsecond
- {
- float: left;
- margin: 0 0 0 6px;
- padding: 0;
- border: 0;
- width: 180px;
- background : transparent;
- }
-
-html>body div#navsecond
- {
- margin-left: 12px;
- }
-
-div#maincontent
- {
- float: left;
- margin: 0;
- padding: 30px 0 0 0;
- border: 0;
- width: 850px;
- background: transparent;
- }
-
-div#maincontent div{
- width: 810px;
- margin: 0 0 0 25px;
- padding: 30px 0 35px 0;
- border:0;
- border-bottom: 1px solid #aaa;
- }
-
-div#sidebar
- {
- float: left;
- margin: 0;
- padding: 0;
- border: 0;
- width: 180px;
- background: transparent;
- }
-
-div#footer
- {
- clear: both;
- margin: 0;
- padding-top: 16px;
- margin-left: 12px;
- width: 1210px;
- line-height:24px;
- background: #f0f0f0;
- border-top: 0px solid #fff;
- background: #fdfcf8 url(/ui2017/footer.png) top left repeat-x;
- font-family:PingFangSC-Regular, '微软雅黑', Verdana, Arial, '宋体';
- }
-
-div#footer #p1
- {
- font-size:12px;
- color:#777777;
- text-align:center;
- background: transparent url(/ui2017/alert.png) no-repeat;
- background-position:235px 2px;
- }
-
-div#footer #p2
- {
- margin: 30px 0 30px 0;
- font-size:14px;
- text-align:center;
- color:#777777;
- }
-
-div#footer #p1, div#footer #p2, div#footer #p2 a {
- max-height: 999999px;
- }
-
-
- /* ----------------------------------- header ----------------------------------- */
-div#header, div#header_index
- {
- margin: 0 0 0 12px;
- padding: 0;
- border: 0;
- width: 1210px;
- height: 100px;
- background-color:#fdfcf8;
- }
-
-div#header div#ad_head
- {
- float:right;
- width:728px;
- height:90px;
- background-color: transparent;
- margin-top:5px;
- border: 1px solid #eeeeee;
- }
-
-/*
-div#header {
- background: url('/i/ad-header.png') top left no-repeat;
-}
-*/
-
-
-
-
-
- /* Default links */
-a:link, a:visited {
- text-decoration : none;
- color : #900b09;
- background : transparent;
- border-bottom:1px solid #900b09;
- }
-
-a:hover {
- text-decoration : none;
- color: #ff0000;
- background : transparent;
- border-bottom:1px solid #ff0000;
- }
-
-a:active {
- text-decoration : none;
- color : #ff0000;
- background : transparent;
- }
-
-div#navsecond li.currentLink a:link, div#navsecond li.currentLink a:visited {
- text-decoration : none;
- color:#ff0000;
- background : transparent;
- }
-
-div#navsecond li.currentLink a:hover {
- text-decoration : underline;
- color : #ff0000;
- background : transparent;
- }
-
-div#navsecond a:link, div#navsecond a:visited {
- text-decoration : none;
- color:#000;
- background : transparent;
- }
-
-div#navsecond a:hover {
- text-decoration : underline;
- color : #000;
- background : transparent;
- }
-
-div#navsecond a:active {
- text-decoration : underline;
- color : #000;
- background : transparent;
- }
-
-div#navsecond a#link_help {
- color:#0479A7;
- }
-
-div#navsecond a#link_about {
- color:#0479A7;
- }
-
-div#maincontent .partner a {
- color:#000;
- }
-
-div#footer a {
- border-bottom:none;
- }
-
-div#footer a:link, div#footer a:visited {
- text-decoration : none;
- color:#777777;
- background : transparent;
- }
-
-div#footer a:hover {
- text-decoration : underline;
- color : #000;
- background : transparent;
- }
-
-div#footer a:active {
- text-decoration : underline;
- color : #000;
- background : transparent;
- }
-
-
- /* ----------------------------------- Typography ----------------------------------- */
-
-div#maincontent p
- {
- margin: 20px 0 0 0;
- line-height: 150%;
- }
-
-div#maincontent h1 {
- margin:0 0 0 25px;
- font-size: 36px;
- font-weight:400;
- }
- div#maincontent h3, div#maincontent h4{
- margin:25px 0 0 0;
- }
-
- #homefirst div#navsecond h2:first-child, #homefirst div#sidebar h2:first-child {
- margin:10px 0 0 0;
- }
-
- body#homesecond div#navsecond li {
- margin:5px 0 0 0;
- }
-
- div.backtoreference p{
- margin:0;
- }
-
- div#w3school p {
- margin-left:15px;
- }
-
- div#maincontent div p:first-child {
- margin: 0;
- }
-
- p.important span {
- color:#dd0000;
- }
-
- p.inherited {
- color:#ff0000;
- }
-
- p.inherited span {
- color:#999;
- }
-
- p.chinese span {
- color:#0000ff;
- }
-
- pre {
- width:765px;
- margin: 15px 0 0 0;
- padding: 20px;
- border: 0;
- border: 1px dotted #785;
- background: #f5f5f5;
- line-height:1.4;
- font-family:Consolas;
- }
-
- pre code {
- color:#0000dd;
- }
-
- pre span {
- color:#999;
- }
-
- pre span.code_comment {
- color:#999;
- }
-
- blockquote
- {
- margin:15px;
- }
-
- div#maincontent ul, div#maincontent ol {
- margin-top:10px;
- margin-left:35px;
- margin-bottom:0;
- }
-
- div#maincontent li {
- margin-top:3px;
- }
-
- div#navsecond ul, div#navsecond li, div#sidebar ul, div#sidebar li {
- margin: 0;
- padding: 0;
- }
-
- div#navsecond ul, div#sidebar ul {
- margin-left: 12px;
- }
-
- div#navsecond li, div#sidebar li {
- list-style: none;
- }
-
- div#navsecond li.list_apart {
- margin-top:10px;
- }
-
- img {
- border:0;
- }
-
- div#maincontent img {
- margin:25px 0 0 25px;
- }
-
- body#homesecond dl {
- margin:0;
- padding:0;
- }
-
- body#homesecond dt
- {
- font-weight: bold;
- font-size: 14px;
- margin:0;
- padding:0;
- }
-
- body#homesecond dd {
- color:#000088;
- margin:10px 0 0 0;
- padding:0;
- }
-
- body#homesecond dd p {
- margin:0;
- padding:0;
- }
-
-
- div#maincontent div#toc div {
- margin:0;
- margin-top:15px;
- margin-bottom:35px;
- padding:0;
- border:0;
- }
-
- div#toc img {
- float:left;
- margin:0;
- margin-right:10px;
- }
-
- div#toc div dt, div#toc div dl {
- margin-top:0;
- }
-
- div#example dl, div.example dl, div#moreexamples dl, div#toc dl, div#referencelist dl {
- margin: 10px 0 0 0;
- }
-
- div#example dt, div.example dt, div#moreexamples dt, div#toc dt, div#referencelist dt {
- margin:15px 0 5px 0;
- }
-
- div#example dd, div.example dd, div#moreexamples dd, div#toc dd, div#referencelist dd {
- margin:0;
- }
-
- dl.define
- {
- margin: 10px 0 0 0;
- }
-
- dl.define dt
- {
- margin:15px 0 3px 0;
- font-weight:bold;
- color:#0479A7;
- }
-
- dl.define dd
- {
- margin:10px 0 0 10px;
- line-height: 150%;
- }
-
- span.deprecated {
- color:#e80000;
- }
-
- mark {
- color:crimson;
- background-color:#f1f1f1;
- padding-left:4px;
- padding-right:4px;
- }
-
- .marked, pre code span.marked {
- color:#dd0000;
- }
-
- .marked-code {
- color:crimson;
- background-color:#f1f1f1;
- padding-left:4px;
- padding-right:4px;
-
- }
-
- .code_marked {
- color:crimson;
- background-color:#f1f1f1;
- padding-left:4px;
- padding-right:4px;
- font-family: Consolas,"courier new";
- font-size: 110%;
- }
-
- p.gototop {
- text-align:right;
- }
-
- div#maincontent canvas.canvas_example {
- border:1px solid #d3d3d3;
- background:#ffffff;
- width:300px;
- height:150px;
- margin-top:15px;
- }
-
- div#maincontent div.panel,p.flip {
- width:400px;
- margin:0;
- padding:5px;
- text-align:center;
- background:#e5eecc;
- border:solid 1px #c3c3c3;
- }
-
- div#maincontent p.flip {
- margin-top:15px;
- }
-
- div.panel {
- display:none;
- }
-
- div#maincontent input[type=text]
- {
- border:1px #bebebe solid;
- height:30px;
- padding-left:10px;
- margin:15px 0 0 0;
- }
-
- div#maincontent input[type=submit], button
- {
- border:1px #bebebe solid;
- height:30px;
- padding-left:5px;
- padding-right:5px;
- }
-
- div#maincontent input[type=submit]:hover, button:hover
- {
- border:1px #999 solid;
- }
-
- div#maincontent select
- {
- border:1px #bebebe solid;
- height:25px;
- margin:15px 0 0 0;
- }
-
-div#header a#logo
-{
-margin: 0;
-padding: 0;
-border: 0;
-}
-
-div#header a#logo
-{
-text-indent: -9999px;
-overflow:hidden;
-float:left;
-}
-
-div#header a#logo:link, div#header a#logo:visited
-{
-display: block;
-width: 372px;
-height: 90px;
-background : transparent url(/ui2019/bg.png) 0 -150px no-repeat;
-}
-
-div#header a#logo:hover
-{
-background: transparent url(/ui2019/bg.png) 0 -250px no-repeat;
-}
-
-@media
-only screen and (-webkit-min-device-pixel-ratio: 2) {
-
-div#header a#logo
- {
- margin: 0;
- padding: 0;
- border: 0;
- }
-
-div#header a#logo
- {
- text-indent: -9999px;
- overflow:hidden;
- float:left;
- }
-
-div#header a#logo:link, div#header a#logo:visited
- {
- display: block;
- width: 372px;
- height: 90px;
- background : transparent url("/ui2019/bg-retina.png") 0 -150px no-repeat;
- background-size: auto 900px;
- }
-
-div#header a#logo:hover
- {
- background: transparent url("/ui2019/bg-retina.png") 0 -250px no-repeat;
- background-size: auto 900px;
- }
-
-}
-
-
-div#header_index a, div#header_index h1
-{
-margin: 0;
-padding: 0;
-border: 0;
-}
-
-div#header_index a, div#header_index h1
-{
-text-indent: -9999px;
-overflow:hidden;
-float:left;
-}
-
-div#header_index a:link, div#header_index a:visited, div#header_index h1
-{
-display: block;
-width: 500px;
-height: 100px;
-background : transparent url(/ui2019/bg.png) 0 -150px no-repeat;
-}
-
-div#header_index a:hover
-{
-background: transparent url(/ui2019/bg.png) 0 -250px no-repeat;
-}
-
-
-
-@media
-only screen and (-webkit-min-device-pixel-ratio: 2) {
-
-div#header_index a, div#header_index h1
- {
- margin: 0;
- padding: 0;
- border: 0;
- }
-
-div#header_index a, div#header_index h1
- {
- text-indent: -9999px;
- overflow:hidden;
- float:left;
- }
-
-div#header_index a:link, div#header_index a:visited, div#header_index h1
- {
- display: block;
- width: 500px;
- height: 90px;
- background : transparent url("/ui2019/bg-retina.png") 0 -150px no-repeat;
- background-size: auto 900px;
- }
-
-div#header_index a:hover
- {
- background: transparent url("/ui2019/bg-retina.png") 0 -250px no-repeat;
- background-size: auto 900px;
- }
-
-}
-
-
-/* ----------------------------------- search form ----------------------------------- */
-div#searchui
-{
-margin:0;
-padding:0;
-width:306px;
-height:100px;
-background-color: transparent;
-float:right;
-}
-
-#searchui input.button
-{
-padding:0;
-margin:0;
-background:#AE4141;
-font:12px Verdana, Arial, Helvetica, sans-serif;
-color:#FFFFFF;
-width:30px;
-height:30px;
-}
-
-#searchui input.box
-{
-margin:0;
-margin-top:35px;
-width:256px;
-height:28px;
-background:#fdfdfd;
-font:12px Verdana, Arial, Helvetica, sans-serif;
-border:1px solid #ddd;
-}
-
-
-
-/* ----------------------------------- index -----------------------------------*/
-
-
-body#homefirst div#maincontent div
-{
-padding-top:0;
-padding-bottom:30px;
-width:810px;
-}
-
-body#homefirst div#maincontent h3
-{
-margin-top:35px;
-margin-left:110px;
-font-size:24px;
-}
-
-body#homefirst div#maincontent p
-{
-margin-left:110px;
-font-size:16px;
-}
-
-body#homefirst div#maincontent div.idea
-{
-min-height: 118px;
-}
-
-body#homefirst div#maincontent div#d1
-{
-text-align:center;
-}
-
-body#homefirst div#maincontent div#d1 h2
-{
-margin-top:35px;
-font-size:24px;
-}
-
-body#homefirst div#maincontent div#d1 p
-{
-margin-left:0;
-font-size:18px;
-}
-
-body#homefirst div#maincontent div#partner
-{
-width: 307px;
-float: left;
-}
-
-body#homefirst div#maincontent div#update
-{
-width: 300px;
-float: left;
-margin:0;
-}
-
-body#homefirst div#maincontent div#d2
-{
-background : transparent url(/ui2017/icon2.png) 0 0 no-repeat;
-}
-
-body#homefirst div#maincontent div#d3
-{
-background : transparent url(/ui2017/icon3.png) 0 0 no-repeat;
-}
-
-body#homefirst div#maincontent div#d4
-{
-background : transparent url(/ui2017/icon4.png) 0 0 no-repeat;
-}
-
-body#homefirst div#maincontent div#d5
-{
-background : transparent url(/ui2017/icon5.png) 0 0 no-repeat;
-}
-
-body#homefirst div#maincontent div#d6
-{
-background : transparent url(/ui2017/icon6.png) 0 0 no-repeat;
-}
-
-body#homefirst div#maincontent div#d7
-{
-background : transparent url(/ui2017/icon7.png) 0 0 no-repeat;
-}
-
-body#homefirst div#maincontent div#d8
-{
-background : transparent url(/ui2017/icon8.png) 0 0 no-repeat;
-border:0px;
-}
-
-body#homefirst div#maincontent div#d9 {
-background: transparent url(/ui2017/icon9.png) top left no-repeat;
-}
-
-body#homefirst div#maincontent div#d10 {
-background: transparent url(/ui2017/icon10.png) top left no-repeat;
-}
-
-body#homefirst div#maincontent div#d9, body#homefirst div#maincontent div#d10 {
-margin-left:75px;
-margin-top:10px;
-width:290px;
-float:left;
-border:0;
-}
-
-body#homefirst div#maincontent div#d9, body#homefirst div#maincontent div#d10 {
-margin-left:75px;
-margin-top:15px;
-float:left;
-border:0;
-min-height:87px;
-}
-
-body#homefirst div#maincontent div#d9, body#homefirst div#maincontent div#d10 {
-width:290px;
-}
-
-body#homefirst div#maincontent div#d10 {
-width:299px;
-}
-
-body#homefirst div#maincontent div#d9 h3, body#homefirst div#maincontent div#d10 h3 {
-font-size:14px;
-margin:23px 0 0 58px;
-color:#777;
-font-weight:400;
-}
-
-body#homefirst div#maincontent div#d9 p, body#homefirst div#maincontent div#d10 p {
-font-size:14px;
-margin:0 0 0 58px;
-line-height:normal;
-}
-
-div#d9 p a {
-color:#000;
-}
-
-
-
-@media
-only screen and (-webkit-min-device-pixel-ratio: 2) {
-
-body#homefirst div#maincontent div#d2
-{
-background : transparent url("/ui2019/ref-retina.png") 0 0 no-repeat;
-background-size: auto 80px;
-}
-
-body#homefirst div#maincontent div#d3
-{
-background : transparent url("/ui2019/try-retina.png") 0 0 no-repeat;
-background-size: auto 80px;
-}
-
-body#homefirst div#maincontent div#d4
-{
-background : transparent url("/ui2019/easy-retina.png") 0 0 no-repeat;
-background-size: auto 80px;
-}
-
-body#homefirst div#maincontent div#d5
-{
-background : transparent url("/ui2019/how-retina.png") 0 0 no-repeat;
-background-size: auto 80px;
-}
-
-body#homefirst div#maincontent div#d6
-{
-background : transparent url("/ui2019/news-retina.png") 0 0 no-repeat;
-background-size: auto 80px;
-}
-
-body#homefirst div#maincontent div#d7
-{
-background : transparent url("/ui2019/update-retina.png") 0 0 no-repeat;
-background-size: auto 80px;
-}
-
-}
-
-/* ----------------------------------- navfirst -----------------------------------*/
-div#navfirst
-{
-height: 48px;
-width: 1210px;
-margin: 0 0 0 12px;
-padding: 0;
-border: 0;
-background: #E8E7E3;
-}
-
-div#navfirst ul#menu
-{
-height: 48px;
-width: 1210px;
-margin: 0;
-padding: 0;
-position: relative;
-}
-
-div#navfirst ul#menu li
-{
-margin:0;
-padding:0;
-list-style:none;
-position:absolute;
-top:0;
-}
-
-ul#menu li,ul#menu a
-{
-display: block;
-height: 48px;
-border-bottom:0;
-}
-
-div#navfirst ul#menu li a
-{
-text-indent: -9999px;
-overflow:hidden;
-text-decoration: none;
-}
-
-
-div#navfirst ul#menu {background: transparent url(/ui2019/bg.png) top left no-repeat;}
-
-#h {width: 166px; left: 0px;}
-#b {width: 191px; left: 166px;}
-#s {width: 175px; left: 357px;}
-#p {width: 198px; left: 532px;}
-#x {width: 113px; left: 730px;}
-#w {width: 197px; left: 843px;}
-#r {width: 170px; left: 1040px;}
-
-#h a:hover {background: transparent url(/ui2019/bg.png) 0 -48px no-repeat;}
-#b a:hover {background: transparent url(/ui2019/bg.png) -166px -48px no-repeat;}
-#s a:hover {background: transparent url(/ui2019/bg.png) -357px -48px no-repeat;}
-#p a:hover {background: transparent url(/ui2019/bg.png) -532px -48px no-repeat;}
-#x a:hover {background: transparent url(/ui2019/bg.png) -730px -48px no-repeat;}
-#w a:hover {background: transparent url(/ui2019/bg.png) -843px -48px no-repeat;}
-#r a:hover {background: transparent url(/ui2019/bg.png) -1040px -48px no-repeat;}
-
-body.html #h {background: transparent url(/ui2019/bg.png) 0 -48px no-repeat;}
-body.browserscripting #b {background: transparent url(/ui2019/bg.png) -166px -48px no-repeat;}
-body.serverscripting #s {background: transparent url(/ui2019/bg.png) -357px -48px no-repeat;}
-body.programming #p {background: transparent url(/ui2019/bg.png) -532px -48px no-repeat;}
-body.xml #x {background: transparent url(/ui2019/bg.png) -730px -48px no-repeat;}
-body.webbuilding #w {background: transparent url(/ui2019/bg.png) -843px -48px no-repeat;}
-body.reference #r {background: transparent url(/ui2019/bg.png) -1040px -48px no-repeat;}
-
-
-
-
-@media
-only screen and (-webkit-min-device-pixel-ratio: 2) {
-
-div#navfirst ul#menu {background: transparent url("/ui2019/bg-retina.png") top left no-repeat; background-size: auto 900px;}
-
-#h {width: 166px; left: 0px;}
-#b {width: 191px; left: 166px;}
-#s {width: 175px; left: 357px;}
-#p {width: 198px; left: 532px;}
-#x {width: 113px; left: 730px;}
-#w {width: 197px; left: 843px;}
-#r {width: 170px; left: 1040px;}
-
-#h a:hover {background: transparent url("/ui2019/bg-retina.png") 0 -48px no-repeat; background-size: auto 900px;}
-#b a:hover {background: transparent url("/ui2019/bg-retina.png") -166px -48px no-repeat; background-size: auto 900px;}
-#s a:hover {background: transparent url("/ui2019/bg-retina.png") -357px -48px no-repeat; background-size: auto 900px;}
-#p a:hover {background: transparent url("/ui2019/bg-retina.png") -532px -48px no-repeat; background-size: auto 900px;}
-#x a:hover {background: transparent url("/ui2019/bg-retina.png") -730px -48px no-repeat; background-size: auto 900px;}
-#w a:hover {background: transparent url("/ui2019/bg-retina.png") -843px -48px no-repeat; background-size: auto 900px;}
-#r a:hover {background: transparent url("/ui2019/bg-retina.png") -1040px -48px no-repeat; background-size: auto 900px;}
-
-body.html #h {background: transparent url("/ui2019/bg-retina.png") 0 -48px no-repeat; background-size: auto 900px;}
-body.browserscripting #b {background: transparent url("/ui2019/bg-retina.png") -166px -48px no-repeat; background-size: auto 900px;}
-body.serverscripting #s {background: transparent url("/ui2019/bg-retina.png") -357px -48px no-repeat; background-size: auto 900px;}
-body.programming #p {background: transparent url("/ui2019/bg-retina.png") -532px -48px no-repeat; background-size: auto 900px;}
-body.xml #x {background: transparent url("/ui2019/bg-retina.png") -730px -48px no-repeat; background-size: auto 900px;}
-body.webbuilding #w {background: transparent url("/ui2019/bg-retina.png") -843px -48px no-repeat; background-size: auto 900px;}
-body.reference #r {background: transparent url("/ui2019/bg-retina.png") -1040px -48px no-repeat; background-size: auto 900px;}
-
-}
-*
- {
- margin:0;
- padding:0;
- border:0;
- }
-
-body
- {
- font-family:PingFangSC-Regular, Verdana, Arial, '微软雅黑','宋体';
- font-size:15px;
- }
-
-div#maincontent div#intro {
- padding-top: 45px;
- padding-bottom: 45px;
- font-size:24px;
- font-family:'微软雅黑';
- color:#3f3f3f;
- font-weight:400;
- }
-
-span.parameter {
- font-style: italic;
- color: #000;
-}
-
-div#maincontent h2
- {
- font-size: 30px;
- font-weight: 400;
- color:#3f3f3f;
- }
-
-body#homefirst div#maincontent, div#maincontent h1, div#maincontent h2, div#sidebar div#ad h2
- {
- font-family:'微软雅黑';
- }
-
-pre, pre code, div#maincontent input, div#maincontent select, div#maincontent textarea
- {
- font-family:Consolas, "Courier New", Courier, monospace;
- }
-
-h2, h3, h4, h5, h6, em
- {
- font-weight: bold;
- }
-
-p.note span, p.important span, p.tip span, p.inherited, p.inherited span, p.gototop, .html5_new_note span
- {
- font-weight: bold;
- }
-
-p.tip span {
- color:#ff9955;
- }
-
-p.tip2 {
- background: #BBEDB8 url(/ui2017/tip.png) top left no-repeat;
- display:block;
- padding:15px 15px 15px 50px;
- color:#000;
- border-radius:5px;
- background-position:15px 15px;
- }
-
-body#homesecond div#navsecond li
- {
- font-weight:bold;
- }
-
- div#sidebar div#ad h2, body#homefirst div#maincontent h3
- {
- font-size: 14px;
- }
-
-div#maincontent h3
- {
- font-size: 16px;
- }
-
-div#maincontent h4
- {
- font-size: 14px;
- }
-
-div#maincontent button, div#maincontent input, div#maincontent select, div#maincontent textarea
- {
- font-size:12px;
- }
-
-body#homefirst div#maincontent div#w3 h2
- {
- font-size:20px;
- }
-
-em
- {
- font-style:normal;
- }
-
-pre code
- {
- color:#0000dd;
- }
-
-.html5_new_note
- {
- background: #ffffff url(/i/html5_new_note.png) top left no-repeat;
- padding-left:20px;
- }
-
-.html5_new_note span
- {
- color:blue;
- }
-
-p.gototop
- {
- text-align:right;
- }
-
-div#maincontent button
- {
- margin-top:15px;
- }
-
-
-
-
- /* ----------------------------------- layout ----------------------------------- */
-html {
- min-width: 1210px;
- background-color: #fdfcf8;
- overflow:scroll;
- overflow-x:hidden;
- }
-
-body
- {
- text-align: center;
- margin: 0;
- padding: 0;
- border: 0;
- background: #fdfcf8;
- }
-
-div#wrapper
- {
- margin: 0 auto;
- padding: 0;
- border: 0;
- width: 1239px;
- text-align: left;
- background: transparent url(/ui2017/wrapper.png) top left repeat-y;
- }
-
-div#navsecond
- {
- float: left;
- margin: 0 0 0 6px;
- padding: 0;
- border: 0;
- width: 180px;
- background : transparent;
- }
-
-html>body div#navsecond
- {
- margin-left: 12px;
- }
-
-div#maincontent
- {
- float: left;
- margin: 0;
- padding: 30px 0 0 0;
- border: 0;
- width: 850px;
- background: transparent;
- }
-
-div#maincontent div{
- width: 810px;
- margin: 0 0 0 25px;
- padding: 30px 0 35px 0;
- border:0;
- border-bottom: 1px solid #aaa;
- }
-
-div#sidebar
- {
- float: left;
- margin: 0;
- padding: 0;
- border: 0;
- width: 180px;
- background: transparent;
- }
-
-div#footer
- {
- clear: both;
- margin: 0;
- padding-top: 16px;
- margin-left: 12px;
- width: 1210px;
- line-height:24px;
- background: #f0f0f0;
- border-top: 0px solid #fff;
- background: #fdfcf8 url(/ui2017/footer.png) top left repeat-x;
- font-family:PingFangSC-Regular, '微软雅黑', Verdana, Arial, '宋体';
- *
- {
- margin:0;
- padding:0;
- border:0;
- }
-
-body
- {
- font-family:PingFangSC-Regular, Verdana, Arial, '微软雅黑','宋体';
- font-size:15px;
- }
-
-div#maincontent div#intro {
- padding-top: 45px;
- padding-bottom: 45px;
- font-size:24px;
- font-family:'微软雅黑';
- color:#3f3f3f;
- font-weight:400;
- }
-
-span.parameter {
- font-style: italic;
- color: #000;
-}
-
-div#maincontent h2
- {
- font-size: 30px;
- font-weight: 400;
- color:#3f3f3f;
- }
-
-body#homefirst div#maincontent, div#maincontent h1, div#maincontent h2, div#sidebar div#ad h2
- {
- font-family:'微软雅黑';
- }
-
- *
- {
- margin:0;
- padding:0;
- border:0;
- }
-
-body
- {
- font-family:PingFangSC-Regular, Verdana, Arial, '微软雅黑','宋体';
- font-size:15px;
- }
-
-div#maincontent div#intro {
- padding-top: 45px;
- padding-bottom: 45px;
- font-size:24px;
- font-family:'微软雅黑';
- color:#3f3f3f;
- font-weight:400;
- }
-
-span.parameter {
- font-style: italic;
- color: #000;
-}
-
-div#maincontent h2
- {
- font-size: 30px;
- font-weight: 400;
- color:#3f3f3f;
- }
-
-body#homefirst div#maincontent, div#maincontent h1, div#maincontent h2, div#sidebar div#ad h2
- {
- font-family:'微软雅黑';
- }
-
-pre, pre code, div#maincontent input, div#maincontent select, div#maincontent textarea
- {
- font-family:Consolas, "Courier New", Courier, monospace;
- }
-
-h2, h3, h4, h5, h6, em
- {
- font-weight: bold;
- }
-
-p.note span, p.important span, p.tip span, p.inherited, p.inherited span, p.gototop, .html5_new_note span
- {
- font-weight: bold;
- }
-
-p.tip span {
- color:#ff9955;
- }
-
-p.tip2 {
- background: #BBEDB8 url(/ui2017/tip.png) top left no-repeat;
- display:block;
- padding:15px 15px 15px 50px;
- color:#000;
- border-radius:5px;
- background-position:15px 15px;
- }
-
-body#homesecond div#navsecond li
- {
- font-weight:bold;
- }
-
- div#sidebar div#ad h2, body#homefirst div#maincontent h3
- {
- font-size: 14px;
- }
-
-div#maincontent h3
- {
- font-size: 16px;
- }
-
-div#maincontent h4
- {
- font-size: 14px;
- }
-
-div#maincontent button, div#maincontent input, div#maincontent select, div#maincontent textarea
- {
- font-size:12px;
- }
-
-body#homefirst div#maincontent div#w3 h2
- {
- font-size:20px;
- }
-
-em
- {
- font-style:normal;
- }
-
-pre code
- {
- color:#0000dd;
- }
-
-.html5_new_note
- {
- background: #ffffff url(/i/html5_new_note.png) top left no-repeat;
- padding-left:20px;
- }
-
-.html5_new_note span
- {
- color:blue;
- }
-
-p.gototop
- {
- text-align:right;
- }
-
-div#maincontent button
- {
- margin-top:15px;
- }
-
-
-
-
- /* ----------------------------------- layout ----------------------------------- */
diff --git a/web/html/css/views_style.css b/web/html/css/views_style.css
index f372b22..ce785f1 100644
--- a/web/html/css/views_style.css
+++ b/web/html/css/views_style.css
@@ -1,5 +1,5 @@
body {
- height: 2000px;
+ height: 3000px;
margin: 0px;
background-image: url("images/天空1.jpg");
background-repeat: no-repeat;
@@ -77,14 +77,14 @@ ul {
.info {
width: 450px;
height: 350px;
- background-color: white;
+ background-color: rgba(255, 255, 255, 0.5);
position: absolute;
top: 170px;
left: 140px;
}
.info h2 {
padding: 0 0 0 20px;
- color: rgb(255, 115, 0);
+ color: rgb(255, 206, 166);
}
.info span {
position: relative;
@@ -97,26 +97,52 @@ ul {
.room {
width: 450px;
height: 350px;
- background-color: white;
+ background-color: rgba(255, 255, 255, 0.5);
position: absolute;
top: 170px;
left: 660px;
}
.room h2 {
padding: 0 0 0 20px;
- color: rgb(255, 115, 0);
+ color: rgb(255, 206, 166);
}
-/* 健康监测卡 */
-.health {
+/* 本周步数 */
+.walk {
width: 450px;
height: 350px;
- background-color: white;
+ background-color: rgba(255, 255, 255, 0.5);
position: absolute;
top: 580px;
left: 140px;
}
-.health h2 {
- padding: 0 0 0 20px;
- color: rgb(255, 115, 0);
+
+/* 睡眠情况 */
+.sleep {
+ width: 450px;
+ height: 350px;
+ background-color: rgba(255, 255, 255, 0.5);
+ position: absolute;
+ top: 580px;
+ left: 640px;
+}
+
+/* 心率 */
+.heart {
+ width: 450px;
+ height: 350px;
+ background-color: rgba(255, 255, 255, 0.5);
+ position: absolute;
+ top: 980px;
+ left: 140px;
+}
+
+/* 行动轨迹 */
+.track {
+ width: 1150px;
+ height:550px;
+ background-color: rgba(255, 255, 255, 0.5);
+ position: absolute;
+ top: 1380px;
+ left: 40px;
}
\ No newline at end of file
diff --git a/web/html/js/addPeople.js b/web/html/js/addPeople.js
index e1821e4..9bb3f30 100644
--- a/web/html/js/addPeople.js
+++ b/web/html/js/addPeople.js
@@ -1,12 +1,12 @@
function changeDiv() {
register_1 = document.getElementById("register_1")
register_2 = document.getElementById("register_2")
- if(register_1.style.display === "block"&®ister_2.style.display === "none"){
+ if(register_1.style.display == "block"&®ister_2.style.display == "none"){
register_1.style.display = "none"
register_2.style.display = "block"
console.log(register_1.style.display)
}
- else if(register_1.style.display === "none"&®ister_2.style.display === "block") {
+ else if(register_1.style.display == "none"&®ister_2.style.display == "block") {
register_1.style.display = "block"
register_2.style.display = "none"
}
diff --git a/web/html/js/login.js b/web/html/js/login.js
index 4b828b1..7fbf980 100644
--- a/web/html/js/login.js
+++ b/web/html/js/login.js
@@ -1,26 +1,21 @@
-var http = require('http');
-
-// 用于请求的选项
-var options = {
- host: '39.105.65.209',
- port: '8080',
- path: '/login.html'
-};
-
-// 处理响应的回调函数
-var callback = function (response) {
- // 不断更新数据
- var body = '';
- response.on('data',function (data) {
- body +=data;
+function login(){
+ $.ajax({
+ url:'http://39.105.65.209:8080/admin/login',
+ type:'POST',
+ data:[{"account": "root"},{"password": "root"}],
+ success:function (data) {
+ // if(data){
+ // var jsonArray =typeof data=='string' ?JSON.parse(data):data;
+ // }
+ // console.log(jsonArray);
+ // $.each(jsonArray, function(i, n){
+
+ // console.log(jsonArray[i])
+ // });
+
+ // $('body').html(jsonArray[0]);
+ if(account=='root'&&password=='root')
+ $.open('html/firstPage.html');
+ }
});
-
- response.on('end',function () {
- // 数据接收完成
- console.log(body);
- });
-}
-
-// 向服务器端发送请求
-var request = http.request(options,callback);
-request.end();
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/web/html/js/views.js b/web/html/js/views.js
new file mode 100644
index 0000000..1e09d5a
--- /dev/null
+++ b/web/html/js/views.js
@@ -0,0 +1,138 @@
+// 步数折线图
+var dom = document.getElementById("walk");
+var myChart = echarts.init(dom);
+var app = {};
+option = null;
+option = {
+ title: {
+ text: '本周步数'
+ },
+ // hover效果
+ tooltip: {
+ trigger: 'axis'
+ },
+ xAxis: {
+ type: 'category',
+ data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [{
+ data: [1820, 2932, 1901, 3934, 3290, 1330, 2320],
+ type: 'line'
+ }]
+};
+;
+if (option && typeof option === "object") {
+ myChart.setOption(option, true);
+}
+
+// 睡眠饼状图
+var dom = document.getElementById("sleep");
+var myChart = echarts.init(dom);
+var app = {};
+option = null;
+app.title = '环形图';
+
+option = {
+ title: {
+ text: '睡眠情况'
+ },
+ // hover效果
+ tooltip: {
+ trigger: 'item',
+ formatter: "{a}
{b}: {c} ({d}%)"
+ },
+ legend: {
+ orient: 'vertical',
+ x: 'right',
+ data:['深睡眠','浅睡眠','清醒']
+ },
+ series: [
+ {
+ name:'睡眠情况',
+ type:'pie',
+ radius: ['50%', '70%'],
+ avoidLabelOverlap: false,
+ label: {
+ normal: {
+ show: false,
+ position: 'center'
+ },
+ emphasis: {
+ show: true,
+ textStyle: {
+ fontSize: '30',
+ fontWeight: 'bold'
+ }
+ }
+ },
+ labelLine: {
+ normal: {
+ show: false
+ }
+ },
+ data:[
+ {value:5, name:'深睡眠'},
+ {value:3, name:'浅睡眠'},
+ {value:1, name:'清醒'},
+ ]
+ }
+ ]
+};
+;
+if (option && typeof option === "object") {
+ myChart.setOption(option, true);
+}
+
+// 心率折线图
+var dom = document.getElementById("heart");
+var myChart = echarts.init(dom);
+var app = {};
+option = null;
+option = {
+ title: {
+ text: '心率折线图'
+ },
+ // hover效果
+ tooltip: {
+ trigger: 'axis'
+ },
+ xAxis: {
+ type: 'category',
+ data: ['06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00', '01:00', '02:00', '03:00', '04:00', '05:00']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [{
+ data: [76, 56, 68, 79, 67, 76, 57, 68, 86, 68, 78, 76, 58, 97, 57, 76, 78, 87, 67, 77, 58, 95, 59, 86],
+ type: 'line'
+ }]
+};
+;
+if (option && typeof option === "object") {
+ myChart.setOption(option, true);
+}
+
+// 行动轨迹
+var map = new BMap.Map("track"); // 创建地图实例
+var point = new BMap.Point(112.44183, 38.01419); // 创建点坐标
+map.centerAndZoom(point, 15); // 初始化地图，设置中心点坐标和地图级别
+map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
+
+var geolocation = new BMap.Geolocation();
+// 开启SDK辅助定位
+geolocation.enableSDKLocation();
+geolocation.getCurrentPosition(function(r){
+ if(this.getStatus() == BMAP_STATUS_SUCCESS){
+ var mk = new BMap.Marker(r.point);
+ map.addOverlay(mk);
+ map.panTo(r.point);
+ alert('您的位置：'+r.point.lng+','+r.point.lat);
+ }
+ else {
+ alert('failed'+this.getStatus());
+ }
+});
\ No newline at end of file
diff --git a/web/html/views.html b/web/html/views.html
index 371575e..fef668e 100644
--- a/web/html/views.html
+++ b/web/html/views.html
@@ -51,9 +51,20 @@
是否有人
时间
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+