shen/OldPeopleHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zigbee

Browse Source
This commit is contained in:
LitterDryFish
2019-09-11 18:55:30 +08:00
parent a17c8a7c67 c62fc2e41f
commit 464dd5799e
392 changed files with 34832 additions and 2661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

770
android/OldPeopleHome/.idea/workspace.xml generated
View File

File diff suppressed because it is too large Load Diff

53
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/EnvironmentFragment.java
View File

@@ -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();
}
}

60
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/MapFragment.java
View File

@@ -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<Location> 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<LatLng> points = new ArrayList<LatLng>();
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();
}
}

3
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/fragment/SleepFragment.java
View File

@@ -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));

44
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/loginregister/RegisterActivity.java
View File

@@ -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();
}
}

32
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/activity/OldPeopleMainActivity.java
View File

@@ -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();
}
}

66
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/EnvironmentFragment.java
View File

@@ -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();
}
}

20
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/HeartRateFragment.java
View File

@@ -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);
}
}

37
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/oldpeople/fragmemt/MyInformationFragment.java
View File

@@ -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);
}
}

15
android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/utils/WebUtils.java
View File

@@ -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<String, String> 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);
}
}

20
android/OldPeopleHome/app/src/main/res/layout/fragment_child_environment.xml
View File

@@ -27,10 +27,10 @@
android:textSize="14sp" />
<TextView
android:id="@+id/now_time_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:id="@+id/now_time_text"
android:text="2019-8-20 15:58"
android:textColor="@color/white_text"
android:textSize="18sp" />
@@ -107,9 +107,21 @@
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_width="30dp"
android:layout_height="match_parent" />
<RelativeLayout
android:layout_width="40dp"
android:layout_height="match_parent">
<Button
android:id="@+id/change_button"
android:layout_width="50dp"
android:layout_height="25dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:background="#30d19b"
android:text="修改"
android:textColor="@color/white_text"
android:textSize="11sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="150dp"

18
android/OldPeopleHome/app/src/main/res/layout/fragment_old_environment.xml
View File

@@ -124,9 +124,21 @@
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_width="30dp"
android:layout_height="match_parent" />
<RelativeLayout
android:layout_width="40dp"
android:layout_height="match_parent">
<Button
android:id="@+id/change_button"
android:layout_width="50dp"
android:layout_height="25dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:background="#30d19b"
android:text="修改"
android:textColor="@color/white_text"
android:textSize="11sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="150dp"

3
android/OldPeopleHome/app/src/main/res/layout/fragment_old_my.xml
View File

@@ -216,6 +216,7 @@
android:orientation="vertical">
<RelativeLayout
android:id="@+id/change"
android:layout_width="match_parent"
android:layout_height="70dp">
@@ -224,7 +225,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:gravity="center"
android:text="关联的亲人"
android:text="切换账号"
android:textSize="16sp" />
<LinearLayout

222
android/OldPeopleInterServer/.idea/workspace.xml generated
View File

@@ -15,8 +15,25 @@
<file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="181">
<caret line="63" column="46" selection-start-line="63" selection-start-column="46" selection-end-line="63" selection-end-column="46" />
=======
<state relative-caret-position="312">
<caret line="13" column="37" lean-forward="true" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="20" column="9" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -36,7 +53,11 @@
<file leaf-file-name="funcList.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="420">
=======
<state relative-caret-position="336">
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
</provider>
@@ -54,7 +75,11 @@
<file leaf-file-name="TimeUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="210">
=======
<state relative-caret-position="168">
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
@@ -66,8 +91,13 @@
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="210">
<caret line="18" selection-start-line="18" selection-end-line="18" />
=======
<state relative-caret-position="1152">
<caret line="61" column="94" selection-start-line="61" selection-start-column="94" selection-end-line="61" selection-end-column="94" />
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -98,6 +128,7 @@
<option value="$PROJECT_DIR$/src/Node.java" />
<option value="$PROJECT_DIR$/src/WebUtils.java" />
<option value="$PROJECT_DIR$/src/Main.java" />
<option value="$PROJECT_DIR$/src/test.java" />
</list>
</option>
</component>
@@ -110,17 +141,28 @@
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<<<<<<< HEAD
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-10" />
<option name="y" value="-10" />
<option name="width" value="1940" />
<option name="height" value="1060" />
=======
<component name="ProjectFrameBounds" extendedState="7">
<option name="width" value="1920" />
<option name="height" value="1047" />
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<<<<<<< HEAD
=======
<pane id="Scope" />
<pane id="PackagesPane" />
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<pane id="AndroidView" />
<pane id="ProjectPane">
<subPane>
@@ -138,8 +180,11 @@
<select />
</subPane>
</pane>
<<<<<<< HEAD
<pane id="Scope" />
<pane id="PackagesPane" />
=======
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
</panes>
</component>
<component name="PropertiesComponent">
@@ -169,7 +214,7 @@
</list>
</option>
</component>
<component name="RunManager">
<component name="RunManager" selected="Application.Main">
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Main" />
<module name="OldPeopleInterServer" />
@@ -178,6 +223,11 @@
<configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration name="test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="test" />
<module name="OldPeopleInterServer" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
@@ -216,9 +266,14 @@
<properties />
<listeners />
</configuration>
<list>
<item itemvalue="Application.Main" />
<item itemvalue="Application.test" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.Main" />
<item itemvalue="Application.test" />
</list>
</recent_temporary>
</component>
@@ -234,15 +289,22 @@
<updated>1567753931598</updated>
<workItem from="1567753939083" duration="1386000" />
<workItem from="1567775235491" duration="855000" />
<workItem from="1567819403830" duration="1525000" />
<workItem from="1567819403830" duration="2819000" />
<workItem from="1568077867088" duration="1135000" />
<workItem from="1568165267244" duration="1676000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3766000" />
<option name="totallyTimeSpent" value="7871000" />
</component>
<component name="ToolWindowManager">
<<<<<<< HEAD
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
=======
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<layout>
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="TODO" order="6" />
@@ -252,10 +314,20 @@
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.28689656" />
<window_info anchor="bottom" id="Run" order="2" weight="0.44008714" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<<<<<<< HEAD
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.125" />
=======
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3769063" />
<window_info anchor="right" id="Mongo Explorer" order="3" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32897604" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.123667374" />
<window_info anchor="right" id="Database" order="3" />
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="UI Designer" order="2" />
<window_info anchor="right" id="Theme Preview" order="3" />
@@ -289,8 +361,125 @@
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="1560">
<caret line="63" column="46" selection-start-line="63" selection-start-column="46" selection-end-line="63" selection-end-column="46" />
=======
<state relative-caret-position="2016">
<caret line="97" selection-start-line="97" selection-end-line="97" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="24" column="48" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1152">
<caret line="61" column="94" selection-start-line="61" selection-start-column="94" selection-end-line="61" selection-end-column="94" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="456">
<caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="24" column="48" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/RoomData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1152">
<caret line="61" column="94" selection-start-line="61" selection-start-column="94" selection-end-line="61" selection-end-column="94" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -371,7 +560,11 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="300">
=======
<state relative-caret-position="168">
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
@@ -408,6 +601,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="420">
<caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
@@ -460,6 +654,9 @@
<entry file="file://$PROJECT_DIR$/src/funcList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
=======
<state relative-caret-position="336">
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
</provider>
@@ -531,7 +728,11 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="1440">
=======
<state relative-caret-position="1152">
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<caret line="61" column="94" selection-start-line="61" selection-start-column="94" selection-end-line="61" selection-end-column="94" />
<folding>
<element signature="imports" expanded="true" />
@@ -539,8 +740,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="20" column="9" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="144">
<caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
</state>
@@ -639,6 +851,10 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181">
<caret line="63" column="46" selection-start-line="63" selection-start-column="46" selection-end-line="63" selection-end-column="46" />
=======
<state relative-caret-position="312">
<caret line="13" column="37" lean-forward="true" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
>>>>>>> c62fc2e41f28502c7765aa354142ca81aa045d3b
<folding>
<element signature="imports" expanded="true" />
</folding>

