diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 71d8829..dd3d436 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,11 +8,87 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -295,94 +373,94 @@ - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -407,6 +485,10 @@ + + + + diff --git a/src/main/java/cn/ppdxzz/controller/AdminController.java b/src/main/java/cn/ppdxzz/controller/AdminController.java index 4dbfa27..b7b7286 100644 --- a/src/main/java/cn/ppdxzz/controller/AdminController.java +++ b/src/main/java/cn/ppdxzz/controller/AdminController.java @@ -3,6 +3,7 @@ package cn.ppdxzz.controller; import cn.ppdxzz.domain.Admin; import cn.ppdxzz.service.AdminService; import cn.ppdxzz.utils.MD5Util; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.github.pagehelper.PageInfo; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -88,7 +89,7 @@ public class AdminController { * 分页查询所有管理员信息 */ @RequestMapping(value = "/findAllAdmin") - public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1") int page, @RequestParam(name = "size", required = true, defaultValue = "4") int size,HttpServletRequest request,HttpServletResponse response) throws Exception { + public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1") int page, @RequestParam(name = "size", required = true, defaultValue = "5") int size,HttpServletRequest request,HttpServletResponse response) throws Exception { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); ModelAndView mv = new ModelAndView(); @@ -165,12 +166,18 @@ public class AdminController { if(admin.getUsername() == null || "".trim().equals(admin.getUsername()) || admin.getPassword() == null ||"".trim().equals(admin.getPassword()) || admin.getName() == null || "".trim().equals(admin.getName()) + || admin.getUid() == null || "".trim().equals(admin.getUid()) || admin.getPhone() == null || "".trim().equals(admin.getPhone()) || admin.getDescription() == null || "".trim().equals(admin.getDescription())) { writer.write("false"); return; } } + Admin isNull = adminService.checkUid(admin.getUid()); + if (isNull != null) { + writer.write("false"); + return; + } admin.setPassword(MD5Util.MD5EncodeUtf8(admin.getPassword())); adminService.addAdmin(admin); writer.write("true"); @@ -196,6 +203,7 @@ public class AdminController { }else { if(admin.getUsername() == null || "".trim().equals(admin.getUsername()) || admin.getName() == null || "".trim().equals(admin.getName()) + || admin.getUid() == null || "".trim().equals(admin.getUid()) || admin.getPhone() == null || "".trim().equals(admin.getPhone()) || admin.getDescription() == null || "".trim().equals(admin.getDescription())) { writer.write("false"); @@ -241,4 +249,24 @@ public class AdminController { } + /** + * 校验学工号是否已被注册 + * @param request + * @param response + * @throws Exception + */ + @RequestMapping("/checkUid") + public void checkUid(HttpServletRequest request,HttpServletResponse response) throws Exception { + request.setCharacterEncoding("utf-8"); + response.setCharacterEncoding("utf-8"); + PrintWriter writer = response.getWriter(); + String uid = request.getParameter("uid"); + Admin admin = adminService.checkUid(uid); + if (admin != null) { + writer.write("true");//uid已被注册 + return; + } + + } + } diff --git a/src/main/java/cn/ppdxzz/controller/BasicController.java b/src/main/java/cn/ppdxzz/controller/BasicController.java index 94cab80..3f6793c 100644 --- a/src/main/java/cn/ppdxzz/controller/BasicController.java +++ b/src/main/java/cn/ppdxzz/controller/BasicController.java @@ -1,10 +1,14 @@ package cn.ppdxzz.controller; +import org.springframework.stereotype.Controller; + /** * Description: * * @Date: 2020/2/14 18:50 * @Author: PeiChen */ +@Controller public class BasicController { + } diff --git a/src/main/java/cn/ppdxzz/controller/DormController.java b/src/main/java/cn/ppdxzz/controller/DormController.java index 8256525..e4b1ab3 100644 --- a/src/main/java/cn/ppdxzz/controller/DormController.java +++ b/src/main/java/cn/ppdxzz/controller/DormController.java @@ -1,7 +1,11 @@ package cn.ppdxzz.controller; +import cn.ppdxzz.domain.Admin; import cn.ppdxzz.domain.Dorm; +import cn.ppdxzz.domain.Student; +import cn.ppdxzz.service.AdminService; import cn.ppdxzz.service.DormService; +import cn.ppdxzz.service.StudentService; import com.github.pagehelper.PageInfo; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -13,10 +17,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; import java.util.List; /** @@ -30,12 +32,24 @@ import java.util.List; public class DormController { private DormService dormService; + private StudentService studentService; + private AdminService adminService; + + @Autowired + public void setStudentService(StudentService studentService) { + this.studentService = studentService; + } @Autowired public void setDormService(DormService dormService) { this.dormService = dormService; } + @Autowired + public void setAdminService(AdminService adminService) { + this.adminService = adminService; + } + /** * 查询所有宿舍信息 * @param page @@ -46,7 +60,7 @@ public class DormController { * @throws Exception */ @RequestMapping("/findAll") - public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1")int page, @RequestParam(name = "size", required = true, defaultValue = "4") int size, HttpServletRequest request, HttpServletResponse response) throws Exception { + public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1")int page, @RequestParam(name = "size", required = true, defaultValue = "5") int size, HttpServletRequest request, HttpServletResponse response) throws Exception { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); ModelAndView mv = new ModelAndView(); @@ -110,7 +124,7 @@ public class DormController { PrintWriter writer = response.getWriter(); String dorm_id = request.getParameter("dorm_id"); Dorm isNull = dormService.findByDormId(dorm_id); - if (isNull == null) { + if (isNull != null) { writer.write("true"); return; } @@ -179,16 +193,89 @@ public class DormController { */ @RequestMapping("/look") public ModelAndView look(HttpServletRequest request) throws Exception { - String id = request.getParameter("id"); ModelAndView mv = new ModelAndView(); - Dorm dorm = dormService.findById(id); + Dorm dorm = null; + String id = request.getParameter("id"); + String uid = request.getParameter("uid"); + if (id == null && uid != null) { + Student stu = studentService.findBySno(uid); + dorm = dormService.findByDormId(stu.getDorm_id()); + }else if (id != null) { + dorm = dormService.findById(id); + }else { + return mv; + } mv.addObject("dorm",dorm); mv.setViewName("look-dorm"); return mv; } + /** + * 宿舍学生信息 + * @param request + * @return + * @throws Exception + */ + @RequestMapping("/byDorm_leader") + public ModelAndView find(HttpServletRequest request) throws Exception { + request.setCharacterEncoding("utf-8"); + ModelAndView mv = new ModelAndView(); + String uid = request.getParameter("uid"); + String dorm_id = request.getParameter("dorm_id"); + if (dorm_id != null) { + List studentsInfo = studentService.findByDormId(dorm_id, 1); + mv.addObject("studentsInfo",studentsInfo); + mv.setViewName("dormStudentsInfo"); + return mv; + } + Student stu = studentService.findBySno(uid); +// Dorm dormInfo = dormService.findByDormId(stu.getDorm_id()); + List studentsInfo = studentService.findByDormId(stu.getDorm_id(), 1); +// mv.addObject("dormInfo",dormInfo); + mv.addObject("studentsInfo",studentsInfo); + mv.setViewName("dormStudentsInfo"); + + return mv; + } + + @RequestMapping("/byTeacher") + public ModelAndView find1(HttpServletRequest request) throws Exception { + ModelAndView mv = new ModelAndView(); + String uid = request.getParameter("uid"); + Admin admin = adminService.checkUid(uid); + List dorms = dormService.findByTeacher(admin.getName()); + mv.addObject("dorms",dorms); + mv.setViewName("dormsTeacherInfo"); + return mv; + } + + /** + * 查询所有育人导师为teacher的学生集合 + * @param request + * @return + * @throws Exception + */ + @RequestMapping("/findStudent") + public ModelAndView findStudents(@RequestParam(name = "page", required = true, defaultValue = "1")int page, @RequestParam(name = "size", required = true, defaultValue = "5") int size,HttpServletRequest request) throws Exception { + request.setCharacterEncoding("utf-8"); + ModelAndView mv = new ModelAndView(); + List students = null; + String teacher = request.getParameter("name"); + String keyword = request.getParameter("keyword"); + System.out.println(keyword); + if (keyword == null || "".trim().equals(keyword) || keyword.length() == 0) { + students = studentService.findByTeacher(page,size,teacher); + } + if (keyword != null){ + students = studentService.searchStudent(page,size,teacher,keyword); + } + PageInfo pageInfo = new PageInfo(students); + mv.addObject("pageInfo",pageInfo); + mv.setViewName("studentsTeacher"); + return mv; + } diff --git a/src/main/java/cn/ppdxzz/controller/StudentController.java b/src/main/java/cn/ppdxzz/controller/StudentController.java index ecc6e9e..b8a0bda 100644 --- a/src/main/java/cn/ppdxzz/controller/StudentController.java +++ b/src/main/java/cn/ppdxzz/controller/StudentController.java @@ -46,7 +46,7 @@ public class StudentController { * @throws Exception */ @RequestMapping("/findAll") - public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1") int page, @RequestParam(name = "size", required = true, defaultValue = "4") int size, HttpServletRequest request, HttpServletResponse response) throws Exception { + public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1") int page, @RequestParam(name = "size", required = true, defaultValue = "5") int size, HttpServletRequest request, HttpServletResponse response) throws Exception { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); ModelAndView mv = new ModelAndView(); @@ -107,8 +107,17 @@ public class StudentController { } @RequestMapping("/addStudent") - public String addStudent() { - return "student-add"; + public ModelAndView addStudent(HttpServletRequest request) throws Exception { + request.setCharacterEncoding("utf-8"); + ModelAndView mv = new ModelAndView(); + String dorm_id = request.getParameter("dorm_id"); + if (dorm_id != null) { + mv.addObject("dorm_id",dorm_id); + mv.setViewName("dormStudent-add"); + return mv; + } + mv.setViewName("student-add"); + return mv; } /** @@ -124,6 +133,12 @@ public class StudentController { writer.write("false"); return; } + + Student s = studentService.findBySno(student.getSno()); + if (s != null) { + writer.write("false"); + return; + } boolean isAdd = studentService.add(student); if (isAdd) { writer.write("true"); diff --git a/src/main/java/cn/ppdxzz/controller/VisitorController.java b/src/main/java/cn/ppdxzz/controller/VisitorController.java index 196f73d..30b9f92 100644 --- a/src/main/java/cn/ppdxzz/controller/VisitorController.java +++ b/src/main/java/cn/ppdxzz/controller/VisitorController.java @@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; @@ -126,7 +127,7 @@ public class VisitorController { * @throws Exception */ @RequestMapping("/findAll") - public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1") int page, @RequestParam(name = "size", required = true, defaultValue = "4") int size,HttpServletRequest request,HttpServletResponse response) throws Exception { + public ModelAndView findAll(@RequestParam(name = "page", required = true, defaultValue = "1") int page, @RequestParam(name = "size", required = true, defaultValue = "5") int size,HttpServletRequest request,HttpServletResponse response) throws Exception { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); ModelAndView mv = new ModelAndView(); @@ -144,6 +145,21 @@ public class VisitorController { return mv; } + /** + * 访客日志` + * @return + * @throws Exception + */ + @RequestMapping("/log") + public ModelAndView log(@RequestParam(name = "page", required = true, defaultValue = "1") int page, @RequestParam(name = "size", required = true, defaultValue = "10") int size) throws Exception { + ModelAndView mv = new ModelAndView(); + List logs = visitorService.log(page,size); + PageInfo pageInfo = new PageInfo(logs); + mv.addObject("pageInfo",pageInfo); + mv.setViewName("visitor-log"); + + return mv; + } /** * 导出访客信息 * @param response diff --git a/src/main/java/cn/ppdxzz/dao/AdminDao.java b/src/main/java/cn/ppdxzz/dao/AdminDao.java index aa81148..eb07454 100644 --- a/src/main/java/cn/ppdxzz/dao/AdminDao.java +++ b/src/main/java/cn/ppdxzz/dao/AdminDao.java @@ -57,7 +57,7 @@ public interface AdminDao { * @param admin * @throws Exception */ - @Update("update admins set username= #{username},name = #{name}, phone = #{phone}, description = #{description} where id = #{id}") + @Update("update admins set username= #{username},name = #{name},uid = #{uid}, phone = #{phone}, description = #{description} where id = #{id}") void updateAdmin(Admin admin) throws Exception; /** @@ -65,7 +65,7 @@ public interface AdminDao { * @param admin * @throws Exception */ - @Insert("insert into admins(username,password,name,phone,power,description) values (#{username},#{password},#{name},#{phone},#{power},#{description})") + @Insert("insert into admins(username,password,name,uid,phone,power,description) values (#{username},#{password},#{name},#{uid},#{phone},#{power},#{description})") void addAdmin(Admin admin) throws Exception; /** @@ -74,6 +74,15 @@ public interface AdminDao { @Select("select * from admins where username = #{u_name}") Boolean checkUserName(String u_name) throws Exception; + /** + * 校验学/工号是否已被注册 + * @param uid + * @return + * @throws Exception + */ + @Select("select * from admins where uid = #{uid}") + Admin checkUid(String uid) throws Exception; + /** * 重置密码 * @param password @@ -85,7 +94,7 @@ public interface AdminDao { //select * from admins where username like '%p%' or name like '%万%' or power like '%1%' or description like '%管理员%'; //模糊搜索管理员信息，查询结果返回一个list集合 - @Select("select * from admins where username like '%${keyword}%' or name like '%${keyword}%' or phone like '%${keyword}%' or power like '%${keyword}%' or description like '%${keyword}%' ") + @Select("select * from admins where username like '%${keyword}%' or name like '%${keyword}%' or uid like '%${keyword}%' or phone like '%${keyword}%' or power like '%${keyword}%' or description like '%${keyword}%' ") List serarchInfo(@Param(value="keyword") String keyword) throws Exception; /** diff --git a/src/main/java/cn/ppdxzz/dao/DormDao.java b/src/main/java/cn/ppdxzz/dao/DormDao.java index 75cb84b..1683b49 100644 --- a/src/main/java/cn/ppdxzz/dao/DormDao.java +++ b/src/main/java/cn/ppdxzz/dao/DormDao.java @@ -61,4 +61,8 @@ public interface DormDao { @Select("select * from dorms where id = #{id}") Dorm findById(String id) throws Exception; + + @Select("select * from dorms where teacher = #{teacher}") + List findByTeacher(String teacher) throws Exception; + } diff --git a/src/main/java/cn/ppdxzz/dao/StudentDao.java b/src/main/java/cn/ppdxzz/dao/StudentDao.java index 81a4b2b..507c9b1 100644 --- a/src/main/java/cn/ppdxzz/dao/StudentDao.java +++ b/src/main/java/cn/ppdxzz/dao/StudentDao.java @@ -63,8 +63,32 @@ public interface StudentDao { @Update("update students set name = #{name},sex = #{sex},sno = #{sno},stu_class = #{stu_class},phone = #{phone},place = #{place},dorm_id = #{dorm_id},teacher = #{teacher},status = #{status} where id = #{id}") void update(Student student) throws Exception; + /** + * 根据宿舍号查询状态为status的宿舍学生 + * @param dorm_id + * @return + * @throws Exception + */ + @Select("select * from students where dorm_id = #{dorm_id} and status = #{status}") + List findByDormId(@Param(value = "dorm_id") String dorm_id,@Param(value = "status") Integer status) throws Exception; + /** + * 查询育人导师为teacher的学生集合 + * @param teacher + * @return + * @throws Exception + */ + @Select("select * from students where teacher = #{teacher}") + List findByTeacher(String teacher) throws Exception; - + /** + * 模糊查询固定育人导师所带学生信息 + * @param teacher + * @param keyword + * @return + * @throws Exception + */ + @Select("select * from students where teacher = #{teacher} and sno = #{keyword} ") + List searchStudent(@Param(value = "teacher") String teacher,@Param(value = "keyword") String keyword) throws Exception; } diff --git a/src/main/java/cn/ppdxzz/domain/Admin.java b/src/main/java/cn/ppdxzz/domain/Admin.java index 51b4d66..c7cce7c 100644 --- a/src/main/java/cn/ppdxzz/domain/Admin.java +++ b/src/main/java/cn/ppdxzz/domain/Admin.java @@ -13,6 +13,7 @@ public class Admin implements Serializable { private String username; //用户名 private String password; //密码 private String name; //姓名 + private String uid; //学/工号 private String phone; //手机号 private int power; //是否开启权限 private String description; //描述 @@ -20,11 +21,12 @@ public class Admin implements Serializable { public Admin() { } - public Admin(Integer id, String username, String password, String name, String phone, int power, String description) { + public Admin(Integer id, String username, String password, String name, String uid, String phone, int power, String description) { this.id = id; this.username = username; this.password = password; this.name = name; + this.uid = uid; this.phone = phone; this.power = power; this.description = description; @@ -62,6 +64,14 @@ public class Admin implements Serializable { this.name = name; } + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + public String getPhone() { return phone; } @@ -93,6 +103,7 @@ public class Admin implements Serializable { ", username='" + username + '\'' + ", password='" + password + '\'' + ", name='" + name + '\'' + + ", uid='" + uid + '\'' + ", phone='" + phone + '\'' + ", power=" + power + ", description='" + description + '\'' + diff --git a/src/main/java/cn/ppdxzz/service/AdminService.java b/src/main/java/cn/ppdxzz/service/AdminService.java index 5547380..d0da800 100644 --- a/src/main/java/cn/ppdxzz/service/AdminService.java +++ b/src/main/java/cn/ppdxzz/service/AdminService.java @@ -37,4 +37,7 @@ public interface AdminService { //返回一个携带所有管理员信息数据的InputStream输入流 InputStream getInputStream() throws Exception; + //校验学工号是否被注册 + Admin checkUid(String uid) throws Exception; + } diff --git a/src/main/java/cn/ppdxzz/service/DormService.java b/src/main/java/cn/ppdxzz/service/DormService.java index 3bf55f6..7c7c5e2 100644 --- a/src/main/java/cn/ppdxzz/service/DormService.java +++ b/src/main/java/cn/ppdxzz/service/DormService.java @@ -26,4 +26,6 @@ public interface DormService { Dorm findByDormId(String dorm_id) throws Exception; Dorm findById(String id) throws Exception; + + List findByTeacher(String teacher) throws Exception; } diff --git a/src/main/java/cn/ppdxzz/service/StudentService.java b/src/main/java/cn/ppdxzz/service/StudentService.java index 9e43b51..a3a1ab6 100644 --- a/src/main/java/cn/ppdxzz/service/StudentService.java +++ b/src/main/java/cn/ppdxzz/service/StudentService.java @@ -28,5 +28,9 @@ public interface StudentService { //返回一个携带所有学生信息数据的InputStream输入流 InputStream getInputStream() throws Exception; + List findByDormId(String dorm_id,Integer status) throws Exception; + List findByTeacher(int page,int size,String teacher) throws Exception; + + List searchStudent(int page,int size,String teacher,String keyword) throws Exception; } diff --git a/src/main/java/cn/ppdxzz/service/VisitorService.java b/src/main/java/cn/ppdxzz/service/VisitorService.java index f68b0ea..ff0c7c2 100644 --- a/src/main/java/cn/ppdxzz/service/VisitorService.java +++ b/src/main/java/cn/ppdxzz/service/VisitorService.java @@ -23,4 +23,6 @@ public interface VisitorService { InputStream getInputStream() throws Exception; + List log(int page,int size) throws Exception; + } diff --git a/src/main/java/cn/ppdxzz/service/impl/AdminServiceImpl.java b/src/main/java/cn/ppdxzz/service/impl/AdminServiceImpl.java index d237705..f29f595 100644 --- a/src/main/java/cn/ppdxzz/service/impl/AdminServiceImpl.java +++ b/src/main/java/cn/ppdxzz/service/impl/AdminServiceImpl.java @@ -119,6 +119,11 @@ public class AdminServiceImpl implements AdminService { return list; } + /** + * 授权 + * @param admin + * @throws Exception + */ @Override public void put_power(Admin admin) throws Exception { adminDao.put_power(admin); @@ -132,7 +137,7 @@ public class AdminServiceImpl implements AdminService { @Override public InputStream getInputStream() throws Exception { //Excel中的每列列名，依次对应数据库的字段 - String[] title = new String[]{"ID","用户名","密码","姓名","手机号","权限","描述"}; + String[] title = new String[]{"ID","用户名","密码","姓名","学/工号","手机号","权限","描述"}; List admins = adminDao.exportAdminInfo(); List dataList = new ArrayList(); for (int i = 0; i < admins.size(); i++) { @@ -141,9 +146,10 @@ public class AdminServiceImpl implements AdminService { obj[1] = admins.get(i).getUsername(); obj[2] = admins.get(i).getPassword(); obj[3] = admins.get(i).getName(); - obj[4] = admins.get(i).getPhone(); - obj[5] = admins.get(i).getPower(); - obj[6] = admins.get(i).getDescription(); + obj[4] = admins.get(i).getUid(); + obj[5] = admins.get(i).getPhone(); + obj[6] = admins.get(i).getPower(); + obj[7] = admins.get(i).getDescription(); dataList.add(obj); } WriteExcel ex = new WriteExcel(title, dataList); @@ -152,4 +158,14 @@ public class AdminServiceImpl implements AdminService { return in; } + /** + * 校验学/工号是否已被注册 + * @param uid + * @return + * @throws Exception + */ + @Override + public Admin checkUid(String uid) throws Exception { + return adminDao.checkUid(uid); + } } diff --git a/src/main/java/cn/ppdxzz/service/impl/DormServiceImpl.java b/src/main/java/cn/ppdxzz/service/impl/DormServiceImpl.java index a956ec7..fc4296c 100644 --- a/src/main/java/cn/ppdxzz/service/impl/DormServiceImpl.java +++ b/src/main/java/cn/ppdxzz/service/impl/DormServiceImpl.java @@ -111,4 +111,9 @@ public class DormServiceImpl implements DormService { public Dorm findById(String id) throws Exception { return dormDao.findById(id); } + + @Override + public List findByTeacher(String teacher) throws Exception { + return dormDao.findByTeacher(teacher); + } } diff --git a/src/main/java/cn/ppdxzz/service/impl/StudentServiceImpl.java b/src/main/java/cn/ppdxzz/service/impl/StudentServiceImpl.java index 5925cca..4495f47 100644 --- a/src/main/java/cn/ppdxzz/service/impl/StudentServiceImpl.java +++ b/src/main/java/cn/ppdxzz/service/impl/StudentServiceImpl.java @@ -124,4 +124,34 @@ public class StudentServiceImpl implements StudentService { return excel.export(); } + + /** + * 根据宿舍号查询状态为status的学生 + * @param dorm_id + * @param status + * @return + * @throws Exception + */ + @Override + public List findByDormId(String dorm_id, Integer status) throws Exception { + return studentDao.findByDormId(dorm_id, status); + } + + /** + * 查询育人导师为teacher的学生集合 + * @param teacher + * @return + * @throws Exception + */ + @Override + public List findByTeacher(int page,int size,String teacher) throws Exception { + PageHelper.startPage(page,size); + return studentDao.findByTeacher(teacher); + } + + @Override + public List searchStudent(int page, int size, String teacher, String keyword) throws Exception { + PageHelper.startPage(page,size); + return studentDao.searchStudent(teacher,keyword); + } } diff --git a/src/main/java/cn/ppdxzz/service/impl/VisitorServiceImpl.java b/src/main/java/cn/ppdxzz/service/impl/VisitorServiceImpl.java index a870f19..0c405ef 100644 --- a/src/main/java/cn/ppdxzz/service/impl/VisitorServiceImpl.java +++ b/src/main/java/cn/ppdxzz/service/impl/VisitorServiceImpl.java @@ -98,4 +98,17 @@ public class VisitorServiceImpl implements VisitorService { WriteExcel excel = new WriteExcel(title,datalist); return excel.export(); } + + /** + * 访客日志 + * @param page + * @param size + * @return + * @throws Exception + */ + @Override + public List log(int page,int size) throws Exception { + PageHelper.startPage(page,size); + return visitorDao.findAll(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/admin-add.jsp b/src/main/webapp/WEB-INF/jsp/admin-add.jsp index 8c2e32a..c89bdfa 100644 --- a/src/main/webapp/WEB-INF/jsp/admin-add.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin-add.jsp @@ -36,6 +36,12 @@ +
+ +
+ +
+
@@ -96,6 +102,14 @@ }); }); }); + $("#uid").change(function () { + var uid = $("#uid").val().trim(); + $.get("${pageContext.request.contextPath}/checkUid",{"uid":uid},function (data) { + if (data) { + layer.msg('该学/工号已被注册，请重新输入'); + } + }); + }); function toValidate(){ var val = new validate({ /*rules里面是检验规则， @@ -105,6 +119,7 @@ rules:{ username:"notEmpty", name:"notEmpty", + uid:"notEmpty", description:"notEmpty", phone:"mobile", password:"notEmpty" @@ -120,6 +135,7 @@ var username = $("#username").val().trim(); var password = $("#password").val().trim(); var name = $("#name").val().trim(); + var uid = $("#uid").val().trim(); var phone = $("#phone").val().trim(); var power = $("#power").val().trim(); var description = $("#description").val().trim(); @@ -128,12 +144,13 @@ //这是一个对象，表示请求的参数，两个参数：method=ajax&val=xxx，服务器可以通过request.getParameter()来获取 //data:{method:"ajaxTest",val:value}, data: { - username:$("#username").val().trim(), - password:$("#password").val().trim(), - name: $("#name").val().trim(), - phone: $("#phone").val().trim(), - power: $("#power").val().trim(), - description: $("#description").val().trim(), + username:username, + password:password, + name: name, + uid:uid, + phone: phone, + power: power, + description: description }, type: "POST", //请求方式为POST dataType: "json", //服务器返回的数据是什么类型 diff --git a/src/main/webapp/WEB-INF/jsp/admin-edit.jsp b/src/main/webapp/WEB-INF/jsp/admin-edit.jsp index 4435e93..6493e7e 100644 --- a/src/main/webapp/WEB-INF/jsp/admin-edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin-edit.jsp @@ -32,38 +32,17 @@
- +
- +
- <%--
- +
+
- - - - - - - - - - +
-
--%> +
@@ -88,6 +67,7 @@ */ rules:{ name:"notEmpty", + uid:"notEmpty", description:"notEmpty", phone:"mobile", }, @@ -102,6 +82,7 @@ var id = $("#id").val().trim(); var username = $("#username").val().trim(); var name = $("#name").val().trim(); + var uid = $("#uid").val().trim(); var phone = $("#phone").val().trim(); var description = $("#description").val().trim(); layer.confirm('确定要修改吗',function (index) { @@ -116,11 +97,12 @@ //这是一个对象，表示请求的参数，两个参数：method=ajax&val=xxx，服务器可以通过request.getParameter()来获取 //data:{method:"ajaxTest",val:value}, data: { - id:$("#id").val().trim(), - username:$("#username").val().trim(), - name: $("#name").val().trim(), - phone: $("#phone").val().trim(), - description: $("#description").val().trim(), + id:id, + username:username, + name:name, + uid:uid, + phone: phone, + description: description }, type: "POST", //请求方式为POST dataType: "json", //服务器返回的数据是什么类型 diff --git a/src/main/webapp/WEB-INF/jsp/admin-list.jsp b/src/main/webapp/WEB-INF/jsp/admin-list.jsp index 58fb964..89d719c 100644 --- a/src/main/webapp/WEB-INF/jsp/admin-list.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin-list.jsp @@ -34,11 +34,11 @@ } $("#serarch_btn").click(function () { var keyword = $("#keyword").val(); - location.href="${pageContext.request.contextPath}/findAllAdmin?page=1&size=4&keyword="+keyword; + location.href="${pageContext.request.contextPath}/findAllAdmin?page=1&size=5&keyword="+keyword; }); $("#refresh").click(function () { $("#myform").reset(); - location.href="${pageContext.request.contextPath}/findAllAdmin?page=1&size=4"; + location.href="${pageContext.request.contextPath}/findAllAdmin?page=1&size=5"; }); @@ -66,7 +66,7 @@
- +
@@ -82,6 +82,7 @@ ID 用户名 姓名 + 学/工号 联系方式 权限 描述 @@ -96,6 +97,7 @@ <%=j++%> ${admin.username} ${admin.name} + ${admin.uid} ${admin.phone} ${admin.power} ${admin.description} @@ -120,8 +122,6 @@ 共 ${pageInfo.pages} 页 当前页：${pageInfo.pageNum} / ${pageInfo.pages}  每页 - - diff --git a/src/main/webapp/WEB-INF/jsp/dormStudent-add.jsp b/src/main/webapp/WEB-INF/jsp/dormStudent-add.jsp new file mode 100644 index 0000000..4bc59d5 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/dormStudent-add.jsp @@ -0,0 +1,160 @@ +<%-- + Created by IntelliJ IDEA. + User: user + Date: 2020/2/17 + Time: 12:33 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Title + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + +
+ + + +
+ +
+ +
+ +
+ + 返回列表 +
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/dormStudentsInfo.jsp b/src/main/webapp/WEB-INF/jsp/dormStudentsInfo.jsp new file mode 100644 index 0000000..bda9f89 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/dormStudentsInfo.jsp @@ -0,0 +1,122 @@ +<%-- + Created by IntelliJ IDEA. + User: user + Date: 2020/2/10 + Time: 21:45 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + + + + + + + + + + + + +<%--
+ + 首页 + 演示 + + 导航元素 + + + +
--%> +
+
+
+
+ + + + 添加 + 返回列表 + + + 添加 + 返回列表 + + 共有数据：${studentsInfo.size()} 条 + +
+ + + + + + + + + + + + + + + + <% + int j = 1; + %> + + + + + + + + + + + + + + + + + + + + +
ID姓名性别学号班级联系方式宿舍号育人导师状态操作
<%=j++%>${student.name}${student.sex}${student.sno}${student.stu_class}${student.phone}${student.dorm_id}${student.teacher} + + + +
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/dormsTeacherInfo.jsp b/src/main/webapp/WEB-INF/jsp/dormsTeacherInfo.jsp new file mode 100644 index 0000000..15cbe1c --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/dormsTeacherInfo.jsp @@ -0,0 +1,122 @@ +<%-- + Created by IntelliJ IDEA. + User: user + Date: 2020/2/18 + Time: 15:56 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + + + + + + + + + + + + +<%--
+ + 首页 + 演示 + + 导航元素 + + + +
--%> +
+
+
+
+ + 添加 + 共有数据：${dorms.size()} 条 + +
+ + + + + + + + + + + + + <% + int j = 1; + %> + + + + + + + + + + + + +
ID宿舍号宿舍简介宿舍奖惩宿舍长育人导师操作
<%=j++%>${dorm.dorm_id}${dorm.dorm_intro}${dorm.dorm_rps}${dorm.dorm_leader}${dorm.teacher} + + + + + + + + + +
+
+
+
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/look-dorm.jsp b/src/main/webapp/WEB-INF/jsp/look-dorm.jsp index 1e4727a..49cf3f0 100644 --- a/src/main/webapp/WEB-INF/jsp/look-dorm.jsp +++ b/src/main/webapp/WEB-INF/jsp/look-dorm.jsp @@ -45,6 +45,11 @@ ${dorm.teacher} + + + 去修改 + + diff --git a/src/main/webapp/WEB-INF/jsp/main.jsp b/src/main/webapp/WEB-INF/jsp/main.jsp index 2f6b05e..e9c36ab 100644 --- a/src/main/webapp/WEB-INF/jsp/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/main.jsp @@ -1,3 +1,4 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%-- Created by IntelliJ IDEA. User: user @@ -25,7 +26,7 @@
+ 皮皮的小猪仔
@@ -35,13 +36,13 @@
- 消息 + 消息
- XXX + XXX
- XXX + XXX
@@ -50,7 +51,7 @@
- 个人信息
+ 个人信息
切换帐号
@@ -58,7 +59,7 @@
  • - 前台首页 + 友情链接
    • @@ -68,6 +69,7 @@
    @@ -192,7 +218,9 @@
    <%--中间的空白面板--%>
    - + + +
    @@ -210,5 +238,9 @@ layer.msg('目前暂不支持网页端登记'); return false; } + function power() { + layer.msg('该功能暂未开放'); + return false; + } diff --git a/src/main/webapp/WEB-INF/jsp/student-add.jsp b/src/main/webapp/WEB-INF/jsp/student-add.jsp index 23d0e0b..b5efdb2 100644 --- a/src/main/webapp/WEB-INF/jsp/student-add.jsp +++ b/src/main/webapp/WEB-INF/jsp/student-add.jsp @@ -99,7 +99,7 @@ - 返回列表 + 返回列表 @@ -165,10 +165,26 @@ //alert(result); if(result){ layer.msg('添加成功！'); - setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll?page=1&size=4';},2000); + if (${sessionScope.adminInfo.power == 1}) { + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/dorm/byDorm_leader?uid=${sessionScope.adminInfo.uid}';},2000); + return false; + } + if (${sessionScope.adminInfo.power == 2}) { + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/dorm/findStudent?name=${sessionScope.adminInfo.name}';},2000); + return flase; + } + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll';},2000); }else { layer.msg('添加失败，请联系管理员'); - setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll?page=1&size=4';},2000); + if (${sessionScope.adminInfo.power == 1}) { + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/dorm/byDorm_leader?uid=${sessionScope.adminInfo.uid}';},2000); + return false; + } + if (${sessionScope.adminInfo.power == 2}) { + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/dorm/findStudent?name=${sessionScope.adminInfo.name}';},2000); + return flase; + } + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll';},2000); } } }); diff --git a/src/main/webapp/WEB-INF/jsp/student-edit.jsp b/src/main/webapp/WEB-INF/jsp/student-edit.jsp index cb51746..11ac7e7 100644 --- a/src/main/webapp/WEB-INF/jsp/student-edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/student-edit.jsp @@ -101,7 +101,7 @@ - + - - @@ -206,11 +204,11 @@ $.get("${pageContext.request.contextPath}/student/delete",{"sno":sno},function (data) { if(data){ layer.msg('删除成功!',{icon:1,time:2000}); - setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll?page=1&size=4';},2000); + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll';},2000); }else { layer.msg('删除失败!',{icon:1,time:2000}); - setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll?page=1&size=4';},2000); + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll';},2000); } }); }); diff --git a/src/main/webapp/WEB-INF/jsp/studentsTeacher.jsp b/src/main/webapp/WEB-INF/jsp/studentsTeacher.jsp new file mode 100644 index 0000000..ac57c43 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/studentsTeacher.jsp @@ -0,0 +1,191 @@ +<%-- + Created by IntelliJ IDEA. + User: user + Date: 2020/2/10 + Time: 21:45 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + + + + + + + + + + + + +<%--
    + + 首页 + 演示 + + 导航元素 + + + +
    --%> +
    +
    +
    +
    +
    + <%--
    +
    + +
    +
    + +
    +
    + +
    +
    --%> +
    + + 添加 + 共有数据：${pageInfo.total} 条 + +
    + + + + + + + + + + + + + + + + <% + int j = 1; + %> + + + + + + + + + + + + + + + + + + + + +
    ID姓名性别学号班级联系方式宿舍号育人导师状态操作
    <%=j++%>${student.name}${student.sex}${student.sno}${student.stu_class}${student.phone}${student.dorm_id}${student.teacher} + + + +
    +
    +
    +
    + 共 ${pageInfo.pages} 页 当前页：${pageInfo.pageNum} / ${pageInfo.pages}  每页 + 条 +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + + + + + + + ${i} + + + ${i} + + + + + + +
    +
    +
    +
    +
    +
    +
    + + + diff --git a/src/main/webapp/WEB-INF/jsp/visitor-list.jsp b/src/main/webapp/WEB-INF/jsp/visitor-list.jsp index 4a80b02..cba1df0 100644 --- a/src/main/webapp/WEB-INF/jsp/visitor-list.jsp +++ b/src/main/webapp/WEB-INF/jsp/visitor-list.jsp @@ -20,7 +20,7 @@ - + + index.jsp index.html diff --git a/src/main/webapp/error.jsp b/src/main/webapp/error.jsp index 3e1b86b..0007168 100644 --- a/src/main/webapp/error.jsp +++ b/src/main/webapp/error.jsp @@ -22,7 +22,7 @@

    -

    页面或者数据被 纸飞机 运到火星了，啥都看不到了…

    +

    页面或者数据被纸飞机运到火星了，啥都看不到了…

    diff --git a/target/classes/cn/ppdxzz/controller/AdminController.class b/target/classes/cn/ppdxzz/controller/AdminController.class index 4c8d044..1542401 100644 Binary files a/target/classes/cn/ppdxzz/controller/AdminController.class and b/target/classes/cn/ppdxzz/controller/AdminController.class differ diff --git a/target/classes/cn/ppdxzz/controller/BasicController.class b/target/classes/cn/ppdxzz/controller/BasicController.class index 5b079e7..2f0a504 100644 Binary files a/target/classes/cn/ppdxzz/controller/BasicController.class and b/target/classes/cn/ppdxzz/controller/BasicController.class differ diff --git a/target/classes/cn/ppdxzz/controller/DormController.class b/target/classes/cn/ppdxzz/controller/DormController.class index 3aa2f78..27373c1 100644 Binary files a/target/classes/cn/ppdxzz/controller/DormController.class and b/target/classes/cn/ppdxzz/controller/DormController.class differ diff --git a/target/classes/cn/ppdxzz/controller/StudentController.class b/target/classes/cn/ppdxzz/controller/StudentController.class index d57930c..6b9a84c 100644 Binary files a/target/classes/cn/ppdxzz/controller/StudentController.class and b/target/classes/cn/ppdxzz/controller/StudentController.class differ diff --git a/target/classes/cn/ppdxzz/controller/VisitorController.class b/target/classes/cn/ppdxzz/controller/VisitorController.class index d9e704c..a59fc0d 100644 Binary files a/target/classes/cn/ppdxzz/controller/VisitorController.class and b/target/classes/cn/ppdxzz/controller/VisitorController.class differ diff --git a/target/classes/cn/ppdxzz/dao/AdminDao.class b/target/classes/cn/ppdxzz/dao/AdminDao.class index eed83f9..e1749b1 100644 Binary files a/target/classes/cn/ppdxzz/dao/AdminDao.class and b/target/classes/cn/ppdxzz/dao/AdminDao.class differ diff --git a/target/classes/cn/ppdxzz/dao/DormDao.class b/target/classes/cn/ppdxzz/dao/DormDao.class index 09ba94e..f3c8ab3 100644 Binary files a/target/classes/cn/ppdxzz/dao/DormDao.class and b/target/classes/cn/ppdxzz/dao/DormDao.class differ diff --git a/target/classes/cn/ppdxzz/dao/StudentDao.class b/target/classes/cn/ppdxzz/dao/StudentDao.class index a0e09cf..acd7095 100644 Binary files a/target/classes/cn/ppdxzz/dao/StudentDao.class and b/target/classes/cn/ppdxzz/dao/StudentDao.class differ diff --git a/target/classes/cn/ppdxzz/domain/Admin.class b/target/classes/cn/ppdxzz/domain/Admin.class index 6b43965..4f6dcb9 100644 Binary files a/target/classes/cn/ppdxzz/domain/Admin.class and b/target/classes/cn/ppdxzz/domain/Admin.class differ diff --git a/target/classes/cn/ppdxzz/service/AdminService.class b/target/classes/cn/ppdxzz/service/AdminService.class index b5965df..a4a68ff 100644 Binary files a/target/classes/cn/ppdxzz/service/AdminService.class and b/target/classes/cn/ppdxzz/service/AdminService.class differ diff --git a/target/classes/cn/ppdxzz/service/DormService.class b/target/classes/cn/ppdxzz/service/DormService.class index 7d6703d..f4d6963 100644 Binary files a/target/classes/cn/ppdxzz/service/DormService.class and b/target/classes/cn/ppdxzz/service/DormService.class differ diff --git a/target/classes/cn/ppdxzz/service/StudentService.class b/target/classes/cn/ppdxzz/service/StudentService.class index db20d6c..23402de 100644 Binary files a/target/classes/cn/ppdxzz/service/StudentService.class and b/target/classes/cn/ppdxzz/service/StudentService.class differ diff --git a/target/classes/cn/ppdxzz/service/VisitorService.class b/target/classes/cn/ppdxzz/service/VisitorService.class index 99e2432..2129d6a 100644 Binary files a/target/classes/cn/ppdxzz/service/VisitorService.class and b/target/classes/cn/ppdxzz/service/VisitorService.class differ diff --git a/target/classes/cn/ppdxzz/service/impl/AdminServiceImpl.class b/target/classes/cn/ppdxzz/service/impl/AdminServiceImpl.class index 1e4317f..f087266 100644 Binary files a/target/classes/cn/ppdxzz/service/impl/AdminServiceImpl.class and b/target/classes/cn/ppdxzz/service/impl/AdminServiceImpl.class differ diff --git a/target/classes/cn/ppdxzz/service/impl/DormServiceImpl.class b/target/classes/cn/ppdxzz/service/impl/DormServiceImpl.class index d28b984..9775ee7 100644 Binary files a/target/classes/cn/ppdxzz/service/impl/DormServiceImpl.class and b/target/classes/cn/ppdxzz/service/impl/DormServiceImpl.class differ diff --git a/target/classes/cn/ppdxzz/service/impl/StudentServiceImpl.class b/target/classes/cn/ppdxzz/service/impl/StudentServiceImpl.class index da7183c..437965c 100644 Binary files a/target/classes/cn/ppdxzz/service/impl/StudentServiceImpl.class and b/target/classes/cn/ppdxzz/service/impl/StudentServiceImpl.class differ diff --git a/target/classes/cn/ppdxzz/service/impl/VisitorServiceImpl.class b/target/classes/cn/ppdxzz/service/impl/VisitorServiceImpl.class index 3e3fb79..6fc014c 100644 Binary files a/target/classes/cn/ppdxzz/service/impl/VisitorServiceImpl.class and b/target/classes/cn/ppdxzz/service/impl/VisitorServiceImpl.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/AdminController.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/AdminController.class index 4c8d044..1542401 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/AdminController.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/AdminController.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/BasicController.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/BasicController.class index 5b079e7..2f0a504 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/BasicController.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/BasicController.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/DormController.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/DormController.class index 3aa2f78..27373c1 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/DormController.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/DormController.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/StudentController.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/StudentController.class index d57930c..6b9a84c 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/StudentController.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/StudentController.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/VisitorController.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/VisitorController.class index d9e704c..a59fc0d 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/VisitorController.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/controller/VisitorController.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/AdminDao.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/AdminDao.class index eed83f9..e1749b1 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/AdminDao.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/AdminDao.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/DormDao.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/DormDao.class index 09ba94e..f3c8ab3 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/DormDao.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/DormDao.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/StudentDao.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/StudentDao.class index a0e09cf..acd7095 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/StudentDao.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/dao/StudentDao.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/domain/Admin.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/domain/Admin.class index 6b43965..4f6dcb9 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/domain/Admin.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/domain/Admin.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/AdminService.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/AdminService.class index b5965df..a4a68ff 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/AdminService.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/AdminService.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/DormService.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/DormService.class index 7d6703d..f4d6963 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/DormService.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/DormService.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/StudentService.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/StudentService.class index db20d6c..23402de 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/StudentService.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/StudentService.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/VisitorService.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/VisitorService.class index 99e2432..2129d6a 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/VisitorService.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/VisitorService.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/AdminServiceImpl.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/AdminServiceImpl.class index 1e4317f..f087266 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/AdminServiceImpl.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/AdminServiceImpl.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/DormServiceImpl.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/DormServiceImpl.class index d28b984..9775ee7 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/DormServiceImpl.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/DormServiceImpl.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/StudentServiceImpl.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/StudentServiceImpl.class index da7183c..437965c 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/StudentServiceImpl.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/StudentServiceImpl.class differ diff --git a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/VisitorServiceImpl.class b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/VisitorServiceImpl.class index 3e3fb79..6fc014c 100644 Binary files a/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/VisitorServiceImpl.class and b/target/hellossm/WEB-INF/classes/cn/ppdxzz/service/impl/VisitorServiceImpl.class differ diff --git a/target/hellossm/WEB-INF/jsp/admin-add.jsp b/target/hellossm/WEB-INF/jsp/admin-add.jsp index 8c2e32a..c89bdfa 100644 --- a/target/hellossm/WEB-INF/jsp/admin-add.jsp +++ b/target/hellossm/WEB-INF/jsp/admin-add.jsp @@ -36,6 +36,12 @@ +
    + +
    + +
    +
    @@ -96,6 +102,14 @@ }); }); }); + $("#uid").change(function () { + var uid = $("#uid").val().trim(); + $.get("${pageContext.request.contextPath}/checkUid",{"uid":uid},function (data) { + if (data) { + layer.msg('该学/工号已被注册，请重新输入'); + } + }); + }); function toValidate(){ var val = new validate({ /*rules里面是检验规则， @@ -105,6 +119,7 @@ rules:{ username:"notEmpty", name:"notEmpty", + uid:"notEmpty", description:"notEmpty", phone:"mobile", password:"notEmpty" @@ -120,6 +135,7 @@ var username = $("#username").val().trim(); var password = $("#password").val().trim(); var name = $("#name").val().trim(); + var uid = $("#uid").val().trim(); var phone = $("#phone").val().trim(); var power = $("#power").val().trim(); var description = $("#description").val().trim(); @@ -128,12 +144,13 @@ //这是一个对象，表示请求的参数，两个参数：method=ajax&val=xxx，服务器可以通过request.getParameter()来获取 //data:{method:"ajaxTest",val:value}, data: { - username:$("#username").val().trim(), - password:$("#password").val().trim(), - name: $("#name").val().trim(), - phone: $("#phone").val().trim(), - power: $("#power").val().trim(), - description: $("#description").val().trim(), + username:username, + password:password, + name: name, + uid:uid, + phone: phone, + power: power, + description: description }, type: "POST", //请求方式为POST dataType: "json", //服务器返回的数据是什么类型 diff --git a/target/hellossm/WEB-INF/jsp/admin-edit.jsp b/target/hellossm/WEB-INF/jsp/admin-edit.jsp index 4435e93..6493e7e 100644 --- a/target/hellossm/WEB-INF/jsp/admin-edit.jsp +++ b/target/hellossm/WEB-INF/jsp/admin-edit.jsp @@ -32,38 +32,17 @@
    - +
    - +
    - <%--
    - +
    +
    - - - - - - - - - - +
    -
    --%> +
    @@ -88,6 +67,7 @@ */ rules:{ name:"notEmpty", + uid:"notEmpty", description:"notEmpty", phone:"mobile", }, @@ -102,6 +82,7 @@ var id = $("#id").val().trim(); var username = $("#username").val().trim(); var name = $("#name").val().trim(); + var uid = $("#uid").val().trim(); var phone = $("#phone").val().trim(); var description = $("#description").val().trim(); layer.confirm('确定要修改吗',function (index) { @@ -116,11 +97,12 @@ //这是一个对象，表示请求的参数，两个参数：method=ajax&val=xxx，服务器可以通过request.getParameter()来获取 //data:{method:"ajaxTest",val:value}, data: { - id:$("#id").val().trim(), - username:$("#username").val().trim(), - name: $("#name").val().trim(), - phone: $("#phone").val().trim(), - description: $("#description").val().trim(), + id:id, + username:username, + name:name, + uid:uid, + phone: phone, + description: description }, type: "POST", //请求方式为POST dataType: "json", //服务器返回的数据是什么类型 diff --git a/target/hellossm/WEB-INF/jsp/admin-list.jsp b/target/hellossm/WEB-INF/jsp/admin-list.jsp index 58fb964..89d719c 100644 --- a/target/hellossm/WEB-INF/jsp/admin-list.jsp +++ b/target/hellossm/WEB-INF/jsp/admin-list.jsp @@ -34,11 +34,11 @@ } $("#serarch_btn").click(function () { var keyword = $("#keyword").val(); - location.href="${pageContext.request.contextPath}/findAllAdmin?page=1&size=4&keyword="+keyword; + location.href="${pageContext.request.contextPath}/findAllAdmin?page=1&size=5&keyword="+keyword; }); $("#refresh").click(function () { $("#myform").reset(); - location.href="${pageContext.request.contextPath}/findAllAdmin?page=1&size=4"; + location.href="${pageContext.request.contextPath}/findAllAdmin?page=1&size=5"; }); @@ -66,7 +66,7 @@
    - +
    @@ -82,6 +82,7 @@ ID 用户名 姓名 + 学/工号 联系方式 权限 描述 @@ -96,6 +97,7 @@ <%=j++%> ${admin.username} ${admin.name} + ${admin.uid} ${admin.phone} ${admin.power} ${admin.description} @@ -120,8 +122,6 @@ 共 ${pageInfo.pages} 页 当前页：${pageInfo.pageNum} / ${pageInfo.pages}  每页 - - diff --git a/target/hellossm/WEB-INF/jsp/dormStudent-add.jsp b/target/hellossm/WEB-INF/jsp/dormStudent-add.jsp new file mode 100644 index 0000000..4bc59d5 --- /dev/null +++ b/target/hellossm/WEB-INF/jsp/dormStudent-add.jsp @@ -0,0 +1,160 @@ +<%-- + Created by IntelliJ IDEA. + User: user + Date: 2020/2/17 + Time: 12:33 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Title + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + +
    + + + + + + + +
    + + + +
    + +
    + +
    + +
    + + 返回列表 +
    +
    + + + diff --git a/target/hellossm/WEB-INF/jsp/dormStudentsInfo.jsp b/target/hellossm/WEB-INF/jsp/dormStudentsInfo.jsp new file mode 100644 index 0000000..bda9f89 --- /dev/null +++ b/target/hellossm/WEB-INF/jsp/dormStudentsInfo.jsp @@ -0,0 +1,122 @@ +<%-- + Created by IntelliJ IDEA. + User: user + Date: 2020/2/10 + Time: 21:45 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + + + + + + + + + + + + +<%--
    + + 首页 + 演示 + + 导航元素 + + + +
    --%> +
    +
    +
    +
    + + + + 添加 + 返回列表 + + + 添加 + 返回列表 + + 共有数据：${studentsInfo.size()} 条 + +
    + + + + + + + + + + + + + + + + <% + int j = 1; + %> + + + + + + + + + + + + + + + + + + + + +
    ID姓名性别学号班级联系方式宿舍号育人导师状态操作
    <%=j++%>${student.name}${student.sex}${student.sno}${student.stu_class}${student.phone}${student.dorm_id}${student.teacher} + + + +
    +
    +
    +
    +
    +
    + + diff --git a/target/hellossm/WEB-INF/jsp/dormsTeacherInfo.jsp b/target/hellossm/WEB-INF/jsp/dormsTeacherInfo.jsp new file mode 100644 index 0000000..15cbe1c --- /dev/null +++ b/target/hellossm/WEB-INF/jsp/dormsTeacherInfo.jsp @@ -0,0 +1,122 @@ +<%-- + Created by IntelliJ IDEA. + User: user + Date: 2020/2/18 + Time: 15:56 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + + + + + + + + + + + + +<%--
    + + 首页 + 演示 + + 导航元素 + + + +
    --%> +
    +
    +
    +
    + + 添加 + 共有数据：${dorms.size()} 条 + +
    + + + + + + + + + + + + + <% + int j = 1; + %> + + + + + + + + + + + + +
    ID宿舍号宿舍简介宿舍奖惩宿舍长育人导师操作
    <%=j++%>${dorm.dorm_id}${dorm.dorm_intro}${dorm.dorm_rps}${dorm.dorm_leader}${dorm.teacher} + + + + + + + + + +
    +
    +
    +
    +
    +
    + + + + diff --git a/target/hellossm/WEB-INF/jsp/look-dorm.jsp b/target/hellossm/WEB-INF/jsp/look-dorm.jsp index 1e4727a..49cf3f0 100644 --- a/target/hellossm/WEB-INF/jsp/look-dorm.jsp +++ b/target/hellossm/WEB-INF/jsp/look-dorm.jsp @@ -45,6 +45,11 @@ ${dorm.teacher} + + + 去修改 + + diff --git a/target/hellossm/WEB-INF/jsp/main.jsp b/target/hellossm/WEB-INF/jsp/main.jsp index 2f6b05e..e9c36ab 100644 --- a/target/hellossm/WEB-INF/jsp/main.jsp +++ b/target/hellossm/WEB-INF/jsp/main.jsp @@ -1,3 +1,4 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%-- Created by IntelliJ IDEA. User: user @@ -25,7 +26,7 @@
    + 皮皮的小猪仔
    @@ -35,13 +36,13 @@
    - 消息 + 消息
    - XXX + XXX
    - XXX + XXX
    @@ -50,7 +51,7 @@
    - 个人信息
    + 个人信息
    切换帐号
    @@ -58,7 +59,7 @@
  • - 前台首页 + 友情链接
    • @@ -68,6 +69,7 @@
    @@ -192,7 +218,9 @@
    <%--中间的空白面板--%>
    - + + +
    @@ -210,5 +238,9 @@ layer.msg('目前暂不支持网页端登记'); return false; } + function power() { + layer.msg('该功能暂未开放'); + return false; + } diff --git a/target/hellossm/WEB-INF/jsp/student-add.jsp b/target/hellossm/WEB-INF/jsp/student-add.jsp index 23d0e0b..b5efdb2 100644 --- a/target/hellossm/WEB-INF/jsp/student-add.jsp +++ b/target/hellossm/WEB-INF/jsp/student-add.jsp @@ -99,7 +99,7 @@ - 返回列表 + 返回列表 @@ -165,10 +165,26 @@ //alert(result); if(result){ layer.msg('添加成功！'); - setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll?page=1&size=4';},2000); + if (${sessionScope.adminInfo.power == 1}) { + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/dorm/byDorm_leader?uid=${sessionScope.adminInfo.uid}';},2000); + return false; + } + if (${sessionScope.adminInfo.power == 2}) { + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/dorm/findStudent?name=${sessionScope.adminInfo.name}';},2000); + return flase; + } + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll';},2000); }else { layer.msg('添加失败，请联系管理员'); - setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll?page=1&size=4';},2000); + if (${sessionScope.adminInfo.power == 1}) { + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/dorm/byDorm_leader?uid=${sessionScope.adminInfo.uid}';},2000); + return false; + } + if (${sessionScope.adminInfo.power == 2}) { + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/dorm/findStudent?name=${sessionScope.adminInfo.name}';},2000); + return flase; + } + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll';},2000); } } }); diff --git a/target/hellossm/WEB-INF/jsp/student-edit.jsp b/target/hellossm/WEB-INF/jsp/student-edit.jsp index cb51746..11ac7e7 100644 --- a/target/hellossm/WEB-INF/jsp/student-edit.jsp +++ b/target/hellossm/WEB-INF/jsp/student-edit.jsp @@ -101,7 +101,7 @@ - + - - @@ -206,11 +204,11 @@ $.get("${pageContext.request.contextPath}/student/delete",{"sno":sno},function (data) { if(data){ layer.msg('删除成功!',{icon:1,time:2000}); - setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll?page=1&size=4';},2000); + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll';},2000); }else { layer.msg('删除失败!',{icon:1,time:2000}); - setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll?page=1&size=4';},2000); + setTimeout(function () {window.location.href='${pageContext.request.contextPath}/student/findAll';},2000); } }); }); diff --git a/target/hellossm/WEB-INF/jsp/studentsTeacher.jsp b/target/hellossm/WEB-INF/jsp/studentsTeacher.jsp new file mode 100644 index 0000000..ac57c43 --- /dev/null +++ b/target/hellossm/WEB-INF/jsp/studentsTeacher.jsp @@ -0,0 +1,191 @@ +<%-- + Created by IntelliJ IDEA. + User: user + Date: 2020/2/10 + Time: 21:45 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + + + + + + + + + + + + +<%--
    + + 首页 + 演示 + + 导航元素 + + + +
    --%> +
    +
    +
    +
    +
    + <%--
    +
    + +
    +
    + +
    +
    + +
    +
    --%> +
    + + 添加 + 共有数据：${pageInfo.total} 条 + +
    + + + + + + + + + + + + + + + + <% + int j = 1; + %> + + + + + + + + + + + + + + + + + + + + +
    ID姓名性别学号班级联系方式宿舍号育人导师状态操作
    <%=j++%>${student.name}${student.sex}${student.sno}${student.stu_class}${student.phone}${student.dorm_id}${student.teacher} + + + +
    +
    +
    +
    + 共 ${pageInfo.pages} 页 当前页：${pageInfo.pageNum} / ${pageInfo.pages}  每页 + 条 +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + + + + + + + ${i} + + + ${i} + + + + + + +
    +
    +
    +
    +
    +
    +
    + + + diff --git a/target/hellossm/WEB-INF/jsp/visitor-list.jsp b/target/hellossm/WEB-INF/jsp/visitor-list.jsp index 4a80b02..cba1df0 100644 --- a/target/hellossm/WEB-INF/jsp/visitor-list.jsp +++ b/target/hellossm/WEB-INF/jsp/visitor-list.jsp @@ -20,7 +20,7 @@ - + + index.jsp index.html diff --git a/target/hellossm/error.jsp b/target/hellossm/error.jsp index 3e1b86b..0007168 100644 --- a/target/hellossm/error.jsp +++ b/target/hellossm/error.jsp @@ -22,7 +22,7 @@

    -

    页面或者数据被 纸飞机 运到火星了，啥都看不到了…

    +

    页面或者数据被纸飞机运到火星了，啥都看不到了…

    diff --git a/宿管系统（SSM框架）.md b/宿管系统（SSM框架）.md index a16dad7..88c286c 100644 --- a/宿管系统（SSM框架）.md +++ b/宿管系统（SSM框架）.md @@ -10,6 +10,7 @@ 8. 2020.2.18，今天实现学生信息添加的时候，使用ajax异步去请求后台的时候，后台返回的结果前台接受不到，捣鼓了一上午才发现原来是因为一个提交方式为“submit”，使用异步应该将其设置为“button”，特将其错误记录于此。下午结束了学生模块的基本操作，进一步开发访客模块，后台均已写好，待设计前台访客来访记录表页面。 9. 2020.2.19，基本完成了访客的CRUD模块，以及导出功能，前台实现访客登记，但还未实现访客日志的功能，后续会增加上此功能。 10. 2020.2.20，完成了宿舍模块的基本功能，同时新增了功能，表格内容过多会显示省略号，需点击详情页才能完整查看宿舍内容过长信息。 +11. 2020.2.22，基本的功能实现已经大体完成，此项目就暂时完结。