diff --git a/WebContent/generatorConfig.xml b/WebContent/generatorConfig.xml index 11feb47b918769a3ed90b07c3094887eb5c90ffc..580b053a1e39ed89086a7681b4468eae4c200046 100644 --- a/WebContent/generatorConfig.xml +++ b/WebContent/generatorConfig.xml @@ -80,7 +80,7 @@ --> - + +
+ +
\ No newline at end of file diff --git a/WebContent/jsp/QueryCurriculum.jsp b/WebContent/jsp/QueryCurriculum.jsp index 5b9b9f95a0a3ee189e04c01e4620b9f3afbb1a55..396bac34754733de71e1c8fc12f7247f0a95108a 100644 --- a/WebContent/jsp/QueryCurriculum.jsp +++ b/WebContent/jsp/QueryCurriculum.jsp @@ -9,121 +9,210 @@ 实施进程表 - + - - - - @@ -178,15 +267,24 @@ ID - 课程名称 + 课程名称 - + - - ${course.id } - ${course.name} - + + ${course.id } + ${course.name} + + ---- + ${course.score} + 0 + ${course.theoretical} + ${course.experiement} + 0 + 1 + 17 + @@ -234,7 +332,7 @@ 结束周 - + ## 小计 @@ -278,130 +376,84 @@
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
----------------------------------------
${curriculum.id }${course.name }${course.identifier }${course.score }${course.theoretical }${course.experiement }${user.id}${curriculum.hpw }${curriculum.start }${curriculum.end } - 更新 - 删除 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
##小计----00000--------
${curriculum.id }${course.name }${course.identifier }${course.score }${course.theoretical }${course.experiement }${user.id}${curriculum.hpw }${curriculum.start }${curriculum.end } + 更新 + 删除 +
+
-
3
-
4
-
5
-
6
-
7
-
8
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
- - - - - - <%--
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
${curriculum.id }${course.name }${course.identifier }${course.score }${course.theoretical }${course.experiement }${user.id}${curriculum.hpw }${curriculum.start }${curriculum.end } - 更新 - 删除 -
-
--%> - - - - - - - - - <%-- - 增加课程 --%> + diff --git a/WebContent/jsp/semester.jsp b/WebContent/jsp/semester.jsp new file mode 100644 index 0000000000000000000000000000000000000000..eb7fb0dd57db737355e219d20ec1378f89db3dfa --- /dev/null +++ b/WebContent/jsp/semester.jsp @@ -0,0 +1,59 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID课程名称课程编号学分学期学时理论学时实验学时周学时起始周结束周
##小计----00000--------
${curriculum.id }${course.name }${course.identifier }${course.score }${course.theoretical }${course.experiement }${user.id}${curriculum.hpw }${curriculum.start }${curriculum.end }
+
+
diff --git a/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class b/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class index b401fa4bb0460e573a18b771d1c9711e091082b6..973a3c50a612b072d95b0cd4c423566264d6449e 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class and b/build/classes/cn/edu/hrbcu/curriculum/controller/CurriculumController.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml b/build/classes/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml index cebda364b85c9ad5c3e17454a81e10d84650dd4c..72bbd56ce7fc1d5e941f047ef29abf949e5f0145 100644 --- a/build/classes/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml +++ b/build/classes/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml @@ -9,6 +9,7 @@ + @@ -69,7 +70,7 @@ - id, specialityid, courseid, semester, start, end, hpw + id, specialityid, courseid, semester, start, end, hpw, sort @@ -188,6 +195,9 @@ hpw = #{record.hpw,jdbcType=DOUBLE}, + + sort = #{record.sort,jdbcType=INTEGER}, + @@ -201,7 +211,8 @@ semester = #{record.semester,jdbcType=INTEGER}, start = #{record.start,jdbcType=INTEGER}, end = #{record.end,jdbcType=INTEGER}, - hpw = #{record.hpw,jdbcType=DOUBLE} + hpw = #{record.hpw,jdbcType=DOUBLE}, + sort = #{record.sort,jdbcType=INTEGER} @@ -227,6 +238,9 @@ hpw = #{hpw,jdbcType=DOUBLE}, + + sort = #{sort,jdbcType=INTEGER}, + where id = #{id,jdbcType=BIGINT} @@ -237,7 +251,8 @@ semester = #{semester,jdbcType=INTEGER}, start = #{start,jdbcType=INTEGER}, end = #{end,jdbcType=INTEGER}, - hpw = #{hpw,jdbcType=DOUBLE} + hpw = #{hpw,jdbcType=DOUBLE}, + sort = #{sort,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/Curriculum.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/Curriculum.class index 5c8ce55c80991ba7ca4c506f1bb1ed8e99968dc7..c46a17cac714d3ac1aedb81515b4060de3697ca6 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/pojo/Curriculum.class and b/build/classes/cn/edu/hrbcu/curriculum/pojo/Curriculum.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criteria.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criteria.class index e1392732f1d46a61c96ed638dd8a13cdf0551d3c..f4860f3e0e7ad6244f600a82e5ec582a676440ee 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criteria.class and b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criteria.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criterion.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criterion.class index 128ca997eb59319f83e3fae3a2db788397c3f467..491ad7289ececa9266a784594a222994630cc796 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criterion.class and b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$Criterion.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$GeneratedCriteria.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$GeneratedCriteria.class index aa4ed4ce54ed1b2daf56b7107813bc71d25eab1d..2b8c600435a417d9105b682e5cd96c4d15d14b77 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$GeneratedCriteria.class and b/build/classes/cn/edu/hrbcu/curriculum/pojo/CurriculumExample$GeneratedCriteria.class differ diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumService.class b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumService.class index 9a78ff8842e6e816e767d327e7ec89965e03509d..8769c8bf1a7476ca7ff67aadd79a04b7c8c7aaa8 100644 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumService.class and b/build/classes/cn/edu/hrbcu/curriculum/service/CurriculumService.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 be353e00d8dc952368f12c539b6ccc72484ec2db..079aa3ac39771413775061dae84bfd395024cd79 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/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java index fa13b4ce70479bce3d97c09a3f6ffcf0f3035bbd..cadee4a14ebd3b3c1db22ccfb623c0ad803df401 100644 --- a/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java +++ b/src/cn/edu/hrbcu/curriculum/controller/CurriculumController.java @@ -3,9 +3,13 @@ package cn.edu.hrbcu.curriculum.controller; import java.util.ArrayList; import java.util.List; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; @@ -15,10 +19,13 @@ import com.github.pagehelper.PageInfo; import cn.edu.hrbcu.curriculum.pojo.Course; import cn.edu.hrbcu.curriculum.pojo.Curriculum; import cn.edu.hrbcu.curriculum.pojo.Examinationmethod; +import cn.edu.hrbcu.curriculum.pojo.Speciality; +import cn.edu.hrbcu.curriculum.pojo.TbUser; import cn.edu.hrbcu.curriculum.service.CourseService; import cn.edu.hrbcu.curriculum.service.CurriculumService; import cn.edu.hrbcu.curriculum.service.ExaminationmethodService; -import cn.edu.hrbcu.curriculum.pojo.Curriculum; +import cn.edu.hrbcu.curriculum.service.SpecialityService; +import cn.edu.hrbcu.curriculum.service.TbUserService; @Controller @RequestMapping("/CurriculumController") @@ -29,6 +36,10 @@ public class CurriculumController { CourseService courseService; @Autowired ExaminationmethodService examinationmethodService; + @Autowired + private SpecialityService specialityService; + @Autowired + private TbUserService tbUserService; @RequestMapping("/QueryCurriculum.action") public ModelAndView QueryCurriculum(@RequestParam(value = "currentPage",required=false, defaultValue="1") Integer currentPage){ @@ -47,7 +58,7 @@ public class CurriculumController { return modelAndView; } - @RequestMapping("/QueryAllCurriculum.action") + /*@RequestMapping("/QueryAllCurriculum.action") @ResponseBody public Object QueryAllCurriculum(){ List list = curriculumService.selectCurriculums(-1); @@ -79,12 +90,28 @@ public class CurriculumController { modelAndView.addObject("curriculum", curriculum); return modelAndView; - } + }*/ - @RequestMapping("/UpdateCurriculum.action") - public Object UpdateCurriculum(Curriculum curriculum){ - int cnt = curriculumService.updateCurriculum(curriculum); + @RequestMapping(value = "/UpdateCurriculum.action", method = RequestMethod.POST) + @ResponseBody + public Object UpdateCurriculum(@RequestBody Integer semester,@RequestBody Curriculum[] curriculums){ + Subject subject = SecurityUtils.getSubject(); - return "forward:/CurriculumController/QueryCurriculum.action"; + System.out.println(curriculums.length); + + /*List tbUsers = tbUserService.selectUserByLoginname((String)subject.getPrincipal()); + if(tbUsers != null && tbUsers.size() > 0){ + Speciality speciality = specialityService.selectSpecialityByUserId(tbUsers.get(0).getId()); + if(speciality != null){ + int cnt = curriculumService.updateCurriculum(speciality.getId(), semester, course_ids); + }else{ + return "failure"; + } + }else{ + return "failure"; + }*/ + + return "successful"; } + } diff --git a/src/cn/edu/hrbcu/curriculum/dao/SpecialityMapper.java b/src/cn/edu/hrbcu/curriculum/dao/SpecialityMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..fb756aa876838225224abef0fbacdab138f54d3d --- /dev/null +++ b/src/cn/edu/hrbcu/curriculum/dao/SpecialityMapper.java @@ -0,0 +1,30 @@ +package cn.edu.hrbcu.curriculum.dao; + +import cn.edu.hrbcu.curriculum.pojo.Speciality; +import cn.edu.hrbcu.curriculum.pojo.SpecialityExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SpecialityMapper { + long countByExample(SpecialityExample example); + + int deleteByExample(SpecialityExample example); + + int deleteByPrimaryKey(Long id); + + int insert(Speciality record); + + int insertSelective(Speciality record); + + List selectByExample(SpecialityExample example); + + Speciality selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") Speciality record, @Param("example") SpecialityExample example); + + int updateByExample(@Param("record") Speciality record, @Param("example") SpecialityExample example); + + int updateByPrimaryKeySelective(Speciality record); + + int updateByPrimaryKey(Speciality record); +} \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml b/src/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml index cebda364b85c9ad5c3e17454a81e10d84650dd4c..72bbd56ce7fc1d5e941f047ef29abf949e5f0145 100644 --- a/src/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml +++ b/src/cn/edu/hrbcu/curriculum/mapper/CurriculumMapper.xml @@ -9,6 +9,7 @@ + @@ -69,7 +70,7 @@ - id, specialityid, courseid, semester, start, end, hpw + id, specialityid, courseid, semester, start, end, hpw, sort @@ -188,6 +195,9 @@ hpw = #{record.hpw,jdbcType=DOUBLE}, + + sort = #{record.sort,jdbcType=INTEGER}, + @@ -201,7 +211,8 @@ semester = #{record.semester,jdbcType=INTEGER}, start = #{record.start,jdbcType=INTEGER}, end = #{record.end,jdbcType=INTEGER}, - hpw = #{record.hpw,jdbcType=DOUBLE} + hpw = #{record.hpw,jdbcType=DOUBLE}, + sort = #{record.sort,jdbcType=INTEGER} @@ -227,6 +238,9 @@ hpw = #{hpw,jdbcType=DOUBLE}, + + sort = #{sort,jdbcType=INTEGER}, + where id = #{id,jdbcType=BIGINT} @@ -237,7 +251,8 @@ semester = #{semester,jdbcType=INTEGER}, start = #{start,jdbcType=INTEGER}, end = #{end,jdbcType=INTEGER}, - hpw = #{hpw,jdbcType=DOUBLE} + hpw = #{hpw,jdbcType=DOUBLE}, + sort = #{sort,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml b/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..3110934090f39a40b06a57f9b0f74215133cffc1 --- /dev/null +++ b/src/cn/edu/hrbcu/curriculum/mapper/SpecialityMapper.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, tbuserid + + + + + delete from speciality + where id = #{id,jdbcType=BIGINT} + + + delete from speciality + + + + + + insert into speciality (id, name, tbuserid + ) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{tbuserid,jdbcType=BIGINT} + ) + + + insert into speciality + + + id, + + + name, + + + tbuserid, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{tbuserid,jdbcType=BIGINT}, + + + + + + update speciality + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + tbuserid = #{record.tbuserid,jdbcType=BIGINT}, + + + + + + + + update speciality + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + tbuserid = #{record.tbuserid,jdbcType=BIGINT} + + + + + + update speciality + + + name = #{name,jdbcType=VARCHAR}, + + + tbuserid = #{tbuserid,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update speciality + set name = #{name,jdbcType=VARCHAR}, + tbuserid = #{tbuserid,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Curriculum.java b/src/cn/edu/hrbcu/curriculum/pojo/Curriculum.java index ad507785e8dcea990e80f555bc60b14034d40f8b..5549ee6f6bf558e1cc41b33010cc423fa8de490f 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/Curriculum.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/Curriculum.java @@ -17,6 +17,8 @@ public class Curriculum implements Serializable { private Double hpw; + private Integer sort; + private static final long serialVersionUID = 1L; public Long getId() { @@ -74,4 +76,12 @@ public class Curriculum implements Serializable { public void setHpw(Double hpw) { this.hpw = hpw; } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } } \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/CurriculumExample.java b/src/cn/edu/hrbcu/curriculum/pojo/CurriculumExample.java index 323ad7be7528d2752d4ca418d9d42b1c831c31e8..5f43061c479e6d8c77dd414b69947e08a22ecd54 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/CurriculumExample.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/CurriculumExample.java @@ -523,6 +523,66 @@ public class CurriculumExample { addCriterion("hpw not between", value1, value2, "hpw"); return (Criteria) this; } + + public Criteria andSortIsNull() { + addCriterion("sort is null"); + return (Criteria) this; + } + + public Criteria andSortIsNotNull() { + addCriterion("sort is not null"); + return (Criteria) this; + } + + public Criteria andSortEqualTo(Integer value) { + addCriterion("sort =", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotEqualTo(Integer value) { + addCriterion("sort <>", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThan(Integer value) { + addCriterion("sort >", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThanOrEqualTo(Integer value) { + addCriterion("sort >=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThan(Integer value) { + addCriterion("sort <", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThanOrEqualTo(Integer value) { + addCriterion("sort <=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortIn(List values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List values) { + addCriterion("sort not in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortBetween(Integer value1, Integer value2) { + addCriterion("sort between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotBetween(Integer value1, Integer value2) { + addCriterion("sort not between", value1, value2, "sort"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java b/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java new file mode 100644 index 0000000000000000000000000000000000000000..8849d54432ea003555a490f475fca2d6aa82769a --- /dev/null +++ b/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java @@ -0,0 +1,37 @@ +package cn.edu.hrbcu.curriculum.pojo; + +import java.io.Serializable; + +public class Speciality implements Serializable { + private Long id; + + private String name; + + private Long tbuserid; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public Long getTbuserid() { + return tbuserid; + } + + public void setTbuserid(Long tbuserid) { + this.tbuserid = tbuserid; + } +} \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java b/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java new file mode 100644 index 0000000000000000000000000000000000000000..fcf097ce33fec0420597370b9e1f8ec1d2010e5b --- /dev/null +++ b/src/cn/edu/hrbcu/curriculum/pojo/SpecialityExample.java @@ -0,0 +1,390 @@ +package cn.edu.hrbcu.curriculum.pojo; + +import java.util.ArrayList; +import java.util.List; + +public class SpecialityExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SpecialityExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andTbuseridIsNull() { + addCriterion("tbuserid is null"); + return (Criteria) this; + } + + public Criteria andTbuseridIsNotNull() { + addCriterion("tbuserid is not null"); + return (Criteria) this; + } + + public Criteria andTbuseridEqualTo(Long value) { + addCriterion("tbuserid =", value, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridNotEqualTo(Long value) { + addCriterion("tbuserid <>", value, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridGreaterThan(Long value) { + addCriterion("tbuserid >", value, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridGreaterThanOrEqualTo(Long value) { + addCriterion("tbuserid >=", value, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridLessThan(Long value) { + addCriterion("tbuserid <", value, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridLessThanOrEqualTo(Long value) { + addCriterion("tbuserid <=", value, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridIn(List values) { + addCriterion("tbuserid in", values, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridNotIn(List values) { + addCriterion("tbuserid not in", values, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridBetween(Long value1, Long value2) { + addCriterion("tbuserid between", value1, value2, "tbuserid"); + return (Criteria) this; + } + + public Criteria andTbuseridNotBetween(Long value1, Long value2) { + addCriterion("tbuserid not between", value1, value2, "tbuserid"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java index b8b196e287fc59ef5d79804daac1f5f4cd9a14d3..1ca454081a2e2d2aae0f1b21b1b680fd109a864a 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java +++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumService.java @@ -12,8 +12,10 @@ public interface CurriculumService { Curriculum selectCurriculumById(Curriculum curriculum); - int updateCurriculum(Curriculum curriculum); - List selectCurriculums(int currentPage); + + int updateCurriculum(Long specialityid, int semester,String course_ids); + + List selectCurriculumIdsBy(Long specialityid,int semester, List ids); } diff --git a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java index 7ba4b7e10ff612620dd4899f5e7710c70b73728e..2f3ecffa5a28cebaca5d139de0a1b34d89fd8146 100644 --- a/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/CurriculumServiceImpl.java @@ -1,6 +1,10 @@ package cn.edu.hrbcu.curriculum.service; +import java.util.ArrayList; import java.util.List; + +import org.apache.shiro.SecurityUtils; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -9,14 +13,13 @@ 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.curriculum.pojo.Speciality; +import cn.edu.hrbcu.curriculum.pojo.TbUser; import cn.edu.hrbcu.utils.Common; @Service public class CurriculumServiceImpl implements CurriculumService{ - - @Autowired private CurriculumMapper curriculumMapper; @@ -45,9 +48,31 @@ public class CurriculumServiceImpl implements CurriculumService{ } @Override - public int updateCurriculum(Curriculum curriculum) { - CurriculumExample example = new CurriculumExample(); - return curriculumMapper.updateByExampleSelective(curriculum, example); + public int updateCurriculum(Long specialityid, int semester,String course_ids) { + String[] ids = null; + List new_ids = new ArrayList(); + if(course_ids != null){ + ids = course_ids.split(","); + } + + if(ids != null && ids.length > 0){ + for (String id : ids) { + new_ids.add(Long.parseLong(id)); + } + } + + List exist_ids = selectCurriculumIdsBy(specialityid,semester,new_ids); + + List remove_ids = new ArrayList(); + remove_ids.addAll(exist_ids); + remove_ids.removeAll(new_ids); + + List add_ids = new ArrayList(); + add_ids.addAll(new_ids); + add_ids.removeAll(exist_ids); + + + return 0; } @Override @@ -63,4 +88,52 @@ public class CurriculumServiceImpl implements CurriculumService{ return list; } + @Override + public List selectCurriculumIdsBy(Long specialityid, int semester, List ids) { + // TODO Auto-generated method stub + CurriculumExample example = new CurriculumExample(); + CurriculumExample.Criteria criteria = example.createCriteria(); + criteria.andSpecialityidEqualTo(specialityid); + criteria.andSemesterEqualTo(semester); + criteria.andCourseidIn(ids); + + List curriculums = curriculumMapper.selectByExample(example); + + List exst_ids = new ArrayList(); + if(curriculums != null && curriculums.size() > 0){ + for (Curriculum curriculum : curriculums) { + exst_ids.add(curriculum.getCourseid()); + } + } + return exst_ids; + } + + @Test + public void TT(){ + String[] ids = null; + List new_ids = new ArrayList(); + new_ids.add(3L); + new_ids.add(2L); + + List exist_ids = new ArrayList(); + exist_ids.add(1L); + exist_ids.add(2L); + + List remove_ids = new ArrayList(); + remove_ids.addAll(exist_ids); + remove_ids.removeAll(new_ids); + + List update_ids = new ArrayList(); + update_ids.addAll(exist_ids); + update_ids.retainAll(new_ids); + + List add_ids = new ArrayList(); + add_ids.addAll(new_ids); + add_ids.removeAll(exist_ids); + + System.out.println(remove_ids.get(0) + ":" + remove_ids.size()); + System.out.println(update_ids.get(0) + ":" + update_ids.size()); + System.out.println(add_ids.get(0) + ":" + add_ids.size()); + + } } diff --git a/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java b/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java new file mode 100644 index 0000000000000000000000000000000000000000..2702cfc6ea69051d2486856c872799e02532ccea --- /dev/null +++ b/src/cn/edu/hrbcu/curriculum/service/SpecialityService.java @@ -0,0 +1,22 @@ +package cn.edu.hrbcu.curriculum.service; + +import java.util.List; +import cn.edu.hrbcu.curriculum.pojo.Speciality; + +public interface SpecialityService { + + int insertUser(Speciality user); + + int updateSpeciality(Speciality speciality); + + Speciality selectSpecialityById(Speciality speciality); + + void deletSpeciality(Speciality speciality); + + List selectSpecialitys(int currentPage); + + List selectAllSpeciality(); + + Speciality selectSpecialityByUserId(Long userid); + +} diff --git a/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..230cf80277ced77822703f009b07588edd208027 --- /dev/null +++ b/src/cn/edu/hrbcu/curriculum/service/SpecialityServiceImpl.java @@ -0,0 +1,81 @@ +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 cn.edu.hrbcu.curriculum.dao.SpecialityMapper; +import cn.edu.hrbcu.curriculum.pojo.Speciality; +import cn.edu.hrbcu.curriculum.pojo.SpecialityExample; +import cn.edu.hrbcu.utils.Common; + + +@Service +public class SpecialityServiceImpl implements SpecialityService{ + @Autowired + SpecialityMapper specialityMapper; + + @Override + public int insertUser(Speciality user) { + // TODO Auto-generated method stub + return specialityMapper.insert(user); + } + + @Override + public List selectAllSpeciality() { + SpecialityExample example = new SpecialityExample(); + SpecialityExample.Criteria criteria = example.createCriteria(); + criteria.andIdGreaterThan(-1L); + + return specialityMapper.selectByExample(example); + } + + public List selectSpecialitys(int currentPage) { + if(currentPage >= 0){ + PageHelper.startPage(currentPage, Common.PAGE_SIZE); + } + // TODO Auto-generated method stub + SpecialityExample example = new SpecialityExample(); + SpecialityExample.Criteria criteria = example.createCriteria(); + criteria.andIdGreaterThan(0L); + List list = specialityMapper.selectByExample(example); + return list; + } + + @Override + public int updateSpeciality(Speciality speciality) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public Speciality selectSpecialityById(Speciality speciality) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void deletSpeciality(Speciality speciality) { + specialityMapper.deleteByPrimaryKey(speciality.getId()); + + } + + @Override + public Speciality selectSpecialityByUserId(Long userid) { + // TODO Auto-generated method stub + SpecialityExample example = new SpecialityExample(); + SpecialityExample.Criteria criteria = example.createCriteria(); + criteria.andTbuseridEqualTo(userid); + List list = specialityMapper.selectByExample(example); + if(list != null && list.size() > 0) + return list.get(0); + + return null; + } + + + +} diff --git a/src/cn/edu/hrbcu/curriculum/service/TbPermissionServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TbPermissionServiceImpl.java index 8cca906a0b6211b0970ee0a6e524674139cb4d8d..33fbfd3b3fd7f9e4c92ec3191f7f2c47a53bf77f 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbPermissionServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbPermissionServiceImpl.java @@ -20,8 +20,6 @@ import cn.edu.hrbcu.utils.Common; */ @Service public class TbPermissionServiceImpl implements TbPermissionService { - - @Autowired TbPermissionMapper tbPermissionMapper;