3
android/OldPeopleInterServer/src/Main.java
View File

@@ -96,4 +96,7 @@ public class Main {
return jsonObject;
}
}

23
android/OldPeopleInterServer/src/test.java Normal file
View File

@@ -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<Integer> 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));
}
}
}

561
android/WIFITrick/.idea/workspace.xml generated
View File

@@ -36,9 +36,15 @@
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<state relative-caret-position="1936">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2734#2735#0" expanded="false" />
<element signature="e#2776#2777#0" expanded="false" />
<element signature="e#3668#3669#0" expanded="false" />
<element signature="e#3716#3717#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -71,32 +77,29 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="14" column="29" lean-forward="false" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
<caret line="62" column="5" lean-forward="false" selection-start-line="62" selection-start-column="5" selection-end-line="62" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WebUtils.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="56" column="29" lean-forward="false" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WifiConnect.java" pinned="false" current-in-tab="true">
<file leaf-file-name="WifiConnect.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="133" column="34" lean-forward="true" selection-start-line="133" selection-start-column="34" selection-end-line="133" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="2662">
<caret line="137" column="13" lean-forward="false" selection-start-line="137" selection-start-column="13" selection-end-line="137" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
@@ -107,8 +110,18 @@
<state relative-caret-position="264">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding>
<element signature="e#284#285#0" expanded="true" />
<element signature="e#315#316#0" expanded="true" />
<element signature="e#753#754#0" expanded="false" />
<element signature="e#783#784#0" expanded="false" />
<element signature="e#829#830#0" expanded="false" />
<element signature="e#867#868#0" expanded="false" />
<element signature="e#901#902#0" expanded="false" />
<element signature="e#931#932#0" expanded="false" />
<element signature="e#977#978#0" expanded="false" />
<element signature="e#1015#1016#0" expanded="false" />
<element signature="e#1049#1050#0" expanded="false" />
<element signature="e#1079#1080#0" expanded="false" />
<element signature="e#1125#1126#0" expanded="false" />
<element signature="e#1163#1164#0" expanded="false" />
</folding>
</state>
</provider>
@@ -119,7 +132,28 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding />
<folding>
<element signature="e#937#938#0" expanded="false" />
<element signature="e#964#965#0" expanded="false" />
<element signature="e#1004#1005#0" expanded="false" />
<element signature="e#1036#1037#0" expanded="false" />
<element signature="e#1074#1075#0" expanded="false" />
<element signature="e#1108#1109#0" expanded="false" />
<element signature="e#1162#1163#0" expanded="false" />
<element signature="e#1208#1209#0" expanded="false" />
<element signature="e#1243#1244#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
<element signature="e#1322#1323#0" expanded="false" />
<element signature="e#1362#1363#0" expanded="false" />
<element signature="e#1393#1394#0" expanded="false" />
<element signature="e#1420#1421#0" expanded="false" />
<element signature="e#1460#1461#0" expanded="false" />
<element signature="e#1492#1493#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1554#1555#0" expanded="false" />
<element signature="e#1598#1599#0" expanded="false" />
<element signature="e#1634#1635#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -130,8 +164,20 @@
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
<element signature="e#617#618#0" expanded="false" />
<element signature="e#657#658#0" expanded="false" />
<element signature="e#688#689#0" expanded="false" />
<element signature="e#715#716#0" expanded="false" />
<element signature="e#755#756#0" expanded="false" />
<element signature="e#787#788#0" expanded="false" />
<element signature="e#818#819#0" expanded="false" />
<element signature="e#846#847#0" expanded="false" />
<element signature="e#887#888#0" expanded="false" />
<element signature="e#921#922#0" expanded="false" />
<element signature="e#951#952#0" expanded="false" />
<element signature="e#978#979#0" expanded="false" />
<element signature="e#1017#1018#0" expanded="false" />
<element signature="e#1049#1050#0" expanded="false" />
</folding>
</state>
</provider>
@@ -142,7 +188,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3014">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1922,10 +1970,9 @@
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="1912" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1056" />
<option name="x" value="-7" />
<option name="width" value="1932" />
<option name="height" value="1047" />
</component>
<component name="ProjectView">
<navigator currentView="AndroidView" proportions="" version="1">
@@ -1943,6 +1990,9 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="ProjectPane" />
<pane id="AndroidView">
<subPane>
<PATH>
@@ -1955,85 +2005,8 @@
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidBuildScriptsGroupNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="WIFITrick" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="values" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="WIFITrick" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="res" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidResFolderNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="WIFITrick" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidSourceTypeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="WIFITrick" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidSourceTypeNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="wifitrick" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidPsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="WIFITrick" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.android.AndroidModuleNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="ProjectPane" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -2124,7 +2097,7 @@
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775885726" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1568191399075" />
</method>
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
@@ -2171,7 +2144,7 @@
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
</Profilers>
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775885726" />
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1568191399075" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
@@ -2331,9 +2304,7 @@
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method>
<option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1567775885727" />
</method>
<method />
</configuration>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="Android App.app" />
@@ -2374,8 +2345,7 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<frame x="-7" y="0" width="1932" height="1047" extended-state="0" />
<layout>
<window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -2388,12 +2358,12 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33224043" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11247335" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11217949" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -2423,7 +2393,28 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding />
<folding>
<element signature="e#937#938#0" expanded="false" />
<element signature="e#964#965#0" expanded="false" />
<element signature="e#1004#1005#0" expanded="false" />
<element signature="e#1036#1037#0" expanded="false" />
<element signature="e#1074#1075#0" expanded="false" />
<element signature="e#1108#1109#0" expanded="false" />
<element signature="e#1162#1163#0" expanded="false" />
<element signature="e#1208#1209#0" expanded="false" />
<element signature="e#1243#1244#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
<element signature="e#1322#1323#0" expanded="false" />
<element signature="e#1362#1363#0" expanded="false" />
<element signature="e#1393#1394#0" expanded="false" />
<element signature="e#1420#1421#0" expanded="false" />
<element signature="e#1460#1461#0" expanded="false" />
<element signature="e#1492#1493#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1554#1555#0" expanded="false" />
<element signature="e#1598#1599#0" expanded="false" />
<element signature="e#1634#1635#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2432,8 +2423,20 @@
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
<element signature="e#617#618#0" expanded="false" />
<element signature="e#657#658#0" expanded="false" />
<element signature="e#688#689#0" expanded="false" />
<element signature="e#715#716#0" expanded="false" />
<element signature="e#755#756#0" expanded="false" />
<element signature="e#787#788#0" expanded="false" />
<element signature="e#818#819#0" expanded="false" />
<element signature="e#846#847#0" expanded="false" />
<element signature="e#887#888#0" expanded="false" />
<element signature="e#921#922#0" expanded="false" />
<element signature="e#951#952#0" expanded="false" />
<element signature="e#978#979#0" expanded="false" />
<element signature="e#1017#1018#0" expanded="false" />
<element signature="e#1049#1050#0" expanded="false" />
</folding>
</state>
</provider>
@@ -2442,7 +2445,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3014">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2458,7 +2463,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2734#2735#0" expanded="false" />
<element signature="e#2776#2777#0" expanded="false" />
<element signature="e#3668#3669#0" expanded="false" />
<element signature="e#3716#3717#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2471,21 +2482,22 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="14" column="29" lean-forward="false" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2493,10 +2505,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1078">
<caret line="67" column="34" lean-forward="false" selection-start-line="67" selection-start-column="34" selection-end-line="67" selection-end-column="34" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -2512,9 +2521,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2574">
<caret line="133" column="43" lean-forward="false" selection-start-line="133" selection-start-column="43" selection-end-line="133" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -2522,7 +2529,28 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding />
<folding>
<element signature="e#937#938#0" expanded="false" />
<element signature="e#964#965#0" expanded="false" />
<element signature="e#1004#1005#0" expanded="false" />
<element signature="e#1036#1037#0" expanded="false" />
<element signature="e#1074#1075#0" expanded="false" />
<element signature="e#1108#1109#0" expanded="false" />
<element signature="e#1162#1163#0" expanded="false" />
<element signature="e#1208#1209#0" expanded="false" />
<element signature="e#1243#1244#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
<element signature="e#1322#1323#0" expanded="false" />
<element signature="e#1362#1363#0" expanded="false" />
<element signature="e#1393#1394#0" expanded="false" />
<element signature="e#1420#1421#0" expanded="false" />
<element signature="e#1460#1461#0" expanded="false" />
<element signature="e#1492#1493#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1554#1555#0" expanded="false" />
<element signature="e#1598#1599#0" expanded="false" />
<element signature="e#1634#1635#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2531,8 +2559,20 @@
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
<element signature="e#617#618#0" expanded="false" />
<element signature="e#657#658#0" expanded="false" />
<element signature="e#688#689#0" expanded="false" />
<element signature="e#715#716#0" expanded="false" />
<element signature="e#755#756#0" expanded="false" />
<element signature="e#787#788#0" expanded="false" />
<element signature="e#818#819#0" expanded="false" />
<element signature="e#846#847#0" expanded="false" />
<element signature="e#887#888#0" expanded="false" />
<element signature="e#921#922#0" expanded="false" />
<element signature="e#951#952#0" expanded="false" />
<element signature="e#978#979#0" expanded="false" />
<element signature="e#1017#1018#0" expanded="false" />
<element signature="e#1049#1050#0" expanded="false" />
</folding>
</state>
</provider>
@@ -2541,7 +2581,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3014">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2549,7 +2591,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1936">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2734#2735#0" expanded="false" />
<element signature="e#2776#2777#0" expanded="false" />
<element signature="e#3668#3669#0" expanded="false" />
<element signature="e#3716#3717#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2562,21 +2610,22 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2584,10 +2633,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="60" column="31" lean-forward="false" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -2595,9 +2641,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1892">
<caret line="102" column="17" lean-forward="false" selection-start-line="102" selection-start-column="17" selection-end-line="102" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -2605,7 +2649,28 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
<folding />
<folding>
<element signature="e#937#938#0" expanded="false" />
<element signature="e#964#965#0" expanded="false" />
<element signature="e#1004#1005#0" expanded="false" />
<element signature="e#1036#1037#0" expanded="false" />
<element signature="e#1074#1075#0" expanded="false" />
<element signature="e#1108#1109#0" expanded="false" />
<element signature="e#1162#1163#0" expanded="false" />
<element signature="e#1208#1209#0" expanded="false" />
<element signature="e#1243#1244#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
<element signature="e#1322#1323#0" expanded="false" />
<element signature="e#1362#1363#0" expanded="false" />
<element signature="e#1393#1394#0" expanded="false" />
<element signature="e#1420#1421#0" expanded="false" />
<element signature="e#1460#1461#0" expanded="false" />
<element signature="e#1492#1493#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1554#1555#0" expanded="false" />
<element signature="e#1598#1599#0" expanded="false" />
<element signature="e#1634#1635#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2614,8 +2679,20 @@
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
<element signature="e#617#618#0" expanded="false" />
<element signature="e#657#658#0" expanded="false" />
<element signature="e#688#689#0" expanded="false" />
<element signature="e#715#716#0" expanded="false" />
<element signature="e#755#756#0" expanded="false" />
<element signature="e#787#788#0" expanded="false" />
<element signature="e#818#819#0" expanded="false" />
<element signature="e#846#847#0" expanded="false" />
<element signature="e#887#888#0" expanded="false" />
<element signature="e#921#922#0" expanded="false" />
<element signature="e#951#952#0" expanded="false" />
<element signature="e#978#979#0" expanded="false" />
<element signature="e#1017#1018#0" expanded="false" />
<element signature="e#1049#1050#0" expanded="false" />
</folding>
</state>
</provider>
@@ -2631,7 +2708,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1474">
<caret line="86" column="47" lean-forward="false" selection-start-line="86" selection-start-column="47" selection-end-line="86" selection-end-column="47" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2639,7 +2718,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1936">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2734#2735#0" expanded="false" />
<element signature="e#2776#2777#0" expanded="false" />
<element signature="e#3668#3669#0" expanded="false" />
<element signature="e#3716#3717#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2652,21 +2737,22 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/TimeUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2674,10 +2760,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="924">
<caret line="60" column="31" lean-forward="false" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -2685,9 +2768,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1892">
<caret line="102" column="17" lean-forward="false" selection-start-line="102" selection-start-column="17" selection-end-line="102" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@@ -2695,7 +2776,28 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="30" column="23" lean-forward="false" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
<folding />
<folding>
<element signature="e#937#938#0" expanded="false" />
<element signature="e#964#965#0" expanded="false" />
<element signature="e#1004#1005#0" expanded="false" />
<element signature="e#1036#1037#0" expanded="false" />
<element signature="e#1074#1075#0" expanded="false" />
<element signature="e#1108#1109#0" expanded="false" />
<element signature="e#1162#1163#0" expanded="false" />
<element signature="e#1208#1209#0" expanded="false" />
<element signature="e#1243#1244#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
<element signature="e#1322#1323#0" expanded="false" />
<element signature="e#1362#1363#0" expanded="false" />
<element signature="e#1393#1394#0" expanded="false" />
<element signature="e#1420#1421#0" expanded="false" />
<element signature="e#1460#1461#0" expanded="false" />
<element signature="e#1492#1493#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1554#1555#0" expanded="false" />
<element signature="e#1598#1599#0" expanded="false" />
<element signature="e#1634#1635#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2704,8 +2806,20 @@
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
<element signature="e#617#618#0" expanded="false" />
<element signature="e#657#658#0" expanded="false" />
<element signature="e#688#689#0" expanded="false" />
<element signature="e#715#716#0" expanded="false" />
<element signature="e#755#756#0" expanded="false" />
<element signature="e#787#788#0" expanded="false" />
<element signature="e#818#819#0" expanded="false" />
<element signature="e#846#847#0" expanded="false" />
<element signature="e#887#888#0" expanded="false" />
<element signature="e#921#922#0" expanded="false" />
<element signature="e#951#952#0" expanded="false" />
<element signature="e#978#979#0" expanded="false" />
<element signature="e#1017#1018#0" expanded="false" />
<element signature="e#1049#1050#0" expanded="false" />
</folding>
</state>
</provider>
@@ -2721,7 +2835,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1474">
<caret line="86" column="47" lean-forward="true" selection-start-line="86" selection-start-column="47" selection-end-line="86" selection-end-column="47" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2750,15 +2866,14 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/w.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
@@ -2792,8 +2907,20 @@
<state relative-caret-position="550">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding>
<element signature="e#538#539#0" expanded="true" />
<element signature="e#569#570#0" expanded="true" />
<element signature="e#617#618#0" expanded="false" />
<element signature="e#657#658#0" expanded="false" />
<element signature="e#688#689#0" expanded="false" />
<element signature="e#715#716#0" expanded="false" />
<element signature="e#755#756#0" expanded="false" />
<element signature="e#787#788#0" expanded="false" />
<element signature="e#818#819#0" expanded="false" />
<element signature="e#846#847#0" expanded="false" />
<element signature="e#887#888#0" expanded="false" />
<element signature="e#921#922#0" expanded="false" />
<element signature="e#951#952#0" expanded="false" />
<element signature="e#978#979#0" expanded="false" />
<element signature="e#1017#1018#0" expanded="false" />
<element signature="e#1049#1050#0" expanded="false" />
</folding>
</state>
</provider>
@@ -2802,7 +2929,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3014">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2810,7 +2939,28 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding />
<folding>
<element signature="e#937#938#0" expanded="false" />
<element signature="e#964#965#0" expanded="false" />
<element signature="e#1004#1005#0" expanded="false" />
<element signature="e#1036#1037#0" expanded="false" />
<element signature="e#1074#1075#0" expanded="false" />
<element signature="e#1108#1109#0" expanded="false" />
<element signature="e#1162#1163#0" expanded="false" />
<element signature="e#1208#1209#0" expanded="false" />
<element signature="e#1243#1244#0" expanded="false" />
<element signature="e#1274#1275#0" expanded="false" />
<element signature="e#1322#1323#0" expanded="false" />
<element signature="e#1362#1363#0" expanded="false" />
<element signature="e#1393#1394#0" expanded="false" />
<element signature="e#1420#1421#0" expanded="false" />
<element signature="e#1460#1461#0" expanded="false" />
<element signature="e#1492#1493#0" expanded="false" />
<element signature="e#1525#1526#0" expanded="false" />
<element signature="e#1554#1555#0" expanded="false" />
<element signature="e#1598#1599#0" expanded="false" />
<element signature="e#1634#1635#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2819,17 +2969,33 @@
<state relative-caret-position="264">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding>
<element signature="e#284#285#0" expanded="true" />
<element signature="e#315#316#0" expanded="true" />
<element signature="e#753#754#0" expanded="false" />
<element signature="e#783#784#0" expanded="false" />
<element signature="e#829#830#0" expanded="false" />
<element signature="e#867#868#0" expanded="false" />
<element signature="e#901#902#0" expanded="false" />
<element signature="e#931#932#0" expanded="false" />
<element signature="e#977#978#0" expanded="false" />
<element signature="e#1015#1016#0" expanded="false" />
<element signature="e#1049#1050#0" expanded="false" />
<element signature="e#1079#1080#0" expanded="false" />
<element signature="e#1125#1126#0" expanded="false" />
<element signature="e#1163#1164#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<state relative-caret-position="1936">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" />
<folding />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#2734#2735#0" expanded="false" />
<element signature="e#2776#2777#0" expanded="false" />
<element signature="e#3668#3669#0" expanded="false" />
<element signature="e#3716#3717#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -2837,28 +3003,25 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="14" column="29" lean-forward="false" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="56" column="29" lean-forward="false" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
<folding>
<element signature="e#798#799#0" expanded="true" />
<element signature="e#829#830#0" expanded="true" />
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WifiConnect.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="133" column="34" lean-forward="true" selection-start-line="133" selection-start-column="34" selection-end-line="133" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="2662">
<caret line="137" column="13" lean-forward="false" selection-start-line="137" selection-start-column="13" selection-end-line="137" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/scorpiomiku/wifitrick/WebUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
<caret line="62" column="5" lean-forward="false" selection-start-line="62" selection-start-column="5" selection-end-line="62" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>

