diff --git a/server/OldPeopleHome/.idea/uiDesigner.xml b/server/OldPeopleHome/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/server/OldPeopleHome/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index 8789726..5261f1d 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -1,17 +1,37 @@
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -20,55 +40,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -76,11 +54,50 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,8 +105,8 @@
-
-
+
+
@@ -97,6 +114,15 @@
+
+
+
+
+
+
+
+
+
@@ -107,6 +133,12 @@
+
+
+ setRoomName
+ ***
+
+
@@ -116,17 +148,37 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
@@ -246,8 +315,8 @@
-
-
+
+
@@ -256,28 +325,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -287,17 +358,132 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -312,50 +498,65 @@
1566183440564
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -365,8 +566,43 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -378,6 +614,7 @@
+
@@ -387,36 +624,12 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -438,87 +651,212 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -527,18 +865,53 @@
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ParentDao.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ParentDao.java
new file mode 100644
index 0000000..1a2108e
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ParentDao.java
@@ -0,0 +1,23 @@
+package com.oldpeoplehome.dao;
+
+import com.oldpeoplehome.entity.Parent;
+
+import java.awt.print.PrinterAbortException;
+import java.util.List;
+
+/**
+ * Created By Jiangyuwei on 2019/8/20 13:27
+ * Description:
+ */
+public interface ParentDao {
+
+ Parent findByID(long id);
+ Parent findByLongId(String longId);
+ Parent findByRoomId(int roomId);
+ Parent findByName(String name);
+ List findAll();
+ void insert(Parent parent);
+ void update(Parent parent);
+ void delete(long id);
+
+}
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 a33cb29..15dcdae 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java
@@ -14,8 +14,11 @@ public interface RoomDao {
//查所有房间
List findAll();
//添加房间
- Room insertRoom(Room room);
-
+ int insertRoom(Room room);
+ //删除房间
+ int deleteRoom(int roomId);
+ //更新
+ int updateRoom(Room room);
}
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 e4987be..cfdcd4c 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
@@ -9,7 +9,7 @@ import java.sql.Date;
public class Parent {
private long parentId;
- private long parentLongId;
+ private String parentLongId;
private String parentName;
private String parentSex;
private String parentAccount;
@@ -17,13 +17,27 @@ public class Parent {
private double parentHeight;
private double parentWeight;
private Date parentBirth;
- private long parentPhone;
+ private String parentPhone;
private int parentRoomId;
+ private Room parentRoom;
public Parent() {
}
- public Parent(long parentId, long parentLongId, String parentName, String parentSex, String parentAccount, String parentPassword, double parentHeight, double parentWeight, Date parentBirth, long parentPhone, int parentRoomId) {
+ public Parent(String parentLongId, String parentName, String parentSex, String parentAccount, String parentPassword, Double parentHeight, Double parentWeight, Date parentBirth, String parentPhone, Integer parentRoomId, Room parentRoom) {
+ this.parentLongId = parentLongId;
+ this.parentName = parentName;
+ this.parentSex = parentSex;
+ this.parentAccount = parentAccount;
+ this.parentPassword = parentPassword;
+ this.parentHeight = parentHeight;
+ this.parentWeight = parentWeight;
+ this.parentBirth = parentBirth;
+ this.parentPhone = parentPhone;
+ this.parentRoomId = parentRoomId;
+ this.parentRoom = parentRoom;
+ }
+ public Parent(Long parentId, String parentLongId, String parentName, String parentSex, String parentAccount, String parentPassword, Double parentHeight, Double parentWeight, Date parentBirth, String parentPhone, Integer parentRoomId, Room parentRoom) {
this.parentId = parentId;
this.parentLongId = parentLongId;
this.parentName = parentName;
@@ -35,21 +49,22 @@ public class Parent {
this.parentBirth = parentBirth;
this.parentPhone = parentPhone;
this.parentRoomId = parentRoomId;
+ this.parentRoom = parentRoom;
}
public long getParentId() {
return parentId;
}
- public void setParentId(long parentId) {
+ public void setParentId(Long parentId) {
this.parentId = parentId;
}
- public long getParentLongId() {
+ public String getParentLongId() {
return parentLongId;
}
- public void setParentLongId(long parentLongId) {
+ public void setParentLongId(String parentLongId) {
this.parentLongId = parentLongId;
}
@@ -89,7 +104,7 @@ public class Parent {
return parentHeight;
}
- public void setParentHeight(double parentHeight) {
+ public void setParentHeight(Double parentHeight) {
this.parentHeight = parentHeight;
}
@@ -97,7 +112,7 @@ public class Parent {
return parentWeight;
}
- public void setParentWeight(double parentWeight) {
+ public void setParentWeight(Double parentWeight) {
this.parentWeight = parentWeight;
}
@@ -108,12 +123,15 @@ public class Parent {
public void setParentBirth(Date parentBirth) {
this.parentBirth = parentBirth;
}
+ public void setParentBirth(String parentBirth) {
+ this.parentBirth = Date.valueOf(parentBirth);
+ }
- public long getParentPhone() {
+ public String getParentPhone() {
return parentPhone;
}
- public void setParentPhone(long parentPhone) {
+ public void setParentPhone(String parentPhone) {
this.parentPhone = parentPhone;
}
@@ -121,10 +139,18 @@ public class Parent {
return parentRoomId;
}
- public void setParentRoomId(int parentRoomId) {
+ public void setParentRoomId(Integer parentRoomId) {
this.parentRoomId = parentRoomId;
}
+ public Room getParentRoom() {
+ return parentRoom;
+ }
+
+ public void setParentRoom(Room parentRoom) {
+ this.parentRoom = parentRoom;
+ }
+
@Override
public String toString() {
return "Parent{" +
@@ -139,6 +165,7 @@ public class Parent {
", parentBirth=" + parentBirth +
", parentPhone=" + parentPhone +
", parentRoomId=" + parentRoomId +
+ ", parentRoom=" + 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 b43ade0..9f63596 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
@@ -13,7 +13,12 @@ public class Room {
public Room() {
}
- public Room(int roomId, String roomLocation, String roomName) {
+ public Room(String roomLocation, String roomName) {
+ this.roomLocation = roomLocation;
+ this.roomName = roomName;
+ }
+
+ public Room(Integer roomId, String roomLocation, String roomName) {
this.roomId = roomId;
this.roomName = roomName;
this.roomLocation = roomLocation;
@@ -23,7 +28,7 @@ public class Room {
return roomId;
}
- public void setRoomId(int roomId) {
+ public void setRoomId(Integer roomId) {
this.roomId = roomId;
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ParentService.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ParentService.java
new file mode 100644
index 0000000..142e21d
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ParentService.java
@@ -0,0 +1,20 @@
+package com.oldpeoplehome.service;
+
+import com.oldpeoplehome.entity.Parent;
+
+import java.util.List;
+
+/**
+ * Created By Jiangyuwei on 2019/8/20 18:07
+ * Description:
+ */
+public interface ParentService {
+ Parent findByID(long id);
+ Parent findByLongId(String longId);
+ Parent findByRoomId(int roomId);
+ Parent findByName(String name);
+ List findAll();
+ void insert(Parent parent);
+ void update(Parent parent);
+ void delete(long id);
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java
new file mode 100644
index 0000000..4bde3bd
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java
@@ -0,0 +1,23 @@
+package com.oldpeoplehome.service;
+
+import com.oldpeoplehome.entity.Room;
+
+import java.util.List;
+
+/**
+ * Created By Jiangyuwei on 2019/8/19 21:26
+ * Description:
+ */
+public interface RoomService {
+
+ Room findById(int roomId);
+
+ List findAll();
+
+ int insert(Room room);
+
+ int update(Room room);
+
+ int delete(int roomId);
+
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java
new file mode 100644
index 0000000..1d4e4cd
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java
@@ -0,0 +1,60 @@
+package com.oldpeoplehome.service.impl;
+
+import com.oldpeoplehome.dao.ParentDao;
+import com.oldpeoplehome.entity.Parent;
+import com.oldpeoplehome.service.ParentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created By Jiangyuwei on 2019/8/20 18:08
+ * Description:
+ */
+@Service
+public class ParentServiceImpl implements ParentService {
+
+ @Autowired
+ private ParentDao parentDao;
+
+ @Override
+ public Parent findByID(long id) {
+ return parentDao.findByID(id);
+ }
+
+ @Override
+ public Parent findByLongId(String longId) {
+ return parentDao.findByLongId(longId);
+ }
+
+ @Override
+ public Parent findByRoomId(int roomId) {
+ return parentDao.findByRoomId(roomId);
+ }
+
+ @Override
+ public Parent findByName(String name) {
+ return parentDao.findByName(name);
+ }
+
+ @Override
+ public List findAll() {
+ return parentDao.findAll();
+ }
+
+ @Override
+ public void insert(Parent parent) {
+ parentDao.insert(parent);
+ }
+
+ @Override
+ public void update(Parent parent) {
+ parentDao.insert(parent);
+ }
+
+ @Override
+ public void delete(long id) {
+ parentDao.delete(id);
+ }
+}
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
new file mode 100644
index 0000000..2bed602
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java
@@ -0,0 +1,46 @@
+package com.oldpeoplehome.service.impl;
+
+import com.oldpeoplehome.dao.RoomDao;
+import com.oldpeoplehome.entity.Room;
+import com.oldpeoplehome.service.RoomService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.awt.print.Book;
+import java.util.List;
+
+/**
+ * Created By Jiangyuwei on 2019/8/19 21:27
+ * Description:
+ */
+@Service
+public class RoomServiceImpl implements RoomService {
+
+ @Autowired
+ private RoomDao roomDao;
+
+ @Override
+ public Room findById(int roomId) {
+ return roomDao.findById(roomId);
+ }
+
+ @Override
+ public List findAll() {
+ return roomDao.findAll();
+ }
+
+ @Override
+ public int insert(Room room) {
+ return roomDao.insertRoom(room);
+ }
+
+ @Override
+ public int update(Room room) {
+ return roomDao.updateRoom(room);
+ }
+
+ @Override
+ 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
new file mode 100644
index 0000000..0919c61
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java
@@ -0,0 +1,22 @@
+package com.oldpeoplehome.utils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * Created By Jiangyuwei on 2019/8/20 20:59
+ * Description:
+ */
+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.invoke(obj, entry.getValue());
+ }
+ }
+
+
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/Result.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/Result.java
new file mode 100644
index 0000000..ad72f08
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/Result.java
@@ -0,0 +1,35 @@
+package com.oldpeoplehome.utils;
+
+/**
+ * Created By Jiangyuwei on 2019/8/20 10:53
+ * Description:
+ */
+public class Result {
+
+ private static String NULL = "[]";
+
+ private boolean success;
+ private T data;
+ private String error;
+ public Result(){}
+
+ public Result(boolean success, T data) {
+ this.success = success;
+ this.data = data;
+ this.error = NULL;
+ }
+
+ public Result(boolean success, String error) {
+ this.success = success;
+ this.error = error;
+ }
+
+ @Override
+ public String toString() {
+ return "{" +
+ "success=" + success +
+ ", data=" + data +
+ ", error='" + error + '\'' +
+ '}';
+ }
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/StringUtil.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/StringUtil.java
new file mode 100644
index 0000000..83ee7bf
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/StringUtil.java
@@ -0,0 +1,14 @@
+package com.oldpeoplehome.utils;
+
+/**
+ * Created By Jiangyuwei on 2019/8/20 16:31
+ * Description:
+ */
+public class StringUtil {
+
+ public static String capital(String s){
+ s = s.substring(0, 1).toUpperCase() + s.substring(1);
+ return s;
+ }
+
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
new file mode 100644
index 0000000..53bd560
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
@@ -0,0 +1,78 @@
+package com.oldpeoplehome.web;
+
+import com.oldpeoplehome.entity.Parent;
+import com.oldpeoplehome.service.ParentService;
+import com.oldpeoplehome.utils.MethodUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created By Jiangyuwei on 2019/8/20 20:04
+ * Description:
+ */
+@RestController
+@RequestMapping("/parent")
+public class ParentController {
+
+ @Autowired
+ private ParentService parentService;
+
+ @RequestMapping("/get/{id}")
+ @ResponseBody
+ public Parent get(@PathVariable("id") String id){
+ return parentService.findByID(Long.valueOf(id));
+ }
+ @RequestMapping("/get_longid/{longid}")
+ @ResponseBody
+ public Parent getLong(@PathVariable("longid") String id){
+ return parentService.findByLongId(id);
+ }
+ @RequestMapping("/get_name/{name}")
+ @ResponseBody
+ public Parent getName(@PathVariable("name") String name){
+ return parentService.findByName(name);
+ }
+ @RequestMapping("/get_room/{room}")
+ @ResponseBody
+ public Parent getRoom(@PathVariable("room") String room){
+ return parentService.findByID(Integer.valueOf(room));
+ }
+ @RequestMapping("/list")
+ @ResponseBody
+ public List list() {
+ return parentService.findAll();
+ }
+ @RequestMapping(value = "/add", method = RequestMethod.POST)
+ @ResponseBody
+ public Parent add(Map params){
+ Parent parent = new Parent();
+ parent.setParentSex(String.valueOf(params.get("parentSex")));
+ 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.setParentRoomId(Integer.valueOf(String.valueOf(params.get("parentRoomId"))));
+ parent.setParentLongId(String.valueOf(params.get("parentLongId")));
+ parentService.insert(parent);
+ return parentService.findByLongId(parent.getParentLongId());
+ }
+ @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+ @ResponseBody
+ public Parent update(Map params, @PathVariable("id") String id) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+ Parent parent = parentService.findByID(Long.valueOf(id));
+ MethodUtil.updateFields(parent, params);
+ parentService.update(parent);
+ return parent;
+ }
+
+ @RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
+ @ResponseBody
+ public List delete(@PathVariable("id") String id){
+ parentService.delete(Long.valueOf(id));
+ return parentService.findAll();
+ }
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/RoomController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/RoomController.java
new file mode 100644
index 0000000..1272a5b
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/RoomController.java
@@ -0,0 +1,71 @@
+package com.oldpeoplehome.web;
+
+import com.oldpeoplehome.entity.Room;
+import com.oldpeoplehome.service.RoomService;
+
+import com.oldpeoplehome.utils.MethodUtil;
+import com.oldpeoplehome.utils.Result;
+import com.oldpeoplehome.utils.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created By Jiangyuwei on 2019/8/19 21:46
+ * Description:
+ */
+@RestController
+@RequestMapping("/room")
+public class RoomController {
+ @Autowired
+ private RoomService roomService;
+
+ @RequestMapping("/get/{id}")
+ @ResponseBody
+ public Room get(@PathVariable("id") String id) {
+ Room room = roomService.findById(Integer.valueOf(id));
+ System.out.println(room);
+ return room;
+ }
+
+ @RequestMapping("/list")
+ @ResponseBody
+ public List list() {
+ List list = roomService.findAll();
+ System.out.println(list);
+ return list;
+ }
+
+ @RequestMapping(value = "/add", method = RequestMethod.POST)
+ @ResponseBody
+ public Room add(@RequestParam Map param) {
+ Room room = new Room(String.valueOf(param.get("location")), String.valueOf(param.get("name")));
+ roomService.insert(room);
+ return room;
+ }
+
+ @RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
+ @ResponseBody
+ public List delete(@PathVariable("id") String id) {
+ roomService.delete(Integer.valueOf(id));
+ List list = roomService.findAll();
+ System.out.println(list);
+ return list;
+ }
+
+ @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+ @ResponseBody
+ public Room update(@RequestParam Map params, @PathVariable("id") String id) throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+ Room room = roomService.findById(Integer.valueOf(id));
+ MethodUtil.updateFields(room, params);
+ roomService.update(room);
+ return room;
+ }
+
+
+}
diff --git a/server/OldPeopleHome/src/main/resources/mapper/ParentDao.xml b/server/OldPeopleHome/src/main/resources/mapper/ParentDao.xml
new file mode 100644
index 0000000..77cd668
--- /dev/null
+++ b/server/OldPeopleHome/src/main/resources/mapper/ParentDao.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into parent(longid,name,sex,account,password,height,weight,birth,phone,room)
+ values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone}, #{parentRoomId})
+
+
+
+ update parent
+ set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}, room=#{parentRoomId}
+ where id=#{parentId}
+
+
+
+ delete from parent where id=#{parentId}
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml b/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
index 4174383..71b980e 100644
--- a/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
+++ b/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
@@ -18,8 +18,18 @@
select * from room
-
-
+
+ insert into room(location, name) values (#{roomLocation}, #{roomName})
+
+ delete from room where id = #{roomId}
+
+
+
+ update room
+ set location = #{roomLocation},
+ name = #{roomName}
+ where id =#{roomId}
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml b/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
index 9f88c1f..41174cb 100644
--- a/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
+++ b/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,41 @@
-
-
-
- Archetype Created Web Application
-
+
+
+
+
+ mvc-dispatcher
+ org.springframework.web.servlet.DispatcherServlet
+
+
+ contextConfigLocation
+ classpath:spring/spring-*.xml
+
+
+
+ mvc-dispatcher
+
+ /
+
+
+
+ SpringEncodingFilter
+ org.springframework.web.filter.CharacterEncodingFilter
+
+ encoding
+ UTF-8
+
+
+ forceEncoding
+ true
+
+
+
+ SpringEncodingFilter
+ /*
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java
new file mode 100644
index 0000000..b4f3a5b
--- /dev/null
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java
@@ -0,0 +1,76 @@
+package com.oldpeoplehome.dao;
+
+import com.oldpeoplehome.BaseTest;
+import com.oldpeoplehome.entity.Parent;
+import com.oldpeoplehome.utils.StringUtil;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created By Jiangyuwei on 2019/8/20 13:53
+ * Description:
+ */
+public class ParentDaoTest extends BaseTest {
+ @Autowired
+ private ParentDao parentDao;
+
+ @Test
+ public void testFindById(){
+ System.out.println( parentDao.findByID(1) );
+ }
+ @Test
+ public void testFindByName(){
+ System.out.println( parentDao.findByName("jiang") );
+ }
+ @Test
+ public void testFindByLong(){
+ System.out.println( parentDao.findByLongId("510703199706330018") );
+ }
+ @Test
+ public void testFindByRoom(){
+ System.out.println( parentDao.findByRoomId(1) );
+ }
+ @Test
+ public void testFindAll(){
+ System.out.println( parentDao.findAll() );
+ }
+ @Test
+ public void testInsert(){
+ Parent parent = new Parent();
+ parent.setParentLongId("510703199701230019");
+ parent.setParentBirth(Date.valueOf("1993-4-5"));
+ parent.setParentName("丁丁娃");
+ parent.setParentAccount("ding");
+ parent.setParentHeight(1232.1);
+ parent.setParentWeight(1312.1);
+ parent.setParentPassword("123");
+ parent.setParentRoomId(17);
+ parent.setParentSex("女");
+ parent.setParentPhone("12312312312");
+ parentDao.insert(parent);
+ System.out.println(parent);
+ }
+
+ @Test
+ public void testUpdate()throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+ Map params = new HashMap<>();
+ params.put("parentName", "咪咪娃");
+ params.put("parentBirth", "2017-2-23");
+ Parent parent = parentDao.findByID(6);
+ Class pClass = parent.getClass();
+ for (Map.Entry entry: params.entrySet()){
+ Method method = pClass.getMethod("set"+ StringUtil.capital(entry.getKey()), entry.getValue().getClass());
+ System.out.println("***" + method);
+ method.invoke(parent, entry.getValue());
+ }
+ System.out.println(parent);
+ parentDao.update(parent);
+ }
+
+}
diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java
index b00b4a7..0104f0b 100644
--- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java
@@ -1,11 +1,15 @@
package com.oldpeoplehome.dao;
import com.oldpeoplehome.BaseTest;
+import com.oldpeoplehome.entity.Parent;
import com.oldpeoplehome.entity.Room;
+import com.oldpeoplehome.utils.StringUtil;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
/**
* Created By Jiangyuwei on 2019/8/19 15:01
@@ -29,4 +33,42 @@ public class RoomDaoTest extends BaseTest {
System.out.println(s);
}
+ @Test
+ public void testInsert(){
+ Room room = new Room("惠子楼", "241");
+ int s = roomDao.insertRoom(room);
+ System.out.println("*******" + s);
+ }
+
+ @Test
+ public void testDelete(){
+ int id = 3;
+ int s = roomDao.deleteRoom(id);
+ System.out.println("*******" + s);
+ }
+
+ @Test
+ public void testUpdate() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+ int roomId = 4;
+ Map params = new HashMap<>();
+ params.put("roomLocation", "钉子楼");
+ params.put("roomName", "9128");
+ Room room = roomDao.findById(roomId);
+ Class pClass = room.getClass();
+ for(Map.Entry entry: params.entrySet()){
+ Method method = pClass.getMethod("set"+StringUtil.capital(entry.getKey()), entry.getValue().getClass());
+ System.out.println("***" + method);
+ method.invoke(room, entry.getValue());
+ }
+ System.out.println(room);
+ roomDao.updateRoom(room);
+ }
+ @Test
+ public void testA(){
+ Parent parent = new Parent();
+ System.out.println(parent.getClass());
+ Object obj = parent;
+ System.out.println(obj.getClass());
+ }
+
}
diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war
new file mode 100644
index 0000000..5949b62
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome.war differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF b/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6f7f877
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Built-By: Jiangyuwei
+Created-By: IntelliJ IDEA
+Build-Jdk: 1.8.0_161
+
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module
new file mode 100644
index 0000000..8fb6019
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class
new file mode 100644
index 0000000..afdcd23
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class
new file mode 100644
index 0000000..bef2bf7
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class
new file mode 100644
index 0000000..595cef0
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class
new file mode 100644
index 0000000..570ce28
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class
new file mode 100644
index 0000000..3617f8c
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class
new file mode 100644
index 0000000..104e6b0
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class
new file mode 100644
index 0000000..3f83dc1
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class
new file mode 100644
index 0000000..4107ebe
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class
new file mode 100644
index 0000000..e2bd4b0
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class
new file mode 100644
index 0000000..e0e2a2b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class
new file mode 100644
index 0000000..6b211bf
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class
new file mode 100644
index 0000000..497760a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class
new file mode 100644
index 0000000..7cc6d05
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
new file mode 100644
index 0000000..e9eb37f
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
@@ -0,0 +1,4 @@
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+jdbc.username=root
+jdbc.password=root
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml
new file mode 100644
index 0000000..4480ac6
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml
new file mode 100644
index 0000000..77cd668
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into parent(longid,name,sex,account,password,height,weight,birth,phone,room)
+ values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone}, #{parentRoomId})
+
+
+
+ update parent
+ set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}, room=#{parentRoomId}
+ where id=#{parentId}
+
+
+
+ delete from parent where id=#{parentId}
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml
new file mode 100644
index 0000000..71b980e
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into room(location, name) values (#{roomLocation}, #{roomName})
+
+
+
+ delete from room where id = #{roomId}
+
+
+
+ update room
+ set location = #{roomLocation},
+ name = #{roomName}
+ where id =#{roomId}
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml
new file mode 100644
index 0000000..4b92325
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml
new file mode 100644
index 0000000..96c91b2
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml
new file mode 100644
index 0000000..10d4e5f
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml
new file mode 100644
index 0000000..f7feb12
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar
new file mode 100644
index 0000000..0f42d60
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar
new file mode 100644
index 0000000..75580be
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar
new file mode 100644
index 0000000..93a3b9f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar
new file mode 100644
index 0000000..fdf8b6f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar
new file mode 100644
index 0000000..0a18c34
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar
new file mode 100644
index 0000000..5ee8d20
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar
new file mode 100644
index 0000000..feb8bba
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar
new file mode 100644
index 0000000..6b14c3d
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar
new file mode 100644
index 0000000..f4d27d3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar
new file mode 100644
index 0000000..0fd275e
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar
new file mode 100644
index 0000000..39f68c4
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar
new file mode 100644
index 0000000..893962d
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar
new file mode 100644
index 0000000..1cc5f4e
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar
new file mode 100644
index 0000000..7ddda85
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar
new file mode 100644
index 0000000..7a19168
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar
new file mode 100644
index 0000000..1c3cfb8
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar
new file mode 100644
index 0000000..a0ee347
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar
new file mode 100644
index 0000000..cd78554
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar
new file mode 100644
index 0000000..c31fa4b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar
new file mode 100644
index 0000000..9bbadf3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar
new file mode 100644
index 0000000..4099308
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar
new file mode 100644
index 0000000..19aaf37
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..e054cf6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..f52417f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..f303583
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..883ce39
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..1d6abd1
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..a3876b5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..cc34fde
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..379a761
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..1f5e468
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar
new file mode 100644
index 0000000..bfc0bcf
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar
new file mode 100644
index 0000000..bc528ac
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml
new file mode 100644
index 0000000..41174cb
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+
+
+
+
+ mvc-dispatcher
+ org.springframework.web.servlet.DispatcherServlet
+
+
+ contextConfigLocation
+ classpath:spring/spring-*.xml
+
+
+
+ mvc-dispatcher
+
+ /
+
+
+
+ SpringEncodingFilter
+ org.springframework.web.filter.CharacterEncodingFilter
+
+ encoding
+ UTF-8
+
+
+ forceEncoding
+ true
+
+
+
+ SpringEncodingFilter
+ /*
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/index.jsp b/server/OldPeopleHome/target/OldPeopleHome/index.jsp
new file mode 100644
index 0000000..c38169b
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/index.jsp
@@ -0,0 +1,5 @@
+
+
+Hello World!
+
+
diff --git a/server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module b/server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module
new file mode 100644
index 0000000..8fb6019
Binary files /dev/null and b/server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class
new file mode 100644
index 0000000..afdcd23
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class
index aab62f2..bef2bf7 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class
index 1923ad5..595cef0 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class
index 52ba730..570ce28 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class
new file mode 100644
index 0000000..3617f8c
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class
new file mode 100644
index 0000000..104e6b0
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class
new file mode 100644
index 0000000..3f83dc1
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class
new file mode 100644
index 0000000..4107ebe
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class
new file mode 100644
index 0000000..e2bd4b0
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class
new file mode 100644
index 0000000..e0e2a2b
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class
new file mode 100644
index 0000000..6b211bf
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class
new file mode 100644
index 0000000..497760a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class
new file mode 100644
index 0000000..7cc6d05
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class differ
diff --git a/server/OldPeopleHome/target/classes/mapper/ParentDao.xml b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
new file mode 100644
index 0000000..77cd668
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into parent(longid,name,sex,account,password,height,weight,birth,phone,room)
+ values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone}, #{parentRoomId})
+
+
+
+ update parent
+ set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}, room=#{parentRoomId}
+ where id=#{parentId}
+
+
+
+ delete from parent where id=#{parentId}
+
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/RoomDao.xml b/server/OldPeopleHome/target/classes/mapper/RoomDao.xml
index 8b67172..71b980e 100644
--- a/server/OldPeopleHome/target/classes/mapper/RoomDao.xml
+++ b/server/OldPeopleHome/target/classes/mapper/RoomDao.xml
@@ -18,5 +18,18 @@
select * from room
+
+ insert into room(location, name) values (#{roomLocation}, #{roomName})
+
+
+ delete from room where id = #{roomId}
+
+
+
+ update room
+ set location = #{roomLocation},
+ name = #{roomName}
+ where id =#{roomId}
+
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class
new file mode 100644
index 0000000..68d52e5
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class
index c21dbaa..9f3dd03 100644
Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class differ
diff --git a/web/styles.css b/web/styles.css
index 977607a..a63c69e 100644
--- a/web/styles.css
+++ b/web/styles.css
@@ -1079,4 +1079,388 @@ body.xml #x {background: transparent url("/ui2019/bg-retina.png") -730px -48
body.webbuilding #w {background: transparent url("/ui2019/bg-retina.png") -843px -48px no-repeat; background-size: auto 900px;}
body.reference #r {background: transparent url("/ui2019/bg-retina.png") -1040px -48px no-repeat; background-size: auto 900px;}
-}
\ No newline at end of file
+}
+*
+ {
+ margin:0;
+ padding:0;
+ border:0;
+ }
+
+body
+ {
+ font-family:PingFangSC-Regular, Verdana, Arial, '微软雅黑','宋体';
+ font-size:15px;
+ }
+
+div#maincontent div#intro {
+ padding-top: 45px;
+ padding-bottom: 45px;
+ font-size:24px;
+ font-family:'微软雅黑';
+ color:#3f3f3f;
+ font-weight:400;
+ }
+
+span.parameter {
+ font-style: italic;
+ color: #000;
+}
+
+div#maincontent h2
+ {
+ font-size: 30px;
+ font-weight: 400;
+ color:#3f3f3f;
+ }
+
+body#homefirst div#maincontent, div#maincontent h1, div#maincontent h2, div#sidebar div#ad h2
+ {
+ font-family:'微软雅黑';
+ }
+
+pre, pre code, div#maincontent input, div#maincontent select, div#maincontent textarea
+ {
+ font-family:Consolas, "Courier New", Courier, monospace;
+ }
+
+h2, h3, h4, h5, h6, em
+ {
+ font-weight: bold;
+ }
+
+p.note span, p.important span, p.tip span, p.inherited, p.inherited span, p.gototop, .html5_new_note span
+ {
+ font-weight: bold;
+ }
+
+p.tip span {
+ color:#ff9955;
+ }
+
+p.tip2 {
+ background: #BBEDB8 url(/ui2017/tip.png) top left no-repeat;
+ display:block;
+ padding:15px 15px 15px 50px;
+ color:#000;
+ border-radius:5px;
+ background-position:15px 15px;
+ }
+
+body#homesecond div#navsecond li
+ {
+ font-weight:bold;
+ }
+
+ div#sidebar div#ad h2, body#homefirst div#maincontent h3
+ {
+ font-size: 14px;
+ }
+
+div#maincontent h3
+ {
+ font-size: 16px;
+ }
+
+div#maincontent h4
+ {
+ font-size: 14px;
+ }
+
+div#maincontent button, div#maincontent input, div#maincontent select, div#maincontent textarea
+ {
+ font-size:12px;
+ }
+
+body#homefirst div#maincontent div#w3 h2
+ {
+ font-size:20px;
+ }
+
+em
+ {
+ font-style:normal;
+ }
+
+pre code
+ {
+ color:#0000dd;
+ }
+
+.html5_new_note
+ {
+ background: #ffffff url(/i/html5_new_note.png) top left no-repeat;
+ padding-left:20px;
+ }
+
+.html5_new_note span
+ {
+ color:blue;
+ }
+
+p.gototop
+ {
+ text-align:right;
+ }
+
+div#maincontent button
+ {
+ margin-top:15px;
+ }
+
+
+
+
+ /* ----------------------------------- layout ----------------------------------- */
+html {
+ min-width: 1210px;
+ background-color: #fdfcf8;
+ overflow:scroll;
+ overflow-x:hidden;
+ }
+
+body
+ {
+ text-align: center;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ background: #fdfcf8;
+ }
+
+div#wrapper
+ {
+ margin: 0 auto;
+ padding: 0;
+ border: 0;
+ width: 1239px;
+ text-align: left;
+ background: transparent url(/ui2017/wrapper.png) top left repeat-y;
+ }
+
+div#navsecond
+ {
+ float: left;
+ margin: 0 0 0 6px;
+ padding: 0;
+ border: 0;
+ width: 180px;
+ background : transparent;
+ }
+
+html>body div#navsecond
+ {
+ margin-left: 12px;
+ }
+
+div#maincontent
+ {
+ float: left;
+ margin: 0;
+ padding: 30px 0 0 0;
+ border: 0;
+ width: 850px;
+ background: transparent;
+ }
+
+div#maincontent div{
+ width: 810px;
+ margin: 0 0 0 25px;
+ padding: 30px 0 35px 0;
+ border:0;
+ border-bottom: 1px solid #aaa;
+ }
+
+div#sidebar
+ {
+ float: left;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ width: 180px;
+ background: transparent;
+ }
+
+div#footer
+ {
+ clear: both;
+ margin: 0;
+ padding-top: 16px;
+ margin-left: 12px;
+ width: 1210px;
+ line-height:24px;
+ background: #f0f0f0;
+ border-top: 0px solid #fff;
+ background: #fdfcf8 url(/ui2017/footer.png) top left repeat-x;
+ font-family:PingFangSC-Regular, '微软雅黑', Verdana, Arial, '宋体';
+ *
+ {
+ margin:0;
+ padding:0;
+ border:0;
+ }
+
+body
+ {
+ font-family:PingFangSC-Regular, Verdana, Arial, '微软雅黑','宋体';
+ font-size:15px;
+ }
+
+div#maincontent div#intro {
+ padding-top: 45px;
+ padding-bottom: 45px;
+ font-size:24px;
+ font-family:'微软雅黑';
+ color:#3f3f3f;
+ font-weight:400;
+ }
+
+span.parameter {
+ font-style: italic;
+ color: #000;
+}
+
+div#maincontent h2
+ {
+ font-size: 30px;
+ font-weight: 400;
+ color:#3f3f3f;
+ }
+
+body#homefirst div#maincontent, div#maincontent h1, div#maincontent h2, div#sidebar div#ad h2
+ {
+ font-family:'微软雅黑';
+ }
+
+ *
+ {
+ margin:0;
+ padding:0;
+ border:0;
+ }
+
+body
+ {
+ font-family:PingFangSC-Regular, Verdana, Arial, '微软雅黑','宋体';
+ font-size:15px;
+ }
+
+div#maincontent div#intro {
+ padding-top: 45px;
+ padding-bottom: 45px;
+ font-size:24px;
+ font-family:'微软雅黑';
+ color:#3f3f3f;
+ font-weight:400;
+ }
+
+span.parameter {
+ font-style: italic;
+ color: #000;
+}
+
+div#maincontent h2
+ {
+ font-size: 30px;
+ font-weight: 400;
+ color:#3f3f3f;
+ }
+
+body#homefirst div#maincontent, div#maincontent h1, div#maincontent h2, div#sidebar div#ad h2
+ {
+ font-family:'微软雅黑';
+ }
+
+pre, pre code, div#maincontent input, div#maincontent select, div#maincontent textarea
+ {
+ font-family:Consolas, "Courier New", Courier, monospace;
+ }
+
+h2, h3, h4, h5, h6, em
+ {
+ font-weight: bold;
+ }
+
+p.note span, p.important span, p.tip span, p.inherited, p.inherited span, p.gototop, .html5_new_note span
+ {
+ font-weight: bold;
+ }
+
+p.tip span {
+ color:#ff9955;
+ }
+
+p.tip2 {
+ background: #BBEDB8 url(/ui2017/tip.png) top left no-repeat;
+ display:block;
+ padding:15px 15px 15px 50px;
+ color:#000;
+ border-radius:5px;
+ background-position:15px 15px;
+ }
+
+body#homesecond div#navsecond li
+ {
+ font-weight:bold;
+ }
+
+ div#sidebar div#ad h2, body#homefirst div#maincontent h3
+ {
+ font-size: 14px;
+ }
+
+div#maincontent h3
+ {
+ font-size: 16px;
+ }
+
+div#maincontent h4
+ {
+ font-size: 14px;
+ }
+
+div#maincontent button, div#maincontent input, div#maincontent select, div#maincontent textarea
+ {
+ font-size:12px;
+ }
+
+body#homefirst div#maincontent div#w3 h2
+ {
+ font-size:20px;
+ }
+
+em
+ {
+ font-style:normal;
+ }
+
+pre code
+ {
+ color:#0000dd;
+ }
+
+.html5_new_note
+ {
+ background: #ffffff url(/i/html5_new_note.png) top left no-repeat;
+ padding-left:20px;
+ }
+
+.html5_new_note span
+ {
+ color:blue;
+ }
+
+p.gototop
+ {
+ text-align:right;
+ }
+
+div#maincontent button
+ {
+ margin-top:15px;
+ }
+
+
+
+
+ /* ----------------------------------- layout ----------------------------------- */