diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index a7a5a9e..cfb42eb 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -170,7 +170,7 @@
-

考试时间

+

新建试卷

diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml index c5a3cf2..ab9c9c5 100644 --- a/resources/mybatis1/api/V1Mapper.xml +++ b/resources/mybatis1/api/V1Mapper.xml @@ -35,6 +35,11 @@ SELECT STUDENT_ID, sv_student.`NAME`, + sv_student.`SNO`, + sv_student.`NUMBER`, + sv_student.`GROUPID`, + sv_student.`SIGN_NO`, + sv_student.`SEX`, sv_student.`KEYPAD_ID` FROM sv_classroster @@ -76,8 +81,8 @@ @@ -109,6 +108,17 @@ from + where 1=1 + + and ( SCHOOL_ID = #{SCHOOL_ID} ) + + + and ( GRADE_ID = #{GRADE_ID} ) + + + and ( CLASS_TYPE = #{CLASS_TYPE} ) + + diff --git a/resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml b/resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml index 832e4a8..ee95085 100644 --- a/resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml +++ b/resources/mybatis1/sunvote/SchoolGradeSubjectMapper.xml @@ -90,6 +90,55 @@ from + where 1=1 + + + and ( SCHOOL_ID = #{SCHOOL_ID} ) + + + and ( GRADE_ID = #{GRADE_ID} ) + + + and ( SUBJECT_ID = #{SUBJECT_ID} ) + + + + + + + + + diff --git a/src/com/fh/bean/Question.java b/src/com/fh/bean/Question.java index 314b031..d80f6c2 100644 --- a/src/com/fh/bean/Question.java +++ b/src/com/fh/bean/Question.java @@ -41,6 +41,8 @@ public class Question { private String sug_score; private String sug_part_score; + + private String questionType = "" ; private List questions; @@ -204,4 +206,13 @@ public class Question { return this.questions; } + public String getQuestionType() { + return questionType; + } + + public void setQuestionType(String questionType) { + this.questionType = questionType; + } + + } diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java index 6439c6f..9a813a0 100644 --- a/src/com/fh/controller/api/V1.java +++ b/src/com/fh/controller/api/V1.java @@ -186,8 +186,8 @@ public class V1 extends BaseController { @ResponseBody public Object sclass() throws Exception { PageData pd = this.getPageData(); - ResponseGson res = new ResponseGson(); if (pd.containsKey("ID")) { + ResponseGson res = new ResponseGson(); PageData pageData = sclassService.findById(pd); if (pageData != null && pageData.containsKey("ID")) { PageData pt = new PageData(); @@ -198,11 +198,67 @@ public class V1 extends BaseController { } else { res.set2Error(); } + return res.toJson(); + } else { + ResponseGson> res = new ResponseGson(); + List list = sclassService.listAll(pd); + res.setData(list); + return res.toJson(); + + } + } + + @RequestMapping(value = "/questiontype", produces = "application/json;charset=UTF-8") + @ResponseBody + public Object questiontype() throws Exception { + PageData pd = this.getPageData(); + ResponseGson> res = new ResponseGson(); + List list = questiontypeService.listAll(pd); + res.setData(list); + return res.toJson(); + } + + @RequestMapping(value = "/classtype", produces = "application/json;charset=UTF-8") + @ResponseBody + public Object classtype() throws Exception { + PageData pd = this.getPageData(); + ResponseGson> res = new ResponseGson(); + List list = classtypeService.listAll(pd); + res.setData(list); + return res.toJson(); + } + + @RequestMapping(value = "/grade", produces = "application/json;charset=UTF-8") + @ResponseBody + public Object grade() throws Exception { + PageData pd = this.getPageData(); + ResponseGson> res = new ResponseGson(); + if (!pd.containsKey("SCHOOL_ID")) { + List list = gradeService.listAll(pd); + res.setData(list); } else { - res.set2Error(); + List list = schoolgradesubjectService.listAllGrade(pd); + res.setData(list); } return res.toJson(); } + + @RequestMapping(value = "/subject", produces = "application/json;charset=UTF-8") + @ResponseBody + public Object subject() throws Exception { + PageData pd = this.getPageData(); + ResponseGson> res = new ResponseGson(); + if (!pd.containsKey("SCHOOL_ID")) { + List list = subjectService.listAll(pd); + res.setData(list); + } else { + List list = schoolgradesubjectService.listAllSubject(pd); + res.setData(list); + } + return res.toJson(); + } + + @RequestMapping(value = "/keypadscan", produces = "application/json;charset=UTF-8") @ResponseBody @@ -296,9 +352,10 @@ public class V1 extends BaseController { question.setAnalysis(qpd.getString("ANALYSIS")); question.setQuestion_from(qpd .getString("QUESTION_FROM")); - question.setSug_score(qpd.getString("SUG_SCORE")); - question.setSug_part_score(qpd - .getString("SUG_PART_SCORE")); + question.setScore(qpd.getString("SCORE")); + question.setPart_score(qpd + .getString("PART_SCORE")); + question.setQuestionType(qpd.getString("PROBLEM_TYPE_ID")); question.setRank(qpd.getString("RANK")); question.setNo_name(qpd.getString("NO_NAME")); if ("-1".equals("" + qpd.getString("P_ID"))) { @@ -326,9 +383,10 @@ public class V1 extends BaseController { qq.setAnalysis(q.getString("ANALYSIS")); qq.setQuestion_from(q .getString("QUESTION_FROM")); - qq.setSug_score(q.getString("SUG_SCORE")); - qq.setSug_part_score(q - .getString("SUG_PART_SCORE")); + qq.setScore(q.getString("SCORE")); + qq.setPart_score(q + .getString("PART_SCORE")); + qq.setQuestionType(qpd.getString("PROBLEM_TYPE_ID")); qq.setRank(q.getString("RANK")); qq.setNo_name(q.getString("NO_NAME")); question.getQuestions().add(qq); @@ -365,7 +423,32 @@ public class V1 extends BaseController { return res.toJson(); } - + + @RequestMapping(value = "/question", produces = "application/json;charset=UTF-8") + @ResponseBody + public Object question() throws Exception { + PageData pd = this.getPageData(); + ResponseGson res = new ResponseGson(); + if(pd.containsKey("ID")){ + pd.put("QUESTION_ID", pd.get("ID")); + PageData data = questionService.findById(pd); + res.setData(data); + }else{ + res.setDataError(); + } + return res.toJson(); + } + + @RequestMapping(value = "/question/add", produces = "application/json;charset=UTF-8") + @ResponseBody + public Object questionAdd() throws Exception { + PageData pd = this.getPageData(); + ResponseGson res = new ResponseGson(); + pd.put("QUESTION_ID", this.get32UUID()); + questionService.save(pd); + return res.toJson(); + } + @RequestMapping(value = "/uploadpaper", produces = "application/json;charset=UTF-8") @ResponseBody public Object uploadpaper() throws Exception { @@ -373,6 +456,7 @@ public class V1 extends BaseController { ResponseGson res = new ResponseGson(); if (!StringUtils.isEmpty(pd.getJsonString())) { + logger.info(pd.getJsonString()); Paper paper = Paper.parse(pd.getJsonString()); PageData paperPd = new PageData(); String paperID = this.get32UUID(); @@ -392,7 +476,8 @@ public class V1 extends BaseController { paperPd.put("CREATE_DATE", Tools.date2Str(new Date())); paperPd.put("MODIFY_DATE", Tools.date2Str(new Date())); - paperService.save(paperPd); + int questionNum = 0 ; + List questions = paper.getQuestions(); if (questions != null) { @@ -404,11 +489,12 @@ public class V1 extends BaseController { && question.getQuestions().size() > 0) { qPd.put("P_ID", "-1"); } else { + questionNum ++ ; qPd.put("P_ID", "0"); } qPd.put("SUBJECT_ID", paper.getSubject_id()); qPd.put("CHAPTER_ID", question.getChapter_id()); - qPd.put("PROBLEM_TYPE_ID", question.getProblem_type_id()); + qPd.put("PROBLEM_TYPE_ID", question.getProblem_type_id() == null ? "1" : question.getProblem_type_id()); qPd.put("TEACHER_ID", paper.getUser_id()); qPd.put("SCHOOL_ID", schoolID); qPd.put("KNOWLEDGE_ID", question.getKnowledge_id()); @@ -445,7 +531,7 @@ public class V1 extends BaseController { cqPd.put("P_ID", questionID); cqPd.put("SUBJECT_ID", paper.getSubject_id()); cqPd.put("CHAPTER_ID", q.getChapter_id()); - cqPd.put("PROBLEM_TYPE_ID", q.getProblem_type_id()); + cqPd.put("PROBLEM_TYPE_ID", question.getProblem_type_id() == null ? "1" : question.getProblem_type_id()); cqPd.put("TEACHER_ID", paper.getUser_id()); cqPd.put("SCHOOL_ID", schoolID); cqPd.put("KNOWLEDGE_ID", q.getKnowledge_id()); @@ -474,10 +560,13 @@ public class V1 extends BaseController { cpqPd.put("PAPERQUESTION_ID", this.get32UUID()); paperquestionService.save(cpqPd); + questionNum ++ ; } } } } + paperPd.put("QUESTION_NUM", "" + questionNum); + paperService.save(paperPd); } else { res.setDataError(); @@ -490,9 +579,11 @@ public class V1 extends BaseController { @RequestMapping(value = "/uploadtestpaper", produces = "application/json;charset=UTF-8") @ResponseBody public Object uploadTestpaper() { + long cur = System.currentTimeMillis(); PageData pd = this.getPageData(); ResponseGson res = new ResponseGson(); if (!StringUtils.isEmpty(pd.getJsonString())) { + logger.info(pd.getJsonString()); TestPaper testPaper = TestPaper.parse(pd.getJsonString()); try { PageData testPd = new PageData(); @@ -576,6 +667,7 @@ public class V1 extends BaseController { } else { res.setDataError(); } + logger.info("uploadtestpaper cost time:" + (System.currentTimeMillis() - cur)); return res.toJson(); @@ -704,4 +796,15 @@ public class V1 extends BaseController { return res.toJson(); } + + + @RequestMapping(value = "/schooladmin", produces = "application/json;charset=UTF-8") + @ResponseBody + public void schoolAdmin(){ + PageData pd = this.getPageData(); + this.getUserID(); + + + } + } diff --git a/src/com/fh/service/sunvote/schoolgradesubject/SchoolGradeSubjectManager.java b/src/com/fh/service/sunvote/schoolgradesubject/SchoolGradeSubjectManager.java index 89c25e0..168d87f 100644 --- a/src/com/fh/service/sunvote/schoolgradesubject/SchoolGradeSubjectManager.java +++ b/src/com/fh/service/sunvote/schoolgradesubject/SchoolGradeSubjectManager.java @@ -1,6 +1,7 @@ package com.fh.service.sunvote.schoolgradesubject; import java.util.List; + import com.fh.entity.Page; import com.fh.util.PageData; @@ -53,5 +54,9 @@ public interface SchoolGradeSubjectManager{ */ public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + public List listAllGrade(PageData pd)throws Exception; + + public List listAllSubject(PageData pd)throws Exception; + } diff --git a/src/com/fh/service/sunvote/schoolgradesubject/impl/SchoolGradeSubjectService.java b/src/com/fh/service/sunvote/schoolgradesubject/impl/SchoolGradeSubjectService.java index 98f8218..568eba7 100644 --- a/src/com/fh/service/sunvote/schoolgradesubject/impl/SchoolGradeSubjectService.java +++ b/src/com/fh/service/sunvote/schoolgradesubject/impl/SchoolGradeSubjectService.java @@ -60,6 +60,22 @@ public class SchoolGradeSubjectService implements SchoolGradeSubjectManager{ public List listAll(PageData pd)throws Exception{ return (List)dao.findForList("SchoolGradeSubjectMapper.listAll", pd); } + /**列表(年级) + * @param pd + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List listAllGrade(PageData pd)throws Exception{ + return (List)dao.findForList("SchoolGradeSubjectMapper.listAllGrade", pd); + } + /**列表(科目) + * @param pd + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List listAllSubject(PageData pd)throws Exception{ + return (List)dao.findForList("SchoolGradeSubjectMapper.listAllSubject", pd); + } /**通过id获取数据 * @param pd