663
server/OldPeopleHome/.idea/workspace.xml generated
View File

@@ -8,25 +8,10 @@
<component name="ChangeListManager">
<list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/MethodUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/MethodUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/jdbc.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome.war" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/Parent.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/Parent.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/Room.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/Room.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/utils/MethodUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/utils/MethodUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/ParentController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/ParentController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/sql/add_table.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/sql/add_table.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -40,83 +25,35 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="1" column="44" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
<state relative-caret-position="99">
<caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355">
<caret line="54" selection-start-line="54" selection-end-line="57" selection-end-column="104" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="38" column="52" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1287">
<caret line="58" column="75" selection-start-line="58" selection-start-column="75" selection-end-line="58" selection-end-column="75" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1694">
<caret line="95" column="45" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="45" />
<folding>
<element signature="e#2016#2017#0" expanded="true" />
<element signature="e#2055#2056#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="109" column="21" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="21" />
<folding>
<element signature="e#1562#1563#0" expanded="true" />
<element signature="e#1608#1609#0" expanded="true" />
<element signature="e#1819#1820#0" expanded="true" />
<element signature="e#1861#1862#0" expanded="true" />
<element signature="e#2064#2065#0" expanded="true" />
<element signature="e#2104#2105#0" expanded="true" />
<element signature="e#2339#2340#0" expanded="true" />
<element signature="e#2387#2388#0" expanded="true" />
<element signature="e#2630#2631#0" expanded="true" />
<element signature="e#2680#2681#0" expanded="true" />
<element signature="e#2899#2900#0" expanded="true" />
<element signature="e#2943#2944#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/ChildParent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-231">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-993">
<caret line="13" column="21" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="62" column="29" selection-start-line="62" selection-start-column="29" selection-end-line="62" selection-end-column="29" />
<state relative-caret-position="759">
<caret line="31" column="14" lean-forward="true" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
</state>
</provider>
</entry>
@@ -124,68 +61,53 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<state relative-caret-position="-75">
<caret line="194" column="21" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<caret line="24" column="63" selection-start-line="24" selection-start-column="63" selection-end-line="24" selection-end-column="63" />
<folding>
<element signature="e#2605#2606#0" expanded="true" />
<element signature="e#2645#2646#0" expanded="true" />
<element signature="e#2604#2605#0" expanded="true" />
<element signature="e#2639#2640#0" expanded="true" />
<element signature="e#2783#2784#0" expanded="true" />
<element signature="e#2831#2832#0" expanded="true" />
<element signature="e#2881#2882#0" expanded="true" />
<element signature="e#2929#2930#0" expanded="true" />
<element signature="e#3058#3059#0" expanded="true" />
<element signature="e#3102#3103#0" expanded="true" />
<element signature="e#3148#3149#0" expanded="true" />
<element signature="e#3192#3193#0" expanded="true" />
<element signature="e#3317#3318#0" expanded="true" />
<element signature="e#3359#3360#0" expanded="true" />
<element signature="e#3403#3404#0" expanded="true" />
<element signature="e#3445#3446#0" expanded="true" />
<element signature="e#3586#3587#0" expanded="true" />
<element signature="e#3636#3637#0" expanded="true" />
<element signature="e#3688#3689#0" expanded="true" />
<element signature="e#3738#3739#0" expanded="true" />
<element signature="e#3883#3884#0" expanded="true" />
<element signature="e#3935#3936#0" expanded="true" />
<element signature="e#3989#3990#0" expanded="true" />
<element signature="e#4041#4042#0" expanded="true" />
<element signature="e#4178#4179#0" expanded="true" />
<element signature="e#4226#4227#0" expanded="true" />
<element signature="e#4276#4277#0" expanded="true" />
<element signature="e#4324#4325#0" expanded="true" />
<element signature="e#4461#4462#0" expanded="true" />
<element signature="e#4509#4510#0" expanded="true" />
<element signature="e#4559#4560#0" expanded="true" />
<element signature="e#4607#4608#0" expanded="true" />
<element signature="e#4621#4622#0" expanded="true" />
<element signature="e#4667#4668#0" expanded="true" />
<element signature="e#5123#5124#0" expanded="true" />
<element signature="e#5169#5170#0" expanded="true" />
<element signature="e#5403#5404#0" expanded="true" />
<element signature="e#5451#5452#0" expanded="true" />
<element signature="e#5164#5165#0" expanded="true" />
<element signature="e#5197#5198#0" expanded="true" />
<element signature="e#575#576#0" expanded="true" />
<element signature="e#641#642#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-24">
<caret line="53" column="37" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
<state relative-caret-position="990">
<caret line="30" column="48" selection-start-line="30" selection-start-column="48" selection-end-line="30" selection-end-column="48" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-16">
<caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
<state relative-caret-position="1023">
<caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
</state>
</provider>
</entry>
@@ -211,8 +133,8 @@
<find>energy</find>
<find>rat2e</find>
<find>longtitude</find>
<find>mySet</find>
<find>myset</find>
<find>mySet</find>
</findStrings>
<replaceStrings>
<replace>utf8_general_ci</replace>
@@ -230,11 +152,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/RoomStateDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Admin.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml" />
@@ -253,7 +170,6 @@
<option value="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" />
@@ -267,7 +183,6 @@
<option value="$PROJECT_DIR$/src/main/resources/mapper/LocationDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/LocationController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Location.java" />
<option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java" />
@@ -276,11 +191,18 @@
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/MethodUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/spring-web.xml" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml" />
</list>
</option>
</component>
@@ -299,10 +221,10 @@
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1910" />
<option name="y" value="-10" />
<option name="width" value="1939" />
<option name="height" value="1049" />
<option name="x" value="1911" />
<option name="y" value="-9" />
<option name="width" value="1938" />
<option name="height" value="1048" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -310,7 +232,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -353,24 +274,6 @@
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
<item name="utils" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -400,12 +303,44 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
<item name="service" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -415,13 +350,14 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567861651518" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1568179954303" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -450,7 +386,7 @@
</option>
</component>
<component name="RunManager" selected="Tomcat Server.chuizichui">
<configuration name="AdminServiceTest.testLogin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<configuration name="ChildParentServiceTest.add" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
<pattern>
@@ -459,8 +395,8 @@
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.oldpeoplehome.service" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.service.AdminServiceTest" />
<option name="METHOD_NAME" value="testLogin" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.service.ChildParentServiceTest" />
<option name="METHOD_NAME" value="add" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
@@ -482,22 +418,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="HeartRateServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.oldpeoplehome.service.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.oldpeoplehome.service" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.service.HeartRateServiceTest" />
<option name="METHOD_NAME" value="test" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="LocationServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
@@ -514,6 +434,22 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ParentServiceTest.delete" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.oldpeoplehome.service.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.oldpeoplehome.service" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.service.ParentServiceTest" />
<option name="METHOD_NAME" value="delete" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="RoomServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
@@ -604,20 +540,20 @@
</method>
</configuration>
<list>
<item itemvalue="JUnit.HeartRateServiceTest.test" />
<item itemvalue="JUnit.AdminServiceTest.testLogin" />
<item itemvalue="JUnit.ChildParentServiceTest.test" />
<item itemvalue="JUnit.LocationServiceTest.test" />
<item itemvalue="JUnit.RoomServiceTest.test" />
<item itemvalue="JUnit.ParentServiceTest.delete" />
<item itemvalue="Tomcat Server.chuizichui" />
<item itemvalue="JUnit.ChildParentServiceTest.add" />
</list>
<recent_temporary>
<list>
<item itemvalue="JUnit.ChildParentServiceTest.add" />
<item itemvalue="JUnit.ParentServiceTest.delete" />
<item itemvalue="JUnit.RoomServiceTest.test" />
<item itemvalue="JUnit.LocationServiceTest.test" />
<item itemvalue="JUnit.ChildParentServiceTest.test" />
<item itemvalue="JUnit.HeartRateServiceTest.test" />
<item itemvalue="JUnit.AdminServiceTest.testLogin" />
</list>
</recent_temporary>
</component>
@@ -659,20 +595,15 @@
<workItem from="1567739536607" duration="4839000" />
<workItem from="1567777529260" duration="871000" />
<workItem from="1567824861214" duration="7220000" />
<workItem from="1567907291757" duration="4108000" />
<workItem from="1567907291757" duration="5874000" />
<workItem from="1567991841988" duration="1149000" />
<workItem from="1568017526948" duration="1787000" />
<workItem from="1568101339445" duration="2643000" />
<workItem from="1568170909395" duration="2350000" />
</task>
<servers />
</component>
<component name="TestHistory">
<history-entry file="LocationServiceTest_test - 2019.09.06 at 13h 41m 32s.xml">
<configuration name="LocationServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="LocationServiceTest_test - 2019.09.06 at 13h 45m 31s.xml">
<configuration name="LocationServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="LocationServiceTest_test - 2019.09.06 at 13h 46m 32s.xml">
<configuration name="LocationServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="LocationServiceTest_test - 2019.09.06 at 13h 47m 23s.xml">
<configuration name="LocationServiceTest.test" configurationId="JUnit" />
</history-entry>
@@ -694,9 +625,18 @@
<history-entry file="RoomServiceTest_test - 2019.09.07 at 11h 12m 55s.xml">
<configuration name="RoomServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="ParentServiceTest_delete - 2019.09.10 at 15h 51m 27s.xml">
<configuration name="ParentServiceTest.delete" configurationId="JUnit" />
</history-entry>
<history-entry file="ChildParentServiceTest_add - 2019.09.11 at 13h 17m 30s.xml">
<configuration name="ChildParentServiceTest.add" configurationId="JUnit" />
</history-entry>
<history-entry file="ChildParentServiceTest_add - 2019.09.11 at 13h 18m 10s.xml">
<configuration name="ChildParentServiceTest.add" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="157481000" />
<option name="totallyTimeSpent" value="167176000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -711,7 +651,7 @@
<frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23927614" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25268096" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@@ -785,84 +725,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="37" column="37" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2046">
<caret line="79" column="5" selection-start-line="79" selection-start-column="5" selection-end-line="79" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1386">
<caret line="52" column="40" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildParentService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429">
<caret line="17" selection-start-line="17" selection-end-line="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
<caret line="21" selection-start-line="21" selection-end-line="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
<caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="858">
<caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/AdminDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429">
<caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
@@ -982,13 +844,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomStateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1551">
@@ -1043,13 +898,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429">
<caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
@@ -1081,13 +929,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355">
<caret line="33" selection-start-line="33" selection-end-line="34" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -1136,118 +977,33 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-24">
<caret line="53" column="37" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-16">
<caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="1" column="44" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="194" column="21" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="21" />
<folding>
<element signature="e#2605#2606#0" expanded="true" />
<element signature="e#2645#2646#0" expanded="true" />
<element signature="e#2604#2605#0" expanded="true" />
<element signature="e#2639#2640#0" expanded="true" />
<element signature="e#2783#2784#0" expanded="true" />
<element signature="e#2831#2832#0" expanded="true" />
<element signature="e#2881#2882#0" expanded="true" />
<element signature="e#2929#2930#0" expanded="true" />
<element signature="e#3058#3059#0" expanded="true" />
<element signature="e#3102#3103#0" expanded="true" />
<element signature="e#3148#3149#0" expanded="true" />
<element signature="e#3192#3193#0" expanded="true" />
<element signature="e#3317#3318#0" expanded="true" />
<element signature="e#3359#3360#0" expanded="true" />
<element signature="e#3403#3404#0" expanded="true" />
<element signature="e#3445#3446#0" expanded="true" />
<element signature="e#3586#3587#0" expanded="true" />
<element signature="e#3636#3637#0" expanded="true" />
<element signature="e#3688#3689#0" expanded="true" />
<element signature="e#3738#3739#0" expanded="true" />
<element signature="e#3883#3884#0" expanded="true" />
<element signature="e#3935#3936#0" expanded="true" />
<element signature="e#3989#3990#0" expanded="true" />
<element signature="e#4041#4042#0" expanded="true" />
<element signature="e#4178#4179#0" expanded="true" />
<element signature="e#4226#4227#0" expanded="true" />
<element signature="e#4276#4277#0" expanded="true" />
<element signature="e#4324#4325#0" expanded="true" />
<element signature="e#4461#4462#0" expanded="true" />
<element signature="e#4509#4510#0" expanded="true" />
<element signature="e#4559#4560#0" expanded="true" />
<element signature="e#4607#4608#0" expanded="true" />
<element signature="e#4621#4622#0" expanded="true" />
<element signature="e#4667#4668#0" expanded="true" />
<element signature="e#5123#5124#0" expanded="true" />
<element signature="e#5169#5170#0" expanded="true" />
<element signature="e#5403#5404#0" expanded="true" />
<element signature="e#5451#5452#0" expanded="true" />
<element signature="e#5164#5165#0" expanded="true" />
<element signature="e#5197#5198#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1694">
<state relative-caret-position="2244">
<caret line="95" column="45" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="45" />
<folding>
<element signature="e#2016#2017#0" expanded="true" />
<element signature="e#2055#2056#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<state relative-caret-position="2343">
<caret line="109" column="21" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="21" />
<folding>
<element signature="e#1562#1563#0" expanded="true" />
<element signature="e#1608#1609#0" expanded="true" />
<element signature="e#1819#1820#0" expanded="true" />
<element signature="e#1861#1862#0" expanded="true" />
<element signature="e#2064#2065#0" expanded="true" />
<element signature="e#2104#2105#0" expanded="true" />
<element signature="e#2339#2340#0" expanded="true" />
<element signature="e#2387#2388#0" expanded="true" />
<element signature="e#2630#2631#0" expanded="true" />
<element signature="e#2680#2681#0" expanded="true" />
<element signature="e#2899#2900#0" expanded="true" />
<element signature="e#2943#2944#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/ChildParent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-231">
<state relative-caret-position="198">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-dao.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-993">
<state relative-caret-position="429">
<caret line="13" column="21" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="21" />
<folding>
<element signature="imports" expanded="true" />
@@ -1257,15 +1013,126 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<state relative-caret-position="1518">
<caret line="62" column="29" selection-start-line="62" selection-start-column="29" selection-end-line="62" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomStateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1038">
<caret line="53" column="37" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1716">
<caret line="52" column="21" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1287">
<caret line="58" column="75" selection-start-line="58" selection-start-column="75" selection-end-line="58" selection-end-column="75" />
<state relative-caret-position="1914">
<caret line="77" column="39" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5412">
<caret line="164" selection-start-line="164" selection-end-line="164" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="990">
<caret line="30" column="48" selection-start-line="30" selection-start-column="48" selection-end-line="30" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1023">
<caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<caret line="24" column="63" selection-start-line="24" selection-start-column="63" selection-end-line="24" selection-end-column="63" />
<folding>
<element signature="e#575#576#0" expanded="true" />
<element signature="e#641#642#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355">
<caret line="54" selection-start-line="54" selection-end-line="57" selection-end-column="104" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="38" column="52" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75">
<caret line="194" column="21" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="759">
<caret line="31" column="14" lean-forward="true" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
</state>
</provider>
</entry>

