diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..66f103dcf9b97aceff164e2cd4284c4bc6e13b3b --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +*.class +.classpath +.project + +# Java class files +*.class + +# Generated files +/bin/ +/gen/ +/out/ + +# Log Files +*.log + + +# Intellij +*.iml + diff --git a/WebContent/jsp/AddTbUser.jsp b/WebContent/jsp/AddTbUser.jsp new file mode 100644 index 0000000000000000000000000000000000000000..ae8834a2c48c07b769e8bb73eba5cfce48d46972 --- /dev/null +++ b/WebContent/jsp/AddTbUser.jsp @@ -0,0 +1,97 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + + + + 添加用户 + + + + + + + + + + + + + + + + +
+ +
    +
  1. + 系统管理 +
    2. +
  2. 用户管理
    3. +
+ +
+ + +
+ +
+ + +
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ + +
+
+
+ +
+ +
+
+ + + + + \ No newline at end of file diff --git a/WebContent/jsp/Header.jsp b/WebContent/jsp/Header.jsp index 791e42f8bee20b99fb65d3b821a1610773a2d8a5..800ef7bda232ced2514cb3408495e2c9e1f26917 100644 --- a/WebContent/jsp/Header.jsp +++ b/WebContent/jsp/Header.jsp @@ -49,6 +49,16 @@ + +
  • 用户管理 + +
  • 培养方案管理 diff --git a/build/classes/.gitignore b/build/classes/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..8fe2033fde705c8b260874adbc425557978061cd --- /dev/null +++ b/build/classes/.gitignore @@ -0,0 +1 @@ +/cn/ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.class index 9bf5bdb6846ef3eb2465a6f3cd3ea4c25fddb076..2712a4b113a72398d10566c511897a680ba7acd6 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CourseService.class b/build/classes/cn/edu/hrbcu/curriculum/service/CourseService.class index 7e04e70a6713203d17b2a89e66035ae6b4b19e57..e9a18cf46982509b2b95e2688f224700df192aff 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CourseService.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CourseService.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class index 67ac549f7a17ab6d6ac341ef541912a5b9d3f684..e3bfbfeb044a9606a472c0bf8362ee4429a02355 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.class index f639ffb6f546b646f7e0637acfc38b7e779123c4..ebcfb1cff23e4202d9bf0f11c642a09ba0c6e7d7 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.class index 5a15150af761fdb3ba65e4e435aea3c3a2ed12e5..03050ba981cfefc419ebe0cac1a3c7fd6ddd8330 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class index b4caaa9cb029929b48f5c5aabacf9419a12ccaaf..3d020c57e42f3d638ba97ab9eaf66bd94589161d 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.class index 224f2ce54d8106fe7c543077c188bbcc3fa087f8..bb036774b59c0d7a3776d80fd6859339f87d5a6d 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class index 1a0aaf06e88ab511ec478fc8c4ee1f8a1db5cbd9..c3ba3137ff84e57f1522a70931580cebaf3d3c89 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class and b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class index 46fedea406b9b2eabb40138b3e9d51993da4744f..aff559cb89f1d0b8d6062b812b0ead17bf7b47b2 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.class index a4136f954b89f5684829784039cf7542cf0cde14..64321941bbf21542d6d5b518b7bf9f2f2a15a95b 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.class differ diff --git a/src/cn/edu/hrbcu/curriculum/controller/TbUserController.java b/src/cn/edu/hrbcu/curriculum/controller/TbUserController.java new file mode 100644 index 0000000000000000000000000000000000000000..45eed9ed1c7d1b88041ad3baa41489af4c436cae --- /dev/null +++ b/src/cn/edu/hrbcu/curriculum/controller/TbUserController.java @@ -0,0 +1,77 @@ +package cn.edu.hrbcu.curriculum.controller; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; +import com.github.pagehelper.PageInfo; +import cn.edu.hrbcu.curriculum.pojo.TbUser; +import cn.edu.hrbcu.curriculum.service.TbUserService; + +@Controller +@RequestMapping("/TbUserController") +public class TbUserController { + + @Autowired + TbUserService tbUserService; + + @RequestMapping("/QueryTbUser.action") + public ModelAndView QueryTbUser(@RequestParam(value = "currentPage",required=false, defaultValue="1") Integer currentPage){ + List list = new ArrayList();//courseService.selectCourses(currentPage); + PageInfo page = new PageInfo(list); + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("TbUser"); + modelAndView.addObject("pageInfo", page); + modelAndView.addObject("page_url", "/CurriculumSystemManager/TbUserController/QueryTbUser.action"); + + return modelAndView; + } + + @RequestMapping("/QueryAllTbUser.action") + @ResponseBody + public Object QueryAllTbUser(){ + List list = tbUserService.selectUser(-1); + return list; + } + + @RequestMapping("/AddTbUser.action") + public Object AddTbUser(TbUser user){ + + tbUserService.insertUser(user); + + return "forward:/TbUserController/QueryTbUser.action"; + } + + @RequestMapping("/DeleteTbUser.action") + public Object DeleteTbUser(TbUser tbUser){ + + tbUserService.deletTbUser(tbUser); + + return "forward:/TbUserController/QueryTbUser.action"; + } + + @RequestMapping("/toUpdateTbUser.action") + public Object toUpdateTbUser(TbUser tbUser){ + + tbUser = tbUserService.selectTbUserById(tbUser); + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("UpdateCourse"); + modelAndView.addObject("course", tbUser); + + return modelAndView; + } + + @RequestMapping("/UpdateTbUser.action") + public Object UpdateTbUser(TbUser tbUser){ + int cnt = tbUserService.updateTbUser(tbUser); + + return "forward:/TbUserController/QueryTbUser.action"; + } + +} diff --git a/src/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.java index b85e5ed03b69c0d946dbbe9d507a556def9596c5..bfa7efa68c3acb74e2941f61535d7869eee9e266 100644 --- a/src/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/AcademyServiceImpl.java @@ -3,15 +3,12 @@ package cn.edu.hrbcu.curriculum.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.github.pagehelper.PageHelper; - +import org.springframework.stereotype.Service; +import com.github.pagehelper.PageHelper; import cn.edu.hrbcu.curriculum.dao.AcademyMapper; import cn.edu.hrbcu.curriculum.pojo.Academy; import cn.edu.hrbcu.curriculum.pojo.AcademyExample; -import cn.edu.hrbcu.utils.Common; - +import cn.edu.hrbcu.utils.Common; @Service public class AcademyServiceImpl implements AcademyService{ diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseService.java b/src/cn/edu/hrbcu/curriculum/service/CourseService.java index e2ca985ca6ca83e32dd2983509175dd1486b1ccf..f7890bf2b3361081260345e696b5ba4530203aec 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CourseService.java +++ b/src/cn/edu/hrbcu/curriculum/service/CourseService.java @@ -9,12 +9,13 @@ public interface CourseService { int insertCourse(Course course); List selectAllCourse(); - - List selectCourses(int currentPage); - - void deleteCourse(Course course); + + List selectCourses(int i); Course selectCourseById(Course course); int updateCourse(Course course); + + void deleteCourse(Course course); + } diff --git a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java index 451e9dd813d2497187b051964ddda2ab5ff6d94a..d17b50f597745ab189ced729af379e3c2a2c7239 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CourseServiceImpl.java @@ -1,10 +1,8 @@ package cn.edu.hrbcu.curriculum.service; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.github.pagehelper.PageHelper; - +import org.springframework.stereotype.Service; +import com.github.pagehelper.PageHelper; import java.util.List; import cn.edu.hrbcu.curriculum.dao.CourseMapper; import cn.edu.hrbcu.curriculum.pojo.Course; @@ -32,8 +30,7 @@ public class CourseServiceImpl implements CourseService { return courseMapper.selectByExample(example); } - - @Override + public List selectCourses(int currentPage) { if(currentPage >= 0){ PageHelper.startPage(currentPage, Common.PAGE_SIZE); @@ -64,7 +61,7 @@ public class CourseServiceImpl implements CourseService { @Override public int updateCourse(Course course) { CourseExample example = new CourseExample(); - return courseMapper.updateByExampleSelective(course, example); + return courseMapper.updateByExampleSelective(course, example); } } diff --git a/src/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.java index c541df82e334ca94af7501c5b4559424fb52e65b..b8eb9b97a3b55138e6583b728f3da9211717443f 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CoursemodeServiceImpl.java @@ -3,15 +3,13 @@ package cn.edu.hrbcu.curriculum.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.github.pagehelper.PageHelper; - +import org.springframework.stereotype.Service; +import com.github.pagehelper.PageHelper; import cn.edu.hrbcu.curriculum.dao.CoursemodeMapper; import cn.edu.hrbcu.curriculum.pojo.Coursemode; -import cn.edu.hrbcu.curriculum.pojo.CoursemodeExample; +import cn.edu.hrbcu.curriculum.pojo.CoursemodeExample; import cn.edu.hrbcu.utils.Common; - + @Service public class CoursemodeServiceImpl implements CoursemodeService{ diff --git a/src/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.java index c82473f7fd72a0b9ff1e2f52b37d86e600cd44fa..654a715eb046769230f42b1d5c47292f46ee7cdb 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CoursetypeServiceImpl.java @@ -2,15 +2,12 @@ package cn.edu.hrbcu.curriculum.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.github.pagehelper.PageHelper; - +import org.springframework.stereotype.Service; +import com.github.pagehelper.PageHelper; import cn.edu.hrbcu.curriculum.dao.CoursetypeMapper; import cn.edu.hrbcu.curriculum.pojo.Coursetype; -import cn.edu.hrbcu.curriculum.pojo.CoursetypeExample; -import cn.edu.hrbcu.utils.Common; - +import cn.edu.hrbcu.curriculum.pojo.CoursetypeExample; +import cn.edu.hrbcu.utils.Common; @Service public class CoursetypeServiceImpl implements CoursetypeService{ diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java index 7c19c3a6c6d0e2cad434c2686d0e767685df0638..b8b196e287fc59ef5d79804daac1f5f4cd9a14d3 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java +++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java @@ -7,7 +7,7 @@ public interface CurriculumService { int insertCurriculum(Curriculum curriculum); List selectAllCurriculum(); - + void deleteCurriculum(Curriculum curriculum); Curriculum selectCurriculumById(Curriculum curriculum); @@ -15,6 +15,5 @@ public interface CurriculumService { int updateCurriculum(Curriculum curriculum); List selectCurriculums(int currentPage); - - + } diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java index 127cc30e0111242e7413125ce6b0ef5e08b250c5..265d82d96e13589118e25deca758851dd82d7f6d 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java @@ -9,8 +9,10 @@ import com.github.pagehelper.PageHelper; import cn.edu.hrbcu.curriculum.dao.CurriculumMapper; import cn.edu.hrbcu.curriculum.pojo.Curriculum; import cn.edu.hrbcu.curriculum.pojo.CurriculumExample; + import cn.edu.hrbcu.utils.Common; + @Service public class CurriculumServiceImpl implements CurriculumService{ @@ -31,7 +33,7 @@ public class CurriculumServiceImpl implements CurriculumService{ return curriculumMapper.selectByExample(example); } - @Override + @Override public void deleteCurriculum(Curriculum curriculum) { curriculumMapper.deleteByPrimaryKey(curriculum.getAcademyid()); @@ -58,7 +60,7 @@ public class CurriculumServiceImpl implements CurriculumService{ CurriculumExample.Criteria criteria = example.createCriteria(); criteria.andIdGreaterThan(0L); List list = curriculumMapper.selectByExample(example); - return list; + return list; } } diff --git a/src/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.java index c848d28c41a0679ad060875944ec157d8ff3ff4e..d8a6a5512fade4a5210112a9b2493b5c867b435f 100644 --- a/src/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/ExaminationmethodServiceImpl.java @@ -4,14 +4,13 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - + import com.github.pagehelper.PageHelper; - + import cn.edu.hrbcu.curriculum.dao.ExaminationmethodMapper; import cn.edu.hrbcu.curriculum.pojo.Examinationmethod; -import cn.edu.hrbcu.curriculum.pojo.ExaminationmethodExample; -import cn.edu.hrbcu.utils.Common; - +import cn.edu.hrbcu.curriculum.pojo.ExaminationmethodExample; +import cn.edu.hrbcu.utils.Common; @Service public class ExaminationmethodServiceImpl implements ExaminationmethodService{ diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserService.java b/src/cn/edu/hrbcu/curriculum/service/TbUserService.java index 7c9efe4b3e5d14776478da50f59834ffab5308f3..b794733fbbcbecf5ff694b65030d22bf55058841 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbUserService.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbUserService.java @@ -8,8 +8,15 @@ public interface TbUserService { int insertUser(TbUser user); List selectUserByLoginname(String username); - - List selectAllUser(); + + int updateTbUser(TbUser tbUser); + + TbUser selectTbUserById(TbUser tbUser); + + void deletTbUser(TbUser tbUser); List selectTbUsers(int currentPage); + + List selectAllUser(); + } diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java index 64d7383809b97490225dec2e93c2a3c84409c294..422da621531c8caa7e322dcb6edfdfd2f9ace27b 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java @@ -43,8 +43,7 @@ public class TbUserServiceImpl implements TbUserService{ return bUserMapper.selectByExample(example); } - - @Override + public List selectTbUsers(int currentPage) { if(currentPage >= 0){ PageHelper.startPage(currentPage, Common.PAGE_SIZE); @@ -54,7 +53,27 @@ public class TbUserServiceImpl implements TbUserService{ TbUserExample.Criteria criteria = example.createCriteria(); criteria.andIdGreaterThan(0L); List list = bUserMapper.selectByExample(example); - return list; + return list; + } + + @Override + public int updateTbUser(TbUser tbUser) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public TbUser selectTbUserById(TbUser tbUser) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void deletTbUser(TbUser tbUser) { + bUserMapper.deleteByPrimaryKey(tbUser.getId()); + } + + } diff --git a/src/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.java index 8a496901bc75cd136cf66d1ae1f65fe28b224499..c61c46555e1398bb98d7a17a5f2c7962814ec8df 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/TeachingmethodServiceImpl.java @@ -4,13 +4,15 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import com.github.pagehelper.PageHelper; - + import cn.edu.hrbcu.curriculum.dao.TeachingmethodMapper; import cn.edu.hrbcu.curriculum.pojo.Teachingmethod; import cn.edu.hrbcu.curriculum.pojo.TeachingmethodExample; + import cn.edu.hrbcu.utils.Common; - + @Service public class TeachingmethodServiceImpl implements TeachingmethodService{ @Autowired