diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index b771d8e..a3cd406 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -6,7 +6,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17,94 +38,19 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -112,12 +58,138 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -139,6 +211,8 @@
energy
rat2e
longtitude
+ mySet
+ myset
utf8_general_ci
@@ -156,16 +230,6 @@
@@ -225,10 +299,10 @@
-
-
-
-
+
+
+
+
@@ -236,7 +310,6 @@
-
@@ -278,7 +351,7 @@
-
+
@@ -593,14 +656,14 @@
-
+
+
+
+
-
-
-
@@ -628,9 +691,12 @@
+
+
+
-
+
@@ -643,8 +709,9 @@
+
-
+
@@ -718,125 +785,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -881,13 +829,6 @@
-
-
-
-
-
-
-
@@ -905,20 +846,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -987,13 +914,6 @@
-
-
-
-
-
-
-
@@ -1004,16 +924,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1079,16 +989,9 @@
-
-
-
-
-
-
-
-
+
@@ -1096,71 +999,276 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java
index 8c94ca7..236b679 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java
@@ -22,4 +22,5 @@ public interface RoomDao {
int updateRoom(Room room);
+
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Child.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Child.java
index a83c3eb..c63c756 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Child.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Child.java
@@ -52,6 +52,9 @@ public class Child {
public void setChildLongId(String childLongId) {
this.childLongId = childLongId;
}
+ public void mySetChildLongId(String childLongId) {
+ this.childLongId = childLongId;
+ }
public String getChildName() {
return childName;
@@ -60,6 +63,9 @@ public class Child {
public void setChildName(String childName) {
this.childName = childName;
}
+ public void mySetChildName(String childName) {
+ this.childName = childName;
+ }
public String getChildSex() {
return childSex;
@@ -68,6 +74,9 @@ public class Child {
public void setChildSex(String childSex) {
this.childSex = childSex;
}
+ public void mySetChildSex(String childSex) {
+ this.childSex = childSex;
+ }
public String getChildAccount() {
return childAccount;
@@ -76,6 +85,9 @@ public class Child {
public void setChildAccount(String childAccount) {
this.childAccount = childAccount;
}
+ public void mySetChildAccount(String childAccount) {
+ this.childAccount = childAccount;
+ }
public String getChildPassword() {
return childPassword;
@@ -84,6 +96,9 @@ public class Child {
public void setChildPassword(String childPassword) {
this.childPassword = childPassword;
}
+ public void mySetChildPassword(String childPassword) {
+ this.childPassword = childPassword;
+ }
public String getChildPhone() {
return childPhone;
@@ -92,6 +107,9 @@ public class Child {
public void setChildPhone(String childPhone) {
this.childPhone = childPhone;
}
+ public void mySetChildPhone(String childPhone) {
+ this.childPhone = childPhone;
+ }
@Override
public String toString() {
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
index 72cb137..113a3d7 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
@@ -49,6 +49,7 @@ public class Parent {
this.parentBirth = parentBirth;
this.parentPhone = parentPhone;
}
+
public Parent(Long parentId, String parentLongId, String parentName, String parentSex, String parentAccount, String parentPassword, Double parentHeight, Double parentWeight, Date parentBirth, String parentPhone) {
this.parentId = parentId;
this.parentLongId = parentLongId;
@@ -70,6 +71,10 @@ public class Parent {
this.parentId = parentId;
}
+ public void mySetParentId(String parentId) {
+ this.parentId = Long.valueOf(parentId);
+ }
+
public String getParentLongId() {
return parentLongId;
}
@@ -78,6 +83,10 @@ public class Parent {
this.parentLongId = parentLongId;
}
+ public void mySetParentLongId(String parentLongId) {
+ this.parentLongId = parentLongId;
+ }
+
public String getParentName() {
return parentName;
}
@@ -86,6 +95,10 @@ public class Parent {
this.parentName = parentName;
}
+ public void mySetParentName(String parentName) {
+ this.parentName = parentName;
+ }
+
public String getParentSex() {
return parentSex;
}
@@ -94,6 +107,10 @@ public class Parent {
this.parentSex = parentSex;
}
+ public void mySetParentSex(String parentSex) {
+ this.parentSex = parentSex;
+ }
+
public String getParentAccount() {
return parentAccount;
}
@@ -102,6 +119,10 @@ public class Parent {
this.parentAccount = parentAccount;
}
+ public void mySetParentAccount(String parentAccount) {
+ this.parentAccount = parentAccount;
+ }
+
public String getParentPassword() {
return parentPassword;
}
@@ -110,6 +131,10 @@ public class Parent {
this.parentPassword = parentPassword;
}
+ public void mySetParentPassword(String parentPassword) {
+ this.parentPassword = parentPassword;
+ }
+
public double getParentHeight() {
return parentHeight;
}
@@ -118,6 +143,10 @@ public class Parent {
this.parentHeight = parentHeight;
}
+ public void mySetParentHeight(String parentHeight) {
+ this.parentHeight = Double.valueOf(parentHeight);
+ }
+
public double getParentWeight() {
return parentWeight;
}
@@ -126,6 +155,11 @@ public class Parent {
this.parentWeight = parentWeight;
}
+ public void mySetParentWeight(String parentWeight) {
+ this.parentWeight = Double.valueOf(parentWeight);
+ }
+
+
public Date getParentBirth() {
return parentBirth;
}
@@ -133,7 +167,8 @@ public class Parent {
public void setParentBirth(Date parentBirth) {
this.parentBirth = parentBirth;
}
- public void setParentBirth(String parentBirth) {
+
+ public void mySetParentBirth(String parentBirth) {
this.parentBirth = Date.valueOf(parentBirth);
}
@@ -145,6 +180,10 @@ public class Parent {
this.parentPhone = parentPhone;
}
+ public void mySetParentPhone(String parentPhone) {
+ this.parentPhone = parentPhone;
+ }
+
public int getParentRoomId() {
return parentRoomId;
}
@@ -153,6 +192,11 @@ public class Parent {
this.parentRoomId = parentRoomId;
}
+ public void mySetParentRoomId(String parentRoomId) {
+ this.parentRoomId = Integer.valueOf(parentRoomId);
+ }
+
+
public Room getParentRoom() {
return parentRoom;
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
index c1bc353..c1a7faa 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
@@ -11,6 +11,7 @@ public class Room {
private String roomName;
private long parentId;
private Parent parent;
+ private float temp;
public Room() {
}
@@ -18,19 +19,27 @@ public class Room {
public Room(String roomLocation, String roomName) {
this.roomLocation = roomLocation;
this.roomName = roomName;
+
+ }
+ public Room(String roomLocation, String roomName, float temp) {
+ this.roomLocation = roomLocation;
+ this.roomName = roomName;
+ this.temp = temp;
}
- public Room(String roomLocation, String roomName, Long parentId) {
+ public Room(String roomLocation, String roomName, Long parentId, float temp) {
this.roomLocation = roomLocation;
this.roomName = roomName;
this.parentId = parentId;
+ this.temp = temp;
}
- public Room(Integer roomId, String roomLocation, String roomName, Long parentId) {
+ public Room(Integer roomId, String roomLocation, String roomName, Long parentId, float temp) {
this.roomId = roomId;
this.roomName = roomName;
this.roomLocation = roomLocation;
this.parentId = parentId;
+ this.temp = temp;
}
public int getRoomId() {
@@ -65,6 +74,28 @@ public class Room {
this.parentId = parentId;
}
+ public float getTemp() {
+ return temp;
+ }
+
+ public void setTemp(float temp) {
+ this.temp = temp;
+ }
+ public void mySetTemp(String temp) {
+ this.temp = Float.valueOf(temp);
+ }
+
+ public void mySetRoomName(String roomName){
+ this.roomName = roomName;
+ }
+ public void mySetRoomLocation(String roomLocation) {
+ this.roomLocation = roomLocation;
+ }
+
+ public void mySetParentId(String parentId) {
+ this.parentId = Long.valueOf(parentId);
+ }
+
@Override
public String toString() {
return "Room{" +
@@ -73,6 +104,7 @@ public class Room {
", roomName='" + roomName + '\'' +
", parentId=" + parentId +
", parent=" + parent +
+ ", temp=" + temp +
'}';
}
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java
index 9ec8bcc..24fbb2f 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java
@@ -21,4 +21,5 @@ public interface RoomService {
int delete(int roomId);
+
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java
index 6718b80..f833aa6 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java
@@ -48,4 +48,5 @@ public class RoomServiceImpl implements RoomService {
public int delete(int roomId) {
return roomDao.deleteRoom(roomId);
}
+
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java
index 0919c61..befa785 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java
@@ -13,7 +13,7 @@ public class MethodUtil {
public static void updateFields(Object obj, Map params)throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
Class pClass = obj.getClass();
for (Map.Entry entry: params.entrySet()){
- Method method = pClass.getMethod("set" + StringUtil.capital(entry.getKey()), entry.getValue().getClass());
+ Method method = pClass.getMethod("mySet" + StringUtil.capital(entry.getKey()), entry.getValue().getClass());
method.invoke(obj, entry.getValue());
}
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
index 7ea8d0f..f788bdb 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
@@ -56,7 +56,7 @@ public class ParentController {
parent.setParentPassword(String.valueOf(params.get("parentPassword")));
parent.setParentAccount(String.valueOf(params.get("parentAccount")));
parent.setParentName(String.valueOf(params.get("parentName")));
- parent.setParentBirth(String.valueOf(params.get("parentBirth")));
+ parent.mySetParentBirth(String.valueOf(params.get("parentBirth")));
parent.setParentLongId(String.valueOf(params.get("parentLongId")));
parentService.insert(parent);
return parentService.findByLongId(parent.getParentLongId());
diff --git a/server/OldPeopleHome/src/main/resources/jdbc.properties b/server/OldPeopleHome/src/main/resources/jdbc.properties
index e9eb37f..1ca04db 100644
--- a/server/OldPeopleHome/src/main/resources/jdbc.properties
+++ b/server/OldPeopleHome/src/main/resources/jdbc.properties
@@ -1,4 +1,4 @@
jdbc.driver=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
jdbc.username=root
-jdbc.password=root
+jdbc.password=
diff --git a/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml b/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
index 5e3820a..bf4a273 100644
--- a/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
+++ b/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
@@ -9,6 +9,7 @@
+