1
server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
View File

@@ -20,7 +20,6 @@ public class Parent {
private String parentPhone;
private int parentRoomId;
private Room parentRoom;
private Child child;
public Parent() {
}

40
server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java Normal file
View File

@@ -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() {}
}

25
server/OldPeopleHome/src/main/resources/mapper/ChildParentDao.xml
View File

@@ -15,15 +15,6 @@
<result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
<result column="birth" property="parentBirth" jdbcType="DATE"/>
<result column="phone" property="parentPhone" jdbcType="CHAR"/>
<association property="child" javaType="Child">
<id column="cid" property="childId" jdbcType="BIGINT"/>
<result column="clongid" property="childLongId" jdbcType="CHAR"/>
<result column="cname" property="childName" jdbcType="VARCHAR"/>
<result column="csex" property="childSex" jdbcType="VARCHAR"/>
<result column="caccount" property="childAccount" jdbcType="VARCHAR"/>
<result column="cpassword" property="childPassword" jdbcType="VARCHAR"/>
<result column="cphone" property="childPhone" jdbcType="VARCHAR"/>
</association>
</resultMap>
<resultMap id="ChildResultMap" type="com.oldpeoplehome.entity.Child">
<id column="id" property="childId" jdbcType="BIGINT"/>
@@ -33,24 +24,12 @@
<result column="account" property="childAccount" jdbcType="VARCHAR"/>
<result column="password" property="childPassword" jdbcType="VARCHAR"/>
<result column="phone" property="childPhone" jdbcType="VARCHAR"/>
<association property="parent" javaType="Parent">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="plongid" property="parentLongId" jdbcType="CHAR"/>
<result column="pname" property="parentName" jdbcType="VARCHAR"/>
<result column="psex" property="parentSex" jdbcType="VARCHAR"/>
<result column="paccount" property="parentAccount" jdbcType="VARCHAR"/>
<result column="ppassword" property="parentPassword" jdbcType="VARCHAR"/>
<result column="pheight" property="parentHeight" jdbcType="DOUBLE"/>
<result column="pweight" property="parentWeight" jdbcType="DOUBLE"/>
<result column="pbirth" property="parentBirth" jdbcType="DATE"/>
<result column="pphone" property="parentPhone" jdbcType="CHAR"/>
</association>
</resultMap>
<select id="findByChild" resultMap="ParentResultMap" parameterType="long">
select c.*, p.* from cp c left join parent p on c.pid = p.id where c.cid = #{childId}
select p.* from cp c left join parent p on c.pid = p.id where c.cid = #{childId}
</select>
<select id="findByParent" resultMap="ChildResultMap" parameterType="long">
select c.*, p.* from cp c left join child p on c.pid = p.id where c.pid = #{parentId}
select p.*from cp c left join child p on c.pid = p.id where c.pid = #{parentId}
</select>
<insert id="insert" parameterType="ChildParent">
insert into cp(pid, cid, relation)

11
server/OldPeopleHome/src/main/resources/spring/spring-web.xml
View File

@@ -22,6 +22,15 @@
-->
<mvc:default-servlet-handler/>
<!-- 接口跨域配置 -->
<mvc:cors>
<mvc:mapping path="/**"
allowed-origins="*"
allowed-methods="POST, GET, OPTIONS, DELETE, PUT"
allowed-headers="Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With"
allow-credentials="true" />
</mvc:cors>
<!-- 3.配置jsp 显示ViewResolver -->
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
@@ -34,4 +43,6 @@
<context:component-scan base-package="com.oldpeoplehome">
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
</context:component-scan>
</beans>

4
server/OldPeopleHome/src/main/sql/add_table.sql
View File

@@ -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,

14
server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
View File

@@ -34,8 +34,22 @@
<param-value>true</param-value>
</init-param>
</filter>
<filter>
<filter-name>SimpleCORSFilter</filter-name>
<filter-class>com.oldpeoplehome.utils.SimpleCORSFilter</filter-class>
<init-param>
<param-name>IsCross</param-name>
<param-value>true</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>SpringEncodingFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>SimpleCORSFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
</web-app>

5
server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java
View File

@@ -20,4 +20,9 @@ public class ChildParentServiceTest extends BaseTest {
childParentService.combine(childParent);
}
@Test
public void add(){
System.out.println(childParentService.findByParent(1));
}
}

5
server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
View File

@@ -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());
}
}

BIN
server/OldPeopleHome/target/OldPeopleHome.war Normal file
View File

Binary file not shown.

5
server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF Normal file
View File

@@ -0,0 +1,5 @@
Manifest-Version: 1.0
Built-By: Jiangyuwei
Created-By: IntelliJ IDEA
Build-Jdk: 1.8.0_161

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/AdminDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildParentDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/HeartRateDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/LocationDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/MotionDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomStateDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/SleepDao.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/ChangeRoom.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/HeartRateFilter.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/LocationFilter.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/MotionFilter.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/RoomStateFilter.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/SleepFilter.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Admin.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Child.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/ChildParent.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Location.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/RoomState.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Sleep.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/AdminService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildParentService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/HeartRateService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/LocationService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/MotionService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomStateService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/SleepService.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/AdminController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/LocationController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomStateController.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/SleepController.class Normal file
View File

Binary file not shown.

4
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties Normal file
View File

@@ -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

13
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="true">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are by default assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="debug">
<appender-ref ref="STDOUT" />
</root>
</configuration>

16
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/AdminDao.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.AdminDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Admin">
<result column="account" property="adminAccount" jdbcType="VARCHAR"/>
<result column="password" property="adminPassword" jdbcType="VARCHAR"/>
</resultMap>
<select id="findByAccount" resultMap="BaseResultMap" parameterType="String">
select * from admin where account=#{account}
</select>
</mapper>

53
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.ChildDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Child">
<id column="id" property="childId" jdbcType="BIGINT"/>
<result column="longid" property="childLongId" jdbcType="CHAR"/>
<result column="name" property="childName" jdbcType="VARCHAR"/>
<result column="sex" property="childSex" jdbcType="VARCHAR"/>
<result column="account" property="childAccount" jdbcType="VARCHAR"/>
<result column="password" property="childPassword" jdbcType="VARCHAR"/>
<result column="phone" property="childPhone" jdbcType="VARCHAR"/>
</resultMap>
<select id="findById" resultMap="BaseResultMap" parameterType="long">
select * from child where id = #{childId}
</select>
<select id="findByLongId" resultMap="BaseResultMap" parameterType="String">
select * from child where longid = #{childLongId}
</select>
<select id="findByName" resultMap="BaseResultMap" parameterType="String">
select * from child where name = #{childName}
</select>
<select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
select * from child where account = #{childAccount}
</select>
<select id="findAll" resultMap="BaseResultMap">
select * from child
</select>
<insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="childId" parameterType="Child">
insert into child(longid,name,sex,account,password,phone)
values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone})
</insert>
<delete id="delete" parameterType="long">
delete from child where id = #{childId}
</delete>
<update id="update" parameterType="Child">
update child
set longid = #{childLongId},
name = #{childName},
sex = #{childSex},
account = #{childAccount},
password = #{childPassword},
phone = #{childPhone}
where id =#{childId}
</update>
</mapper>

38
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildParentDao.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.ChildParentDao">
<resultMap id="ParentResultMap" type="com.oldpeoplehome.entity.Parent">
<id column="id" property="parentId" jdbcType="BIGINT"/>
<result column="longid" property="parentLongId" jdbcType="CHAR"/>
<result column="name" property="parentName" jdbcType="VARCHAR"/>
<result column="sex" property="parentSex" jdbcType="VARCHAR"/>
<result column="account" property="parentAccount" jdbcType="VARCHAR"/>
<result column="password" property="parentPassword" jdbcType="VARCHAR"/>
<result column="height" property="parentHeight" jdbcType="DOUBLE"/>
<result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
<result column="birth" property="parentBirth" jdbcType="DATE"/>
<result column="phone" property="parentPhone" jdbcType="CHAR"/>
</resultMap>
<resultMap id="ChildResultMap" type="com.oldpeoplehome.entity.Child">
<id column="id" property="childId" jdbcType="BIGINT"/>
<result column="longid" property="childLongId" jdbcType="CHAR"/>
<result column="name" property="childName" jdbcType="VARCHAR"/>
<result column="sex" property="childSex" jdbcType="VARCHAR"/>
<result column="account" property="childAccount" jdbcType="VARCHAR"/>
<result column="password" property="childPassword" jdbcType="VARCHAR"/>
<result column="phone" property="childPhone" jdbcType="VARCHAR"/>
</resultMap>
<select id="findByChild" resultMap="ParentResultMap" parameterType="long">
select p.* from cp c left join parent p on c.pid = p.id where c.cid = #{childId}
</select>
<select id="findByParent" resultMap="ChildResultMap" parameterType="long">
select p.*from cp c left join child p on c.pid = p.id where c.pid = #{parentId}
</select>
<insert id="insert" parameterType="ChildParent">
insert into cp(pid, cid, relation)
values (#{parentId}, #{childId}, #{relation})
</insert>
</mapper>

31
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.HeartRateDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="time" property="time" jdbcType="TIMESTAMP"/>
<result column="rate" property="rate" jdbcType="DOUBLE"/>
<result column="rate1" property="rate1" jdbcType="DOUBLE"/>
<result column="rate2" property="rate2" jdbcType="DOUBLE"/>
<result column="oxy" property="oxy" jdbcType="DOUBLE"/>
</resultMap>
<select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
select *
from heartrate where pid = #{parentId}
</select>
<select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
select *
from heartrate where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d %T') between #{startDate} and #{endDate}
</select>
<select id="findByParentAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
</select>
<insert id="insert" parameterType="HeartRate">
insert into heartrate(pid, time,rate, rate1,rate2,oxy)
values (#{parentId}, #{time},#{rate}, #{rate1}, #{rate2}, #{oxy})
</insert>
</mapper>

29
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/LocationDao.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.LocationDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Location">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="longitude" property="longitude" jdbcType="BIGINT"/>
<result column="latitude" property="latitude" jdbcType="BIGINT"/>
<result column="time" property="time" jdbcType="TIMESTAMP"/>
</resultMap>
<select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
select *
from location where pid = #{parentId}
</select>
<select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
select *
from location where pid = #{parentId} and DATE_FORMAT(time,'%Y-%m-%d %T') between #{startTime} and #{endTime}
</select>
<select id="findByParentAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
select l.*, p.* from location l left join parent p on l.pid = p.id where l.pid = #{parentId} and l.date = #{startTime}
</select>
<insert id="insert" parameterType="Location">
insert into location(pid, longitude,latitude, time)
values (#{parentId}, #{longitude},#{latitude}, #{time})
</insert>
</mapper>

31
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.MotionDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Motion">
<id column="pid" property="motionParentId" jdbcType="BIGINT"/>
<result column="date" property="motionDate" jdbcType="DATE"/>
<result column="count" property="motionCount" jdbcType="BIGINT"/>
<result column="distance" property="motionDistance" jdbcType="DOUBLE"/>
<result column="energy" property="motionEnergy" jdbcType="DOUBLE"/>
<result column="time" property="motionTime" jdbcType="TIME"/>
</resultMap>
<select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
select m.*
from motion m where pid = #{motionParentId}
</select>
<select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
select *
from motion where pid = #{motionParentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
</select>
<select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
</select>
<insert id="insert" parameterType="Motion">
insert into motion(pid, date, count, distance, energy, time)
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
</insert>
</mapper>

58
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml Normal file
View File

@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.ParentDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Parent">
<id column="id" property="parentId" jdbcType="BIGINT"/>
<result column="longid" property="parentLongId" jdbcType="CHAR"/>
<result column="name" property="parentName" jdbcType="VARCHAR"/>
<result column="sex" property="parentSex" jdbcType="VARCHAR"/>
<result column="account" property="parentAccount" jdbcType="VARCHAR"/>
<result column="password" property="parentPassword" jdbcType="VARCHAR"/>
<result column="height" property="parentHeight" jdbcType="DOUBLE"/>
<result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
<result column="birth" property="parentBirth" jdbcType="DATE"/>
<result column="phone" property="parentPhone" jdbcType="CHAR"/>
<association property="parentRoom" javaType="Room">
<id column="rid" property="roomId" jdbcType="INTEGER"/>
<result column="rlocation" property="roomLocation" jdbcType="VARCHAR"/>
<result column="rname" property="roomName" jdbcType="VARCHAR"/>
</association>
</resultMap>
<select id="findByID" parameterType="long" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.id=#{parentId}
</select>
<select id="findByLongId" parameterType="String" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.longid=#{parentLongId}
</select>
<select id="findByRoomId" parameterType="int" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from room r left join parent p on p.id=r.id where r.id=#{r.roomId}
</select>
<select id="findByName" parameterType="String" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.name=#{p.parentName}
</select>
<select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.account=#{p.parentAccount}
</select>
<select id="findAll" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id
</select>
<insert id="insert" parameterType="Parent" useGeneratedKeys="true" keyColumn="id">
insert into parent(longid,name,sex,account,password,height,weight,birth,phone)
values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone})
</insert>
<update id="update" keyColumn="id">
update parent
set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}
where id=#{parentId}
</update>
<delete id="delete" parameterType="long">
delete from parent where id=#{parentId}
</delete>
</mapper>

44
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml Normal file
View File

@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.RoomDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Room">
<id column="id" property="roomId" jdbcType="INTEGER"/>
<result column="location" property="roomLocation" jdbcType="VARCHAR"/>
<result column="name" property="roomName" jdbcType="VARCHAR"/>
<result column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="temp" property="temp" jdbcType="FLOAT"/>
</resultMap>
<select id="findById" resultMap="BaseResultMap" parameterType="int">
select * from room where id = #{roomId}
</select>
<select id="findAll" resultMap="BaseResultMap">
select * from room
</select>
<select id="findEmptyRoom" resultMap="BaseResultMap">
select * from room where pid is null
</select>
<insert id="insertRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="roomId" parameterType="Room">
insert into room(location, name) values (#{roomLocation}, #{roomName})
</insert>
<delete id="deleteRoom" parameterType="int">
delete from room where id = #{roomId}
</delete>
<update id="updateRoom" parameterType="Room">
update room
set location = #{roomLocation},
name = #{roomName},
pid = #{parentId},
temp = #{temp}
where id =#{roomId}
</update>
</mapper>

30
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomStateDao.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.RoomStateDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.RoomState">
<id column="rid" property="roomId" jdbcType="BIGINT"/>
<result column="time" property="time" jdbcType="TIMESTAMP"/>
<result column="temperature" property="temperature" jdbcType="DOUBLE"/>
<result column="humidity" property="humidity" jdbcType="DOUBLE"/>
<result column="isin" property="isin" jdbcType="INTEGER"/>
</resultMap>
<select id="findByRoom" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
select *
from rstate where rid = #{roomId}
</select>
<select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
select *
from rstate where rid = #{roomId} and DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s')between #{startDate} and #{endDate}
</select>
<select id="findByRoomAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
select r.*, room.* from rstate r left join room on r.rid = room.id where r.rid = #{roomId} and r.time = #{startDate}
</select>
<insert id="insert" parameterType="RoomState">
insert into rstate(rid, time, temperature, humidity, isin)
values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin})
</insert>
</mapper>

30
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/SleepDao.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.SleepDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Sleep">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="date" property="date" jdbcType="DATE"/>
<result column="deep" property="lightTime" jdbcType="TIME"/>
<result column="light" property="deepTime" jdbcType="TIME"/>
<result column="awake" property="awakeTime" jdbcType="TIME"/>
</resultMap>
<select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
select *
from sleep where pid = #{parentId}
</select>
<select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
select *
from sleep where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
</select>
<select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
select s.*, p.* from sleep s left join parent p on s.pid = p.id where s.pid = #{parentId} and s.date = #{startDate}
</select>
<insert id="insert" parameterType="Sleep">
insert into sleep(pid, date, deep, light, awake)
values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime})
</insert>
</mapper>

Some files were not shown because too many files have changed in this diff Show More