bed6e1fc
孙向锦
添加其他功能
|
1
2
|
package com.fh.controller.api;
|
757dfed6
孙向锦
样例报表
|
3
|
import java.io.File;
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
4
5
6
|
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
|
338594c8
孙向锦
添加教师端页面
|
7
|
import java.util.ArrayList;
|
757dfed6
孙向锦
样例报表
|
8
9
|
import java.util.Collections;
import java.util.Comparator;
|
bed6e1fc
孙向锦
添加其他功能
|
10
|
import java.util.Date;
|
ce70231e
孙向锦
增加接口
|
11
|
import java.util.Iterator;
|
bed6e1fc
孙向锦
添加其他功能
|
12
|
import java.util.List;
|
ce70231e
孙向锦
增加接口
|
13
|
import java.util.Map;
|
bed6e1fc
孙向锦
添加其他功能
|
14
15
|
import javax.annotation.Resource;
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
16
|
import javax.servlet.http.HttpServletRequest;
|
bed6e1fc
孙向锦
添加其他功能
|
17
|
|
338594c8
孙向锦
添加教师端页面
|
18
|
import org.apache.commons.lang.StringUtils;
|
d3d7b2ca
孙向锦
修改表格固定
|
19
|
import org.apache.shiro.crypto.hash.SimpleHash;
|
bed6e1fc
孙向锦
添加其他功能
|
20
|
import org.springframework.stereotype.Controller;
|
bed6e1fc
孙向锦
添加其他功能
|
21
|
import org.springframework.web.bind.annotation.RequestMapping;
|
757dfed6
孙向锦
样例报表
|
22
|
import org.springframework.web.bind.annotation.RequestParam;
|
bed6e1fc
孙向锦
添加其他功能
|
23
|
import org.springframework.web.bind.annotation.ResponseBody;
|
757dfed6
孙向锦
样例报表
|
24
|
import org.springframework.web.multipart.MultipartFile;
|
bed6e1fc
孙向锦
添加其他功能
|
25
|
|
338594c8
孙向锦
添加教师端页面
|
26
|
import com.fh.bean.Paper;
|
ce70231e
孙向锦
增加接口
|
27
|
import com.fh.bean.Point;
|
338594c8
孙向锦
添加教师端页面
|
28
|
import com.fh.bean.Question;
|
91a745c9
孙向锦
完善后台功能
|
29
30
31
|
import com.fh.bean.StudentAnswer;
import com.fh.bean.TestPaper;
import com.fh.bean.TestPaperInfo;
|
bed6e1fc
孙向锦
添加其他功能
|
32
|
import com.fh.controller.base.BaseController;
|
338594c8
孙向锦
添加教师端页面
|
33
|
import com.fh.controller.sunvote.Myelfun;
|
bed6e1fc
孙向锦
添加其他功能
|
34
35
36
|
import com.fh.service.api.V1Manager;
import com.fh.service.feedback.feedback.FeedbackManager;
import com.fh.service.feedback.problemphenomenon.ProblemPhenomenonManager;
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
37
|
import com.fh.service.software.softwareversion.SoftwareVersionManager;
|
9f161055
孙向锦
修改高斯客户反馈
|
38
|
import com.fh.service.sunvote.attachkeyboard.AttachKeyboardManager;
|
bed6e1fc
孙向锦
添加其他功能
|
39
|
import com.fh.service.sunvote.basestation.BasestationManager;
|
ce70231e
孙向锦
增加接口
|
40
|
import com.fh.service.sunvote.cache.CacheManager;
|
bed6e1fc
孙向锦
添加其他功能
|
41
42
43
44
45
|
import com.fh.service.sunvote.chapter.ChapterManager;
import com.fh.service.sunvote.classbasetation.ClassBasetationManager;
import com.fh.service.sunvote.classroster.ClassRosterManager;
import com.fh.service.sunvote.classtype.ClassTypeManager;
import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
|
9338b563
孙向锦
添加报表
|
46
|
import com.fh.service.sunvote.event.EventManager;
|
bed6e1fc
孙向锦
添加其他功能
|
47
|
import com.fh.service.sunvote.grade.GradeManager;
|
694fbd54
孙向锦
添加作业管理模块
|
48
|
import com.fh.service.sunvote.homework.HomeworkManager;
|
416902b7
孙向锦
添加课后作业部分API
|
49
|
import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
|
bed6e1fc
孙向锦
添加其他功能
|
50
51
52
53
|
import com.fh.service.sunvote.keypad.KeypadManager;
import com.fh.service.sunvote.keypadcheck.KeypadCheckManager;
import com.fh.service.sunvote.knowledge.KnowledgeManager;
import com.fh.service.sunvote.knowledgechapter.KnowledgeChapterManager;
|
9338b563
孙向锦
添加报表
|
54
|
import com.fh.service.sunvote.networkstatistics.NetworkStatisticsManager;
|
bed6e1fc
孙向锦
添加其他功能
|
55
56
57
58
59
60
61
62
63
|
import com.fh.service.sunvote.paper.PaperManager;
import com.fh.service.sunvote.paperclassteacher.PaperClassTeacherManager;
import com.fh.service.sunvote.paperquestion.PaperQuestionManager;
import com.fh.service.sunvote.papertype.PaperTypeManager;
import com.fh.service.sunvote.question.QuestionManager;
import com.fh.service.sunvote.questiontype.QuestionTypeManager;
import com.fh.service.sunvote.school.SchoolManager;
import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager;
import com.fh.service.sunvote.sclass.SClassManager;
|
bed6e1fc
孙向锦
添加其他功能
|
64
|
import com.fh.service.sunvote.student.StudentManager;
|
91a745c9
孙向锦
完善后台功能
|
65
|
import com.fh.service.sunvote.studenttest.StudentTestManager;
|
bed6e1fc
孙向锦
添加其他功能
|
66
|
import com.fh.service.sunvote.subject.SubjectManager;
|
bed6e1fc
孙向锦
添加其他功能
|
67
|
import com.fh.service.sunvote.teacher.TeacherManager;
|
ce70231e
孙向锦
增加接口
|
68
|
import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager;
|
91a745c9
孙向锦
完善后台功能
|
69
|
import com.fh.service.sunvote.testpaper.TestPaperManager;
|
bed6e1fc
孙向锦
添加其他功能
|
70
|
import com.fh.service.sunvote.testpaperinfo.TestPaperInfoManager;
|
c617106f
孙向锦
添加即时测功能
|
71
|
import com.fh.service.sunvote.textbook.TextbookManager;
|
d3d7b2ca
孙向锦
修改表格固定
|
72
|
import com.fh.service.system.user.UserManager;
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
73
|
import com.fh.util.DbFH;
|
bed6e1fc
孙向锦
添加其他功能
|
74
|
import com.fh.util.PageData;
|
bed6e1fc
孙向锦
添加其他功能
|
75
76
77
78
79
|
import com.fh.util.Tools;
@Controller
@RequestMapping(value = "/api/v1")
public class V1 extends BaseController {
|
91a745c9
孙向锦
完善后台功能
|
80
|
|
bed6e1fc
孙向锦
添加其他功能
|
81
82
83
84
85
|
@Resource(name = "schoolService")
private SchoolManager schoolService;
@Resource(name = "basestationService")
private BasestationManager basestationService;
|
91a745c9
孙向锦
完善后台功能
|
86
87
|
@Resource(name = "chapterService")
|
bed6e1fc
孙向锦
添加其他功能
|
88
|
private ChapterManager chapterService;
|
91a745c9
孙向锦
完善后台功能
|
89
90
|
@Resource(name = "classbasetationService")
|
bed6e1fc
孙向锦
添加其他功能
|
91
|
private ClassBasetationManager classbasetationService;
|
91a745c9
孙向锦
完善后台功能
|
92
93
|
@Resource(name = "classrosterService")
|
bed6e1fc
孙向锦
添加其他功能
|
94
|
private ClassRosterManager classrosterService;
|
91a745c9
孙向锦
完善后台功能
|
95
96
|
@Resource(name = "classtypeService")
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
97
|
private ClassTypeManager classtypeService;
|
91a745c9
孙向锦
完善后台功能
|
98
99
|
@Resource(name = "gradeService")
|
bed6e1fc
孙向锦
添加其他功能
|
100
|
private GradeManager gradeService;
|
91a745c9
孙向锦
完善后台功能
|
101
102
|
@Resource(name = "coursemanagementService")
|
bed6e1fc
孙向锦
添加其他功能
|
103
104
105
106
|
private CourseManagementManager coursemanagementService;
@Resource(name = "keypadService")
private KeypadManager keypadService;
|
91a745c9
孙向锦
完善后台功能
|
107
108
|
@Resource(name = "keypadcheckService")
|
bed6e1fc
孙向锦
添加其他功能
|
109
|
private KeypadCheckManager keypadcheckService;
|
91a745c9
孙向锦
完善后台功能
|
110
111
|
@Resource(name = "knowledgeService")
|
bed6e1fc
孙向锦
添加其他功能
|
112
|
private KnowledgeManager knowledgeService;
|
91a745c9
孙向锦
完善后台功能
|
113
114
|
@Resource(name = "knowledgechapterService")
|
bed6e1fc
孙向锦
添加其他功能
|
115
|
private KnowledgeChapterManager knowledgechapterService;
|
91a745c9
孙向锦
完善后台功能
|
116
117
|
@Resource(name = "paperService")
|
bed6e1fc
孙向锦
添加其他功能
|
118
|
private PaperManager paperService;
|
91a745c9
孙向锦
完善后台功能
|
119
120
|
@Resource(name = "paperclassteacherService")
|
bed6e1fc
孙向锦
添加其他功能
|
121
|
private PaperClassTeacherManager paperclassteacherService;
|
91a745c9
孙向锦
完善后台功能
|
122
123
|
@Resource(name = "paperquestionService")
|
bed6e1fc
孙向锦
添加其他功能
|
124
|
private PaperQuestionManager paperquestionService;
|
91a745c9
孙向锦
完善后台功能
|
125
126
|
@Resource(name = "papertypeService")
|
bed6e1fc
孙向锦
添加其他功能
|
127
|
private PaperTypeManager papertypeService;
|
91a745c9
孙向锦
完善后台功能
|
128
129
|
@Resource(name = "questionService")
|
bed6e1fc
孙向锦
添加其他功能
|
130
|
private QuestionManager questionService;
|
91a745c9
孙向锦
完善后台功能
|
131
132
|
@Resource(name = "questiontypeService")
|
bed6e1fc
孙向锦
添加其他功能
|
133
|
private QuestionTypeManager questiontypeService;
|
91a745c9
孙向锦
完善后台功能
|
134
135
|
@Resource(name = "schoolgradesubjectService")
|
bed6e1fc
孙向锦
添加其他功能
|
136
|
private SchoolGradeSubjectManager schoolgradesubjectService;
|
91a745c9
孙向锦
完善后台功能
|
137
138
|
@Resource(name = "sclassService")
|
bed6e1fc
孙向锦
添加其他功能
|
139
|
private SClassManager sclassService;
|
694fbd54
孙向锦
添加作业管理模块
|
140
141
142
143
|
@Resource(name="homeworkService")
private HomeworkManager homeworkService;
|
91a745c9
孙向锦
完善后台功能
|
144
|
@Resource(name = "studentService")
|
bed6e1fc
孙向锦
添加其他功能
|
145
|
private StudentManager studentService;
|
91a745c9
孙向锦
完善后台功能
|
146
147
|
@Resource(name = "subjectService")
|
bed6e1fc
孙向锦
添加其他功能
|
148
|
private SubjectManager subjectService;
|
91a745c9
孙向锦
完善后台功能
|
149
150
|
@Resource(name = "teacherService")
|
bed6e1fc
孙向锦
添加其他功能
|
151
|
private TeacherManager teacherService;
|
91a745c9
孙向锦
完善后台功能
|
152
153
|
@Resource(name = "testpaperinfoService")
|
bed6e1fc
孙向锦
添加其他功能
|
154
155
|
private TestPaperInfoManager testpaperinfoService;
|
91a745c9
孙向锦
完善后台功能
|
156
157
158
159
160
161
|
@Resource(name = "testpaperService")
private TestPaperManager testpaperService;
@Resource(name = "studenttestService")
private StudentTestManager studenttestService;
|
bed6e1fc
孙向锦
添加其他功能
|
162
163
164
165
166
|
@Resource(name = "feedbackService")
private FeedbackManager feedbackService;
@Resource(name = "problemphenomenonService")
private ProblemPhenomenonManager problemphenomenonService;
|
91a745c9
孙向锦
完善后台功能
|
167
|
|
bed6e1fc
孙向锦
添加其他功能
|
168
|
@Resource(name = "v1Service")
|
91a745c9
孙向锦
完善后台功能
|
169
|
private V1Manager v1Service;
|
ce70231e
孙向锦
增加接口
|
170
171
|
@Resource(name = "softwareversionService")
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
172
|
private SoftwareVersionManager softwareversionService;
|
ce70231e
孙向锦
增加接口
|
173
174
|
@Resource(name = "attachkeyboardService")
|
9f161055
孙向锦
修改高斯客户反馈
|
175
|
private AttachKeyboardManager attachkeyboardService;
|
ce70231e
孙向锦
增加接口
|
176
177
|
@Resource(name = "networkstatisticsService")
|
9338b563
孙向锦
添加报表
|
178
|
private NetworkStatisticsManager networkstatisticsService;
|
ce70231e
孙向锦
增加接口
|
179
180
|
@Resource(name = "eventService")
|
9338b563
孙向锦
添加报表
|
181
|
private EventManager eventService;
|
ce70231e
孙向锦
增加接口
|
182
183
|
@Resource(name = "userService")
|
d3d7b2ca
孙向锦
修改表格固定
|
184
|
private UserManager userService;
|
91a745c9
孙向锦
完善后台功能
|
185
|
|
ce70231e
孙向锦
增加接口
|
186
187
|
@Resource(name = "teachingmaterialService")
private TeachingMaterialManager teachingmaterialService;
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
188
|
|
c617106f
孙向锦
添加即时测功能
|
189
190
|
@Resource(name = "textbookService")
private TextbookManager textbookService;
|
2ad7ca45
孙向锦
试卷bug修改
|
191
192
|
@Resource(name = "cacheService")
|
ce70231e
孙向锦
增加接口
|
193
|
private CacheManager cacheService;
|
416902b7
孙向锦
添加课后作业部分API
|
194
195
196
197
|
@Resource(name="homeworkproblemService")
private HomeworkProblemManager homeworkproblemService;
|
2ad7ca45
孙向锦
试卷bug修改
|
198
|
/**
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
199
200
|
* 登录 可以通过账号密码登录、 可以通过教师卡登录
*
|
2ad7ca45
孙向锦
试卷bug修改
|
201
202
203
|
* @return
* @throws Exception
*/
|
bed6e1fc
孙向锦
添加其他功能
|
204
205
206
|
@RequestMapping(value = "/login", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object login() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
207
|
event("apilogin");
|
bed6e1fc
孙向锦
添加其他功能
|
208
209
|
PageData pd = this.getPageData();
ResponseGson<PageData> res = new ResponseGson();
|
91a745c9
孙向锦
完善后台功能
|
210
|
if (!pd.containsKey("ACCOUT")) {
|
bed6e1fc
孙向锦
添加其他功能
|
211
212
|
pd.put("ACCOUT", pd.get("USERNAME"));
}
|
ce70231e
孙向锦
增加接口
|
213
214
215
|
if (((pd.containsKey("USERNAME") || (pd.containsKey("ACCOUT") && pd
.get("ACCOUT") != null)) && pd.containsKey("PASSWORD"))
|| pd.containsKey("KEYPAD_ID")) {
|
bed6e1fc
孙向锦
添加其他功能
|
216
|
PageData pageData = teacherService.getUserInfo(pd);
|
91a745c9
孙向锦
完善后台功能
|
217
218
|
if (pageData != null && pageData.getString("ID") != null) {
pageData.put("PASSWORD", "");// 返回参数中不返回密码
|
bed6e1fc
孙向锦
添加其他功能
|
219
220
221
|
PageData pt = new PageData();
pt.put("TEACHER_ID", pageData.get("ID"));
// 在任课表中查找老师教哪些班级,然后查出班级信息
|
91a745c9
孙向锦
完善后台功能
|
222
223
224
|
List<PageData> classInfoList = v1Service
.getTeacherClassInfo(pt);
|
bed6e1fc
孙向锦
添加其他功能
|
225
226
|
pageData.put("classInfoList", classInfoList);
// 在认可表中查找老师教哪些科目,然后查出科目信息
|
91a745c9
孙向锦
完善后台功能
|
227
228
|
List<PageData> subjectList = v1Service
.getTeacherSubjectInfo(pt);
|
bed6e1fc
孙向锦
添加其他功能
|
229
230
|
// 一个sql语句完成。
pageData.put("subjectList", subjectList);
|
91a745c9
孙向锦
完善后台功能
|
231
|
|
bed6e1fc
孙向锦
添加其他功能
|
232
|
pageData.remove("SUBJECT_IDS");
|
ce70231e
孙向锦
增加接口
|
233
|
|
9338b563
孙向锦
添加报表
|
234
235
236
237
238
|
PageData eventPd = new PageData();
eventPd.put("EVENT_ID", get32UUID());
eventPd.put("EVENT_NAME", "login");
eventPd.put("EVENT_USER", pageData.getString("ID"));
eventPd.put("EVENT_TYPE", "0");
|
ce70231e
孙向锦
增加接口
|
239
240
|
eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
if (pd.getString("CLIENT_ID") != null) {
|
9338b563
孙向锦
添加报表
|
241
|
eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
|
ce70231e
孙向锦
增加接口
|
242
|
} else {
|
9338b563
孙向锦
添加报表
|
243
244
|
eventPd.put("CLIENT_ID", "CLIENT");
}
|
ce70231e
孙向锦
增加接口
|
245
|
eventPd.put("EVENT_IP", getRemoteIp());
|
9338b563
孙向锦
添加报表
|
246
|
eventService.save(eventPd);
|
91a745c9
孙向锦
完善后台功能
|
247
|
|
bed6e1fc
孙向锦
添加其他功能
|
248
249
|
res.setData(pageData);
// 填充数据到返回数据中
|
91a745c9
孙向锦
完善后台功能
|
250
|
} else {
|
bed6e1fc
孙向锦
添加其他功能
|
251
252
|
res.set1Error();
}
|
91a745c9
孙向锦
完善后台功能
|
253
|
} else {
|
bed6e1fc
孙向锦
添加其他功能
|
254
255
|
res.set1Error();
}
|
91a745c9
孙向锦
完善后台功能
|
256
|
|
bed6e1fc
孙向锦
添加其他功能
|
257
258
|
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
259
|
|
c617106f
孙向锦
添加即时测功能
|
260
|
/**
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
261
262
|
* 登录 可以通过账号密码登录、 可以通过教师卡登录
*
|
c617106f
孙向锦
添加即时测功能
|
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/userinfo", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object userinfo() throws Exception {
event("userinfo");
PageData pd = this.getPageData();
ResponseGson<PageData> res = new ResponseGson();
PageData pageData = teacherService.findById(pd);
if (pageData != null && pageData.getString("ID") != null) {
pageData.put("PASSWORD", "");// 返回参数中不返回密码
PageData pt = new PageData();
pt.put("TEACHER_ID", pageData.get("ID"));
// 在任课表中查找老师教哪些班级,然后查出班级信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
278
279
|
List<PageData> classInfoList = v1Service.getTeacherClassInfo(pt);
|
c617106f
孙向锦
添加即时测功能
|
280
281
|
pageData.put("classInfoList", classInfoList);
// 在认可表中查找老师教哪些科目,然后查出科目信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
282
|
List<PageData> subjectList = v1Service.getTeacherSubjectInfo(pt);
|
c617106f
孙向锦
添加即时测功能
|
283
284
|
// 一个sql语句完成。
pageData.put("subjectList", subjectList);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
285
|
|
c617106f
孙向锦
添加即时测功能
|
286
|
pageData.remove("SUBJECT_IDS");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
287
|
|
c617106f
孙向锦
添加即时测功能
|
288
289
290
291
292
293
294
295
296
297
298
299
300
|
PageData eventPd = new PageData();
eventPd.put("EVENT_ID", get32UUID());
eventPd.put("EVENT_NAME", "login");
eventPd.put("EVENT_USER", pageData.getString("ID"));
eventPd.put("EVENT_TYPE", "0");
eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
if (pd.getString("CLIENT_ID") != null) {
eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
} else {
eventPd.put("CLIENT_ID", "CLIENT");
}
eventPd.put("EVENT_IP", getRemoteIp());
eventService.save(eventPd);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
301
|
|
c617106f
孙向锦
添加即时测功能
|
302
303
304
305
306
|
res.setData(pageData);
// 填充数据到返回数据中
} else {
res.set1Error();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
307
|
|
c617106f
孙向锦
添加即时测功能
|
308
309
|
return res.toJson();
}
|
91a745c9
孙向锦
完善后台功能
|
310
|
|
2ad7ca45
孙向锦
试卷bug修改
|
311
|
/**
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
312
313
|
* 查询班级 班级及班级学生详细信息
*
|
2ad7ca45
孙向锦
试卷bug修改
|
314
315
316
|
* @return
* @throws Exception
*/
|
bed6e1fc
孙向锦
添加其他功能
|
317
318
319
|
@RequestMapping(value = "/class", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object sclass() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
320
|
event("sclass");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
321
|
long cur = System.currentTimeMillis();
|
bed6e1fc
孙向锦
添加其他功能
|
322
|
PageData pd = this.getPageData();
|
bed6e1fc
孙向锦
添加其他功能
|
323
|
if (pd.containsKey("ID")) {
|
4fd2e08c
孙向锦
修复接口中的bug
|
324
|
ResponseGson<PageData> res = new ResponseGson();
|
bed6e1fc
孙向锦
添加其他功能
|
325
326
327
328
|
PageData pageData = sclassService.findById(pd);
if (pageData != null && pageData.containsKey("ID")) {
PageData pt = new PageData();
pt.put("SCLASS_ID", pageData.get("ID"));
|
91a745c9
孙向锦
完善后台功能
|
329
|
List<PageData> studentList = v1Service.getClassStudent(pt);
|
bed6e1fc
孙向锦
添加其他功能
|
330
|
pageData.put("studentList", studentList);
|
9f161055
孙向锦
修改高斯客户反馈
|
331
|
pt.put("CLASS_ID", pageData.get("ID"));
|
ce70231e
孙向锦
增加接口
|
332
333
|
List<PageData> keyboards = attachkeyboardService
.listAllClassId(pt);
|
9f161055
孙向锦
修改高斯客户反馈
|
334
|
pageData.put("keyboards", keyboards);
|
bed6e1fc
孙向锦
添加其他功能
|
335
336
337
338
|
res.setData(pageData);
} else {
res.set2Error();
}
|
ce70231e
孙向锦
增加接口
|
339
340
|
logger.info("class cost time : "
+ (System.currentTimeMillis() - cur));
|
4fd2e08c
孙向锦
修复接口中的bug
|
341
342
343
344
345
|
return res.toJson();
} else {
ResponseGson<List<PageData>> res = new ResponseGson();
List<PageData> list = sclassService.listAll(pd);
res.setData(list);
|
ce70231e
孙向锦
增加接口
|
346
347
|
logger.info("class cost time : "
+ (System.currentTimeMillis() - cur));
|
4fd2e08c
孙向锦
修复接口中的bug
|
348
|
return res.toJson();
|
4fd2e08c
孙向锦
修复接口中的bug
|
349
350
|
}
}
|
ce70231e
孙向锦
增加接口
|
351
|
|
2ad7ca45
孙向锦
试卷bug修改
|
352
353
|
/**
* 问题类型
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
354
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
355
356
357
|
* @return
* @throws Exception
*/
|
4fd2e08c
孙向锦
修复接口中的bug
|
358
359
360
|
@RequestMapping(value = "/questiontype", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object questiontype() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
361
|
event("questiontype");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
362
|
long cur = System.currentTimeMillis();
|
4fd2e08c
孙向锦
修复接口中的bug
|
363
364
365
366
|
PageData pd = this.getPageData();
ResponseGson<List<PageData>> res = new ResponseGson();
List<PageData> list = questiontypeService.listAll(pd);
res.setData(list);
|
ce70231e
孙向锦
增加接口
|
367
368
|
logger.info("questiontype cost time : "
+ (System.currentTimeMillis() - cur));
|
4fd2e08c
孙向锦
修复接口中的bug
|
369
370
|
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
371
|
|
2ad7ca45
孙向锦
试卷bug修改
|
372
373
|
/**
* 班级类型
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
374
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
375
376
377
|
* @return
* @throws Exception
*/
|
4fd2e08c
孙向锦
修复接口中的bug
|
378
379
380
|
@RequestMapping(value = "/classtype", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object classtype() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
381
|
event("classtype");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
382
|
long cur = System.currentTimeMillis();
|
4fd2e08c
孙向锦
修复接口中的bug
|
383
384
385
386
|
PageData pd = this.getPageData();
ResponseGson<List<PageData>> res = new ResponseGson();
List<PageData> list = classtypeService.listAll(pd);
res.setData(list);
|
ce70231e
孙向锦
增加接口
|
387
388
|
logger.info("classtype cost time : "
+ (System.currentTimeMillis() - cur));
|
4fd2e08c
孙向锦
修复接口中的bug
|
389
390
|
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
391
|
|
2ad7ca45
孙向锦
试卷bug修改
|
392
|
/**
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
393
394
|
* 年级 年级类型
*
|
2ad7ca45
孙向锦
试卷bug修改
|
395
396
397
|
* @return
* @throws Exception
*/
|
4fd2e08c
孙向锦
修复接口中的bug
|
398
399
400
|
@RequestMapping(value = "/grade", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object grade() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
401
|
event("grade");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
402
|
long cur = System.currentTimeMillis();
|
4fd2e08c
孙向锦
修复接口中的bug
|
403
404
405
406
407
|
PageData pd = this.getPageData();
ResponseGson<List<PageData>> res = new ResponseGson();
if (!pd.containsKey("SCHOOL_ID")) {
List<PageData> list = gradeService.listAll(pd);
res.setData(list);
|
91a745c9
孙向锦
完善后台功能
|
408
|
} else {
|
4fd2e08c
孙向锦
修复接口中的bug
|
409
410
|
List<PageData> list = schoolgradesubjectService.listAllGrade(pd);
res.setData(list);
|
bed6e1fc
孙向锦
添加其他功能
|
411
|
}
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
412
|
logger.info("class cost time : " + (System.currentTimeMillis() - cur));
|
bed6e1fc
孙向锦
添加其他功能
|
413
414
|
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
415
|
|
2ad7ca45
孙向锦
试卷bug修改
|
416
417
|
/**
* 科目
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
418
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
419
420
421
|
* @return
* @throws Exception
*/
|
4fd2e08c
孙向锦
修复接口中的bug
|
422
423
424
|
@RequestMapping(value = "/subject", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object subject() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
425
|
event("subject");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
426
|
long cur = System.currentTimeMillis();
|
4fd2e08c
孙向锦
修复接口中的bug
|
427
428
429
430
431
432
433
434
435
|
PageData pd = this.getPageData();
ResponseGson<List<PageData>> res = new ResponseGson();
if (!pd.containsKey("SCHOOL_ID")) {
List<PageData> list = subjectService.listAll(pd);
res.setData(list);
} else {
List<PageData> list = schoolgradesubjectService.listAllSubject(pd);
res.setData(list);
}
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
436
|
logger.info("subject cost time : " + (System.currentTimeMillis() - cur));
|
4fd2e08c
孙向锦
修复接口中的bug
|
437
438
|
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
439
|
|
c617106f
孙向锦
添加即时测功能
|
440
441
|
/**
* 科目
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
442
|
*
|
c617106f
孙向锦
添加即时测功能
|
443
444
445
446
447
448
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/subjectname", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object subjectName() throws Exception {
|
757dfed6
孙向锦
样例报表
|
449
|
event("subjectName");
|
c617106f
孙向锦
添加即时测功能
|
450
451
452
453
454
455
456
457
458
459
460
461
462
|
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<List<PageData>> res = new ResponseGson();
if (!pd.containsKey("SCHOOL_ID")) {
List<PageData> list = subjectService.listAll(pd);
res.setData(list);
} else {
List<PageData> list = schoolgradesubjectService.listAllSubject(pd);
res.setData(list);
}
logger.info("subject cost time : " + (System.currentTimeMillis() - cur));
return res.toJson();
}
|
91a745c9
孙向锦
完善后台功能
|
463
|
|
2ad7ca45
孙向锦
试卷bug修改
|
464
465
|
/**
* 键盘扫描
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
466
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
467
468
469
|
* @return
* @throws Exception
*/
|
bed6e1fc
孙向锦
添加其他功能
|
470
471
472
|
@RequestMapping(value = "/keypadscan", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object keypadScan() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
473
|
event("keypadScan");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
474
|
long cur = System.currentTimeMillis();
|
bed6e1fc
孙向锦
添加其他功能
|
475
|
PageData pd = this.getPageData();
|
91a745c9
孙向锦
完善后台功能
|
476
477
478
479
480
|
ResponseGson<String> res = new ResponseGson();
String ID = get32UUID();
pd.put("KEYPADCHECK_ID", ID); // 主键
pd.put("CREATE_DATE", Tools.date2Str(new Date())); // 创建时间
try {
|
bed6e1fc
孙向锦
添加其他功能
|
481
|
keypadcheckService.save(pd);
|
91a745c9
孙向锦
完善后台功能
|
482
|
res.setData(ID);
|
bed6e1fc
孙向锦
添加其他功能
|
483
|
res.setSuccess();
|
91a745c9
孙向锦
完善后台功能
|
484
|
} catch (Exception ex) {
|
bed6e1fc
孙向锦
添加其他功能
|
485
486
|
res.setDataError();
}
|
ce70231e
孙向锦
增加接口
|
487
488
|
logger.info("keypadScan cost time : "
+ (System.currentTimeMillis() - cur));
|
bed6e1fc
孙向锦
添加其他功能
|
489
490
|
return res.toJson();
}
|
91a745c9
孙向锦
完善后台功能
|
491
|
|
2ad7ca45
孙向锦
试卷bug修改
|
492
493
494
495
496
497
|
/**
* showcount 数量 currentpage 当前页码
*
* @return
* @throws Exception
*/
|
bed6e1fc
孙向锦
添加其他功能
|
498
499
500
|
@RequestMapping(value = "/paper", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object paper() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
501
|
event("paper");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
502
|
long cur = System.currentTimeMillis();
|
bed6e1fc
孙向锦
添加其他功能
|
503
504
|
PageData pd = this.getPageData();
ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
|
4b6a5239
孙向锦
管理员界面
|
505
|
if (pd.containsKey("PAPER_TYPE")) {
|
757dfed6
孙向锦
样例报表
|
506
507
|
String CURRENTPAGE = pd.getString("CURRENTPAGE");
String SHOWCOUNT = pd.getString("SHOWCOUNT");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
508
509
510
|
if (CURRENTPAGE != null && SHOWCOUNT != null
&& !"".equals(CURRENTPAGE.trim())
&& !"".equals(SHOWCOUNT.trim())) {
|
757dfed6
孙向锦
样例报表
|
511
512
|
int currentPage = Integer.parseInt(CURRENTPAGE);
int showcount = Integer.parseInt(SHOWCOUNT);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
513
514
|
currentPage = (currentPage > 0 ? currentPage - 1 : 0)
* showcount;
|
ddbc622f
孙向锦
0829版本
|
515
|
pd.put("CURRENTPAGE", "" + currentPage);
|
bed6e1fc
孙向锦
添加其他功能
|
516
|
}
|
757dfed6
孙向锦
样例报表
|
517
|
List<PageData> pageList = paperService.listAllByType(pd);
|
bed6e1fc
孙向锦
添加其他功能
|
518
|
res.setData(pageList);
|
91a745c9
孙向锦
完善后台功能
|
519
|
} else {
|
757dfed6
孙向锦
样例报表
|
520
|
res.setDataError();
|
bed6e1fc
孙向锦
添加其他功能
|
521
|
}
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
522
|
logger.info("paper cost time : " + (System.currentTimeMillis() - cur));
|
bed6e1fc
孙向锦
添加其他功能
|
523
524
|
return res.toJson();
}
|
91a745c9
孙向锦
完善后台功能
|
525
|
|
2ad7ca45
孙向锦
试卷bug修改
|
526
527
|
/**
* 试卷详细信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
528
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
529
530
531
|
* @return
* @throws Exception
*/
|
91a745c9
孙向锦
完善后台功能
|
532
|
@RequestMapping(value = "/paperinfo", produces = "application/json;charset=UTF-8")
|
bed6e1fc
孙向锦
添加其他功能
|
533
|
@ResponseBody
|
91a745c9
孙向锦
完善后台功能
|
534
|
public Object paperInfo() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
535
|
event("paperInfo");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
536
|
long cur = System.currentTimeMillis();
|
bed6e1fc
孙向锦
添加其他功能
|
537
|
PageData pd = this.getPageData();
|
757dfed6
孙向锦
样例报表
|
538
539
540
541
542
543
544
545
546
547
548
549
550
551
|
ResponseGson<Paper> res = new ResponseGson<Paper>();
if (pd.containsKey("PAPER_ID")) {
try {
try {
Paper paper = new Paper();
PageData ppd = paperService.findById(pd);
if (ppd != null) {
paper.setTitle(ppd.getString("TITLE"));
paper.setExam_time(ppd.getString("EXAM_TIME"));
paper.setUser_id(ppd.getString("USER_ID"));
paper.setPaper_type(ppd.getString("PAPER_TYPE"));
paper.setSubject_id(ppd.getString("SUBJECT_ID"));
paper.setGrade_id(ppd.getString("GRADE_ID"));
paper.setScore(ppd.getString("SCORE"));
|
4b6a5239
孙向锦
管理员界面
|
552
|
paper.setSchool_id(ppd.getString("SCHOOL_ID"));
|
757dfed6
孙向锦
样例报表
|
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
|
paper.setQuestions(new ArrayList<Question>());
List<PageData> questList = v1Service
.getTestPaperInfo(pd);
for (PageData qpd : questList) {
Question question = new Question();
question.setAnswer(qpd.getString("ANSWER"));
question.setQuestion_id(qpd
.getString("QUESTION_ID"));
question.setSubject_id(qpd.getString("SUBJECT_ID"));
question.setChapter_id(qpd.getString("CHAPTER_ID"));
question.setProblem_type_id(qpd
.getString("PROBLEM_TYPE_ID"));
question.setKnowledge_id(qpd
.getString("KNOWLEDGE_ID"));
question.setContent(qpd.getString("CONTENT"));
question.setOption_num(qpd.getString("OPTION_NUM"));
question.setOption_content(qpd
.getString("OPTION_CONTENT"));
question.setDifficulty(qpd.getString("DIFFICULTY"));
question.setAnalysis(qpd.getString("ANALYSIS"));
question.setQuestion_from(qpd
.getString("QUESTION_FROM"));
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"));
|
bda221f4
孙向锦
0830版本
|
582
|
question.setQuestions(new ArrayList<Question>());
|
757dfed6
孙向锦
样例报表
|
583
584
585
|
if ("-1".equals("" + qpd.getString("P_ID"))) {
PageData pidPd = new PageData();
pidPd.put("PID", question.getQuestion_id());
|
757dfed6
孙向锦
样例报表
|
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
|
List<PageData> qs = v1Service
.getQuestionsByPID(pidPd);
for (PageData q : qs) {
Question qq = new Question();
qq.setAnswer(q.getString("ANSWER"));
qq.setQuestion_id(q
.getString("QUESTION_ID"));
qq.setSubject_id(q.getString("SUBJECT_ID"));
qq.setChapter_id(q.getString("CHAPTER_ID"));
qq.setProblem_type_id(q
.getString("PROBLEM_TYPE_ID"));
qq.setKnowledge_id(q
.getString("KNOWLEDGE_ID"));
qq.setContent(q.getString("CONTENT"));
qq.setOption_num(q.getString("OPTION_NUM"));
qq.setOption_content(q
.getString("OPTION_CONTENT"));
qq.setDifficulty(q.getString("DIFFICULTY"));
qq.setAnalysis(q.getString("ANALYSIS"));
qq.setQuestion_from(q
.getString("QUESTION_FROM"));
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);
}
}
if ("-1".equals(qpd.getString("P_ID"))
|| "0".equals(qpd.getString("P_ID"))) {
paper.getQuestions().add(question);
}
}
// pd.put("JSON", paper.toJson());
res.setData(paper);
logger.info(paper.toJson());
}
} catch (Exception ex) {
ex.printStackTrace();
}
} catch (Exception ex) {
ex.printStackTrace();
res.setError();
}
} else {
res.setOtherError();
}
logger.info("paperInfo cost time : "
+ (System.currentTimeMillis() - cur));
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
640
641
|
/* *//**
|
757dfed6
孙向锦
样例报表
|
642
|
* 试卷详细信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
643
|
*
|
757dfed6
孙向锦
样例报表
|
644
645
|
* @return
* @throws Exception
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
|
*/
/*
* @RequestMapping(value = "/paperinfo", produces =
* "application/json;charset=UTF-8")
*
* @ResponseBody public Object paperInfo() throws Exception {
* event("paperInfo"); long cur = System.currentTimeMillis(); PageData pd =
* this.getPageData(); ResponseGson<PageData> res = new
* ResponseGson<PageData>(); if (pd.containsKey("PAPER_ID")) { try { try {
* PageData ppd = paperService.findById(pd); if (ppd != null) {
* List<PageData> questList = v1Service .getTestPaperInfo(pd);
* ppd.put("QUESTIONS", questList); for (PageData qpd : questList) {
*
* String optionContent = qpd .getString("OPTION_CONTENT"); if
* (optionContent != null && optionContent.startsWith("[") &&
* optionContent.endsWith("]")) { String[] options =
* optionContent.substring(1, optionContent.length() - 1).split(",");
* qpd.put("OPTION_CONTENT", options); } else { qpd.put("OPTION_CONTENT",
* new String[] { optionContent }); } if ("-1".equals("" +
* qpd.getString("P_ID"))) { PageData pidPd = new PageData();
* pidPd.put("PID", qpd.getString("QUESTION_ID")); List<PageData> qs =
* v1Service .getQuestionsByPID(pidPd); for (PageData pcd : qs) { String
* optionContent1 = pcd .getString("OPTION_CONTENT"); if (optionContent1 !=
* null && optionContent1.startsWith("[") && optionContent1.endsWith("]")) {
* String[] options = optionContent1 .substring( 1, optionContent1.length()
* - 1) .split(","); pcd.put("OPTION_CONTENT", options); } else {
* pcd.put("OPTION_CONTENT", new String[] { optionContent1 }); } String[]
* keys = new String[pcd.keySet().size()]; pcd.keySet().toArray(keys);
* Iterator map1it = pcd.entrySet().iterator(); for (String key : keys) {
* pcd.put(key.toLowerCase(),pcd.get(key)); pcd.remove(key.toUpperCase()); }
* } qpd.put("QUESTIONS", qs); }
*
* String[] keys = new String[qpd.keySet().size()];
* qpd.keySet().toArray(keys); for (String key : keys) {
* qpd.put(key.toLowerCase(), qpd.get(key)); qpd.remove(key.toUpperCase());
* }
*
* } String[] keys = new String[ppd.keySet().size()];
* ppd.keySet().toArray(keys); for (String key : keys) {
* ppd.put(key.toLowerCase(), ppd.get(key)); ppd.remove(key.toUpperCase());
* } // pd.put("JSON", paper.toJson()); res.setData(ppd);
* logger.info(res.toJson());
*
* } } catch (Exception ex) { ex.printStackTrace(); } } catch (Exception ex)
* { ex.printStackTrace(); res.setError(); } } else { res.setOtherError(); }
* logger.info("paperInfo cost time : " + (System.currentTimeMillis() -
* cur)); return res.toJson(); }
*//**
|
757dfed6
孙向锦
样例报表
|
694
|
* 试卷详细信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
695
|
*
|
757dfed6
孙向锦
样例报表
|
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/paperinfo2", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object paperInfo2() throws Exception {
event("paperInfo2");
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<PageData> res = new ResponseGson<PageData>();
if (pd.containsKey("PAPER_ID")) {
try {
try {
PageData ppd = paperService.findById(pd);
if (ppd != null) {
List<PageData> questList = v1Service
.getTestPaperInfo(pd);
ppd.put("QUESTIONS", questList);
for (PageData qpd : questList) {
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
715
|
|
757dfed6
孙向锦
样例报表
|
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
|
String optionContent = qpd
.getString("OPTION_CONTENT");
if (optionContent != null
&& optionContent.startsWith("[")
&& optionContent.endsWith("]")) {
String[] options = optionContent.substring(1,
optionContent.length() - 1).split(",");
qpd.put("OPTION_CONTENT", options);
} else {
qpd.put("OPTION_CONTENT",
new String[] { optionContent });
}
if ("-1".equals("" + qpd.getString("P_ID"))) {
PageData pidPd = new PageData();
pidPd.put("PID", qpd.getString("QUESTION_ID"));
List<PageData> qs = v1Service
.getQuestionsByPID(pidPd);
for (PageData pcd : qs) {
String optionContent1 = pcd
.getString("OPTION_CONTENT");
if (optionContent1 != null
&& optionContent1.startsWith("[")
&& optionContent1.endsWith("]")) {
String[] options = optionContent1
.substring(
1,
optionContent1.length() - 1)
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
743
|
.split(",");
|
757dfed6
孙向锦
样例报表
|
744
745
746
747
748
749
750
751
|
pcd.put("OPTION_CONTENT", options);
} else {
pcd.put("OPTION_CONTENT",
new String[] { optionContent1 });
}
}
qpd.put("QUESTIONS", qs);
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
752
|
|
757dfed6
孙向锦
样例报表
|
753
754
755
|
}
res.setData(ppd);
logger.info(res.toJson());
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
756
|
|
338594c8
孙向锦
添加教师端页面
|
757
|
}
|
91a745c9
孙向锦
完善后台功能
|
758
759
|
} catch (Exception ex) {
ex.printStackTrace();
|
338594c8
孙向锦
添加教师端页面
|
760
|
}
|
91a745c9
孙向锦
完善后台功能
|
761
|
} catch (Exception ex) {
|
338594c8
孙向锦
添加教师端页面
|
762
763
|
ex.printStackTrace();
res.setError();
|
bed6e1fc
孙向锦
添加其他功能
|
764
|
}
|
91a745c9
孙向锦
完善后台功能
|
765
|
} else {
|
bed6e1fc
孙向锦
添加其他功能
|
766
767
|
res.setOtherError();
}
|
ce70231e
孙向锦
增加接口
|
768
769
|
logger.info("paperInfo cost time : "
+ (System.currentTimeMillis() - cur));
|
bed6e1fc
孙向锦
添加其他功能
|
770
771
|
return res.toJson();
}
|
4b6a5239
孙向锦
管理员界面
|
772
|
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
773
|
|
c617106f
孙向锦
添加即时测功能
|
774
775
|
/**
* 试卷详细信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
776
|
*
|
c617106f
孙向锦
添加即时测功能
|
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/testpaperinfo", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object testpaperinfo() throws Exception {
event("testpaperinfo");
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<PageData> res = new ResponseGson();
String paperId = pd.getString("ID");
if (!StringUtils.isEmpty(paperId)) {
try {
pd.put("TESTPAPER_ID", paperId);
PageData testPd = testpaperService.findById(pd);
if (testPd != null) {
PageData testInfof = new PageData();
testInfof.put("PAPER_ID", testPd.getString("PAPER_ID"));
testInfof.put("TEST_ID", paperId);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
796
797
798
|
List<PageData> list = testpaperinfoService
.listTestPaperQuestionIDs(testInfof);
for (PageData pqd : list) {
|
c617106f
孙向锦
添加即时测功能
|
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
|
PageData tpqd = questionService.findById(pqd);
pqd.putAll(tpqd);
pqd.remove("P_ID");
pqd.remove("SUBJECT_ID");
pqd.remove("PROBLEM_TYPE_ID");
pqd.remove("CHAPTER_ID");
pqd.remove("TEACHER_ID");
pqd.remove("SCHOOL_ID");
pqd.remove("SUG_SCORE");
pqd.remove("SUG_PART_SCORE");
pqd.remove("USER_ID");
pqd.remove("CREATE_DATE");
pqd.remove("QUESTION_FROM");
pqd.remove("REMARK");
pqd.put("TEST_ID", paperId);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
814
815
|
List<PageData> listinfo = testpaperinfoService
.listTestPaperQuestionIDinfo(pqd);
|
c617106f
孙向锦
添加即时测功能
|
816
|
List<PageData> answerInfos = new ArrayList<PageData>();
|
757dfed6
孙向锦
样例报表
|
817
|
List<String> answerList = new ArrayList<String>();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
818
|
for (PageData pid : listinfo) {
|
c617106f
孙向锦
添加即时测功能
|
819
820
|
String answer = pid.getString("ANSWER");
PageData answerPd = null;
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
821
822
823
824
825
|
if (answerInfos.size() > 0) {
answerPd = answerInfos
.get(answerInfos.size() - 1);
if (!answer
.equals(answerPd.getString("ANSWER"))) {
|
c617106f
孙向锦
添加即时测功能
|
826
827
|
answerPd = new PageData();
answerPd.put("ANSWER", answer);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
828
829
|
answerPd.put("ISRIGHT",
pid.getString("RIGHT"));
|
c617106f
孙向锦
添加即时测功能
|
830
|
answerInfos.add(answerPd);
|
757dfed6
孙向锦
样例报表
|
831
|
answerList.add(answer);
|
c617106f
孙向锦
添加即时测功能
|
832
|
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
833
|
} else {
|
c617106f
孙向锦
添加即时测功能
|
834
835
836
837
|
answerPd = new PageData();
answerPd.put("ANSWER", answer);
answerPd.put("ISRIGHT", pid.getString("RIGHT"));
answerInfos.add(answerPd);
|
757dfed6
孙向锦
样例报表
|
838
|
answerList.add(answer);
|
c617106f
孙向锦
添加即时测功能
|
839
840
|
}
String strCount = answerPd.getString("COUNT");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
841
842
843
844
845
846
|
int count = 0;
if (strCount != null) {
try {
count = Integer.parseInt(strCount);
} catch (NumberFormatException ex) {
}
|
c617106f
孙向锦
添加即时测功能
|
847
|
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
848
|
count++;
|
c617106f
孙向锦
添加即时测功能
|
849
850
|
answerPd.put("COUNT", count);
}
|
757dfed6
孙向锦
样例报表
|
851
852
|
String questionNumStr = pqd.getString("OPTION_NUM");
int questionNum = Integer.parseInt(questionNumStr);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
853
854
855
856
|
for (int i = 0; i < questionNum; i++) {
if ((!answerList.contains("" + (char) ('A' + i)))
&& !(answerList.contains(""
+ (char) ('a' + i)))) {
|
757dfed6
孙向锦
样例报表
|
857
|
PageData answerPd = new PageData();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
858
859
860
|
answerPd.put("ANSWER", "" + (char) ('A' + i));
answerPd.put("ISRIGHT", pqd.get("ANSWER")
.equals(('A' + i)) ? "1" : "0");
|
757dfed6
孙向锦
样例报表
|
861
862
863
864
|
answerPd.put("COUNT", 0);
answerInfos.add(answerPd);
}
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
865
866
867
868
869
870
871
872
873
|
Collections.sort(answerInfos,
new Comparator<PageData>() {
@Override
public int compare(PageData p1, PageData p2) {
return p1.getString("ANSWER")
.compareToIgnoreCase(
p2.getString("ANSWER"));
}
|
757dfed6
孙向锦
样例报表
|
874
|
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
875
|
});
|
c617106f
孙向锦
添加即时测功能
|
876
877
878
|
pqd.put("ANSWERINFO", answerInfos);
pqd.remove("TEST_ID");
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
879
|
for (PageData pad : list) {
|
757dfed6
孙向锦
样例报表
|
880
|
String optionContent = pad.getString("OPTION_CONTENT");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
881
882
883
884
885
|
if (optionContent != null
&& optionContent.startsWith("[")
&& optionContent.endsWith("]")) {
String[] options = optionContent.substring(1,
optionContent.length() - 1).split(",");
|
757dfed6
孙向锦
样例报表
|
886
|
pad.put("OPTION_CONTENT", options);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
887
888
889
|
} else {
pad.put("OPTION_CONTENT",
new String[] { optionContent });
|
757dfed6
孙向锦
样例报表
|
890
891
|
}
}
|
c617106f
孙向锦
添加即时测功能
|
892
|
testPd.put("QUESTIONS", list);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
893
|
|
c617106f
孙向锦
添加即时测功能
|
894
895
896
897
898
899
900
901
902
903
904
905
|
}
res.setData(testPd);
} catch (Exception e) {
e.printStackTrace();
res.setError();
}
}
logger.info("testpaperinfo cost time:"
+ (System.currentTimeMillis() - cur));
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
906
|
|
c617106f
孙向锦
添加即时测功能
|
907
908
|
/**
* 试卷详细信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
909
|
*
|
c617106f
孙向锦
添加即时测功能
|
910
911
912
913
914
915
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/questionintestreportinfo", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object questionInTestReportInfo() throws Exception {
|
757dfed6
孙向锦
样例报表
|
916
|
event("questionInTestReportInfo");
|
c617106f
孙向锦
添加即时测功能
|
917
918
919
920
921
922
923
924
|
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<PageData> res = new ResponseGson();
if (pd.getString("QUESTION_ID") != null) {
String questionId = pd.getString("QUESTION_ID");
PageData pqd = new PageData();
pqd.put("QUESTION_ID", questionId);
PageData tpqd = questionService.findById(pqd);
|
757dfed6
孙向锦
样例报表
|
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
|
if (tpqd != null) {
pqd.putAll(tpqd);
pqd.remove("P_ID");
pqd.remove("SUBJECT_ID");
pqd.remove("PROBLEM_TYPE_ID");
pqd.remove("CHAPTER_ID");
pqd.remove("TEACHER_ID");
pqd.remove("SCHOOL_ID");
pqd.remove("SUG_SCORE");
pqd.remove("SUG_PART_SCORE");
pqd.remove("USER_ID");
pqd.remove("CREATE_DATE");
pqd.remove("QUESTION_FROM");
pqd.remove("REMARK");
String optionContent = pqd.getString("OPTION_CONTENT");
if (optionContent != null && optionContent.startsWith("[")
&& optionContent.endsWith("]")) {
String[] options = optionContent.substring(1,
optionContent.length() - 1).split(",");
pqd.put("OPTION_CONTENT", options);
} else {
pqd.put("OPTION_CONTENT", new String[] { optionContent });
}
if (pd.getString("TEST_ID") != null) {
pqd.put("TEST_ID", pd.getString("TEST_ID"));
}
List<PageData> listinfo = testpaperinfoService
.listTestPaperQuestionIDinfo(pqd);
List<PageData> answerInfos = new ArrayList<PageData>();
for (PageData pid : listinfo) {
String answer = pid.getString("ANSWER");
PageData answerPd = null;
if (answerInfos.size() > 0) {
answerPd = answerInfos.get(answerInfos.size() - 1);
if (!answer.equals(answerPd.getString("ANSWER"))) {
answerPd = new PageData();
answerPd.put("ANSWER", answer);
answerPd.put("ISRIGHT", pid.getString("RIGHT"));
answerInfos.add(answerPd);
}
} else {
|
c617106f
孙向锦
添加即时测功能
|
966
967
968
969
970
|
answerPd = new PageData();
answerPd.put("ANSWER", answer);
answerPd.put("ISRIGHT", pid.getString("RIGHT"));
answerInfos.add(answerPd);
}
|
757dfed6
孙向锦
样例报表
|
971
972
973
974
975
976
977
|
String strCount = answerPd.getString("COUNT");
int count = 0;
if (strCount != null) {
try {
count = Integer.parseInt(strCount);
} catch (NumberFormatException ex) {
}
|
c617106f
孙向锦
添加即时测功能
|
978
|
}
|
757dfed6
孙向锦
样例报表
|
979
980
|
count++;
answerPd.put("COUNT", count);
|
c617106f
孙向锦
添加即时测功能
|
981
|
}
|
757dfed6
孙向锦
样例报表
|
982
983
|
pqd.put("ANSWERINFO", answerInfos);
res.setData(pqd);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
984
|
} else {
|
757dfed6
孙向锦
样例报表
|
985
|
res.setDataError();
|
c617106f
孙向锦
添加即时测功能
|
986
|
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
987
|
} else {
|
c617106f
孙向锦
添加即时测功能
|
988
989
|
res.setDataError();
}
|
757dfed6
孙向锦
样例报表
|
990
|
logger.info("questionInTestReportInfo cost time:"
|
c617106f
孙向锦
添加即时测功能
|
991
992
993
|
+ (System.currentTimeMillis() - cur));
return res.toJson();
}
|
91a745c9
孙向锦
完善后台功能
|
994
|
|
2ad7ca45
孙向锦
试卷bug修改
|
995
996
|
/**
* 试卷简要信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
997
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/paperbriefinfo", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object paperBriefInfo() throws Exception {
event("paperBriefInfo");
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<Paper> res = new ResponseGson<Paper>();
if (pd.containsKey("PAPER_ID")) {
try {
try {
Paper paper = new Paper();
PageData ppd = paperService.findById(pd);
if (ppd != null) {
paper.setTitle(ppd.getString("TITLE"));
paper.setExam_time(ppd.getString("EXAM_TIME"));
paper.setUser_id(ppd.getString("USER_ID"));
paper.setPaper_type(ppd.getString("PAPER_TYPE"));
paper.setSubject_id(ppd.getString("SUBJECT_ID"));
paper.setGrade_id(ppd.getString("GRADE_ID"));
paper.setScore(ppd.getString("SCORE"));
paper.setQuestions(new ArrayList<Question>());
List<PageData> questList = v1Service
.getTestPaperInfo(pd);
for (PageData qpd : questList) {
Question question = new Question();
question.setQuestion_id(qpd
.getString("QUESTION_ID"));
if ("-1".equals("" + qpd.getString("P_ID"))) {
PageData pidPd = new PageData();
pidPd.put("PID", question.getQuestion_id());
question.setQuestions(new ArrayList<Question>());
List<PageData> qs = v1Service
.getQuestionsByPID(pidPd);
for (PageData q : qs) {
Question qq = new Question();
qq.setQuestion_id(q
.getString("QUESTION_ID"));
question.getQuestions().add(qq);
}
}
if ("-1".equals(qpd.getString("P_ID"))
|| "0".equals(qpd.getString("P_ID"))) {
paper.getQuestions().add(question);
}
}
// pd.put("JSON", paper.toJson());
res.setData(paper);
logger.info(paper.toJson());
}
} catch (Exception ex) {
ex.printStackTrace();
}
} catch (Exception ex) {
ex.printStackTrace();
res.setError();
}
} else {
res.setOtherError();
}
|
757dfed6
孙向锦
样例报表
|
1062
|
logger.info("paperBriefInfo cost time : "
|
2ad7ca45
孙向锦
试卷bug修改
|
1063
1064
1065
1066
|
+ (System.currentTimeMillis() - cur));
return res.toBrifJson();
}
|
2ad7ca45
孙向锦
试卷bug修改
|
1067
1068
|
/**
* 试卷问题
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1069
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1070
1071
1072
|
* @return
* @throws Exception
*/
|
bed6e1fc
孙向锦
添加其他功能
|
1073
1074
1075
|
@RequestMapping(value = "/paperquestion", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object paperQuestion() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
1076
|
event("paperQuestion");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1077
|
long cur = System.currentTimeMillis();
|
bed6e1fc
孙向锦
添加其他功能
|
1078
1079
|
PageData pd = this.getPageData();
ResponseGson<PageData> res = new ResponseGson();
|
ce70231e
孙向锦
增加接口
|
1080
1081
|
logger.info("paperquestion cost time : "
+ (System.currentTimeMillis() - cur));
|
bed6e1fc
孙向锦
添加其他功能
|
1082
1083
|
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
1084
|
|
2ad7ca45
孙向锦
试卷bug修改
|
1085
1086
|
/**
* 问题
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1087
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1088
1089
1090
|
* @return
* @throws Exception
*/
|
4fd2e08c
孙向锦
修复接口中的bug
|
1091
1092
1093
|
@RequestMapping(value = "/question", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object question() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
1094
|
event("question");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1095
|
long cur = System.currentTimeMillis();
|
4fd2e08c
孙向锦
修复接口中的bug
|
1096
|
PageData pd = this.getPageData();
|
2ad7ca45
孙向锦
试卷bug修改
|
1097
1098
|
ResponseGson<List<PageData>> res = new ResponseGson();
List<PageData> list = new ArrayList<PageData>();
|
ce70231e
孙向锦
增加接口
|
1099
|
if (pd.containsKey("ID")) {
|
2ad7ca45
孙向锦
试卷bug修改
|
1100
1101
1102
1103
1104
|
String ids = pd.getString("ID");
String[] id = ids.split(",");
for (String i : id) {
pd.put("QUESTION_ID", i);
PageData data = questionService.findById(pd);
|
c617106f
孙向锦
添加即时测功能
|
1105
|
String optionContent = data.getString("OPTION_CONTENT");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1106
1107
1108
1109
|
if (optionContent != null && optionContent.startsWith("[")
&& optionContent.endsWith("]")) {
String[] options = optionContent.substring(1,
optionContent.length() - 1).split(",");
|
c617106f
孙向锦
添加即时测功能
|
1110
|
data.put("OPTION_CONTENT", options);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1111
1112
|
} else {
data.put("OPTION_CONTENT", new String[] { optionContent });
|
c617106f
孙向锦
添加即时测功能
|
1113
|
}
|
2ad7ca45
孙向锦
试卷bug修改
|
1114
1115
1116
1117
1118
|
if (data != null) {
list.add(data);
}
}
res.setData(list);
|
ce70231e
孙向锦
增加接口
|
1119
|
} else {
|
4fd2e08c
孙向锦
修复接口中的bug
|
1120
1121
|
res.setDataError();
}
|
ce70231e
孙向锦
增加接口
|
1122
1123
|
logger.info("question cost time : "
+ (System.currentTimeMillis() - cur));
|
4fd2e08c
孙向锦
修复接口中的bug
|
1124
1125
|
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
1126
|
|
2ad7ca45
孙向锦
试卷bug修改
|
1127
1128
|
/**
* 查询知识点名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1129
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1130
1131
1132
1133
1134
1135
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/knowledgename", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object knowledgename() throws Exception {
|
757dfed6
孙向锦
样例报表
|
1136
|
event("knowledgename");
|
2ad7ca45
孙向锦
试卷bug修改
|
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
|
ResponseGson<List<PageData>> res = new ResponseGson();
List<PageData> list = new ArrayList<PageData>();
PageData pd = getPageData();
if (pd.get("ID") != null) {
String ids = pd.getString("ID");
String[] id = ids.split(",");
for (String i : id) {
pd.put("KNOWLEDGE_ID", i);
PageData data = knowledgeService.findById(pd);
if (data != null) {
PageData t = new PageData();
t.put("KNOWLEDGE_ID", data.get("KNOWLEDGE_ID"));
t.put("NAME", data.get("NAME"));
list.add(t);
}
}
res.setData(list);
}
;
return res;
}
/**
* 章节名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1161
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1162
1163
1164
1165
1166
1167
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/chaptername", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object chaptername() throws Exception {
|
757dfed6
孙向锦
样例报表
|
1168
|
event("chaptername");
|
2ad7ca45
孙向锦
试卷bug修改
|
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
|
ResponseGson<List<PageData>> res = new ResponseGson();
List<PageData> list = new ArrayList<PageData>();
PageData pd = getPageData();
if (pd.get("ID") != null) {
String ids = pd.getString("ID");
String[] id = ids.split(",");
for (String i : id) {
pd.put("ID", i);
PageData data = chapterService.findById(pd);
if (data != null) {
PageData t = new PageData();
t.put("ID", data.get("ID"));
t.put("NAME", data.get("NAME"));
list.add(t);
}
}
res.setData(list);
}
;
return res;
}
/**
* 试题添加
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1193
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1194
1195
1196
|
* @return
* @throws Exception
*/
|
4fd2e08c
孙向锦
修复接口中的bug
|
1197
1198
1199
|
@RequestMapping(value = "/question/add", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object questionAdd() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
1200
|
event("questionAdd");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1201
|
long cur = System.currentTimeMillis();
|
4fd2e08c
孙向锦
修复接口中的bug
|
1202
1203
1204
1205
|
PageData pd = this.getPageData();
ResponseGson<PageData> res = new ResponseGson();
pd.put("QUESTION_ID", this.get32UUID());
questionService.save(pd);
|
ce70231e
孙向锦
增加接口
|
1206
1207
|
logger.info("questionAdd cost time : "
+ (System.currentTimeMillis() - cur));
|
4fd2e08c
孙向锦
修复接口中的bug
|
1208
1209
|
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
1210
|
|
2ad7ca45
孙向锦
试卷bug修改
|
1211
1212
|
/***
* 上传试卷
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1213
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1214
1215
1216
|
* @return
* @throws Exception
*/
|
338594c8
孙向锦
添加教师端页面
|
1217
1218
1219
|
@RequestMapping(value = "/uploadpaper", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object uploadpaper() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
1220
|
event("uploadpaper");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1221
|
long cur = System.currentTimeMillis();
|
338594c8
孙向锦
添加教师端页面
|
1222
1223
|
PageData pd = this.getPageData();
ResponseGson<String> res = new ResponseGson();
|
91a745c9
孙向锦
完善后台功能
|
1224
1225
|
if (!StringUtils.isEmpty(pd.getJsonString())) {
|
4fd2e08c
孙向锦
修复接口中的bug
|
1226
|
logger.info(pd.getJsonString());
|
338594c8
孙向锦
添加教师端页面
|
1227
1228
1229
1230
|
Paper paper = Paper.parse(pd.getJsonString());
PageData paperPd = new PageData();
String paperID = this.get32UUID();
res.setData(paperID);
|
91a745c9
孙向锦
完善后台功能
|
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
|
paperPd.put("PAPER_ID", paperID);
paperPd.put("TITLE", paper.getTitle());
paperPd.put("USER_ID", paper.getUser_id());
paperPd.put("PAPER_TYPE", paper.getPaper_type());
paperPd.put("SUBJECT_ID", paper.getSubject_id());
paperPd.put("GRADE_ID", paper.getGrade_id());
paperPd.put("EXAM_TIME", paper.getExam_time());
paperPd.put("SCORE", paper.getScore());
paperPd.put("PAPER_STATE", "0");
paperPd.put("REMARK", "");
|
338594c8
孙向锦
添加教师端页面
|
1241
|
String schoolID = Myelfun.getUserID(paper.getUser_id());
|
4b6a5239
孙向锦
管理员界面
|
1242
|
paperPd.put("SCHOOL_ID", paper.getSchool_id() == null ? schoolID:paper.getSchool_id());
|
91a745c9
孙向锦
完善后台功能
|
1243
1244
1245
|
paperPd.put("CREATE_DATE", Tools.date2Str(new Date()));
paperPd.put("MODIFY_DATE", Tools.date2Str(new Date()));
|
ce70231e
孙向锦
增加接口
|
1246
|
int questionNum = 0;
|
91a745c9
孙向锦
完善后台功能
|
1247
|
|
338594c8
孙向锦
添加教师端页面
|
1248
|
List<Question> questions = paper.getQuestions();
|
91a745c9
孙向锦
完善后台功能
|
1249
1250
|
if (questions != null) {
for (Question question : questions) {
|
338594c8
孙向锦
添加教师端页面
|
1251
1252
1253
|
String questionID = this.get32UUID();
PageData qPd = new PageData();
qPd.put("QUESTION_ID", questionID);
|
91a745c9
孙向锦
完善后台功能
|
1254
1255
|
if (question.getQuestions() != null
&& question.getQuestions().size() > 0) {
|
338594c8
孙向锦
添加教师端页面
|
1256
|
qPd.put("P_ID", "-1");
|
91a745c9
孙向锦
完善后台功能
|
1257
|
} else {
|
ce70231e
孙向锦
增加接口
|
1258
|
questionNum++;
|
338594c8
孙向锦
添加教师端页面
|
1259
1260
1261
1262
|
qPd.put("P_ID", "0");
}
qPd.put("SUBJECT_ID", paper.getSubject_id());
qPd.put("CHAPTER_ID", question.getChapter_id());
|
ce70231e
孙向锦
增加接口
|
1263
1264
1265
|
qPd.put("PROBLEM_TYPE_ID",
question.getProblem_type_id() == null ? "1"
: question.getProblem_type_id());
|
338594c8
孙向锦
添加教师端页面
|
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
|
qPd.put("TEACHER_ID", paper.getUser_id());
qPd.put("SCHOOL_ID", schoolID);
qPd.put("KNOWLEDGE_ID", question.getKnowledge_id());
qPd.put("CONTENT", question.getContent());
qPd.put("OPTION_NUM", question.getOption_num());
qPd.put("OPTION_CONTENT", question.getOption_content());
qPd.put("ANSWER", question.getAnswer());
qPd.put("DIFFICULTY", question.getDifficulty());
qPd.put("ANALYSIS", question.getAnalysis());
qPd.put("QUESTION_FROM", question.getQuestion_from());
qPd.put("SUG_SCORE", question.getScore());
qPd.put("SUG_PART_SCORE", question.getPart_score());
qPd.put("USER_ID", paper.getUser_id());
qPd.put("CREATE_DATE", Tools.date2Str(new Date()));
qPd.put("REMARK", "");
questionService.save(qPd);
|
91a745c9
孙向锦
完善后台功能
|
1282
|
|
338594c8
孙向锦
添加教师端页面
|
1283
|
PageData pqPd = new PageData();
|
91a745c9
孙向锦
完善后台功能
|
1284
1285
1286
1287
1288
1289
1290
|
pqPd.put("PAPER_ID", paperID);
pqPd.put("QUESTION_ID", questionID);
pqPd.put("SCORE", question.getScore());
pqPd.put("PART_SCORE", "0");
pqPd.put("RANK", question.getRank());
pqPd.put("NO_NAME", question.getNo_name());
pqPd.put("PAPERQUESTION_ID", this.get32UUID());
|
338594c8
孙向锦
添加教师端页面
|
1291
|
paperquestionService.save(pqPd);
|
91a745c9
孙向锦
完善后台功能
|
1292
1293
|
if (question.getQuestions() != null) {
|
338594c8
孙向锦
添加教师端页面
|
1294
|
List<Question> qs = question.getQuestions();
|
91a745c9
孙向锦
完善后台功能
|
1295
|
for (Question q : qs) {
|
338594c8
孙向锦
添加教师端页面
|
1296
1297
1298
1299
1300
1301
|
String qID = this.get32UUID();
PageData cqPd = new PageData();
cqPd.put("QUESTION_ID", qID);
cqPd.put("P_ID", questionID);
cqPd.put("SUBJECT_ID", paper.getSubject_id());
cqPd.put("CHAPTER_ID", q.getChapter_id());
|
ce70231e
孙向锦
增加接口
|
1302
1303
1304
|
cqPd.put("PROBLEM_TYPE_ID", question
.getProblem_type_id() == null ? "1"
: question.getProblem_type_id());
|
338594c8
孙向锦
添加教师端页面
|
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
|
cqPd.put("TEACHER_ID", paper.getUser_id());
cqPd.put("SCHOOL_ID", schoolID);
cqPd.put("KNOWLEDGE_ID", q.getKnowledge_id());
cqPd.put("CONTENT", q.getContent());
cqPd.put("OPTION_NUM", q.getOption_num());
cqPd.put("OPTION_CONTENT", q.getOption_content());
cqPd.put("ANSWER", q.getAnswer());
cqPd.put("DIFFICULTY", q.getDifficulty());
cqPd.put("ANALYSIS", q.getAnalysis());
cqPd.put("QUESTION_FROM", q.getQuestion_from());
cqPd.put("SUG_SCORE", q.getScore());
cqPd.put("SUG_PART_SCORE", q.getSug_part_score());
cqPd.put("USER_ID", paper.getUser_id());
cqPd.put("CREATE_DATE", Tools.date2Str(new Date()));
cqPd.put("REMARK", "");
|
91a745c9
孙向锦
完善后台功能
|
1320
|
|
338594c8
孙向锦
添加教师端页面
|
1321
|
questionService.save(cqPd);
|
91a745c9
孙向锦
完善后台功能
|
1322
|
|
338594c8
孙向锦
添加教师端页面
|
1323
|
PageData cpqPd = new PageData();
|
91a745c9
孙向锦
完善后台功能
|
1324
1325
1326
1327
1328
1329
1330
1331
|
cpqPd.put("PAPER_ID", paperID);
cpqPd.put("QUESTION_ID", qID);
cpqPd.put("SCORE", q.getScore());
cpqPd.put("PART_SCORE", "0");
cpqPd.put("RANK", q.getRank());
cpqPd.put("NO_NAME", q.getNo_name());
cpqPd.put("PAPERQUESTION_ID", this.get32UUID());
|
338594c8
孙向锦
添加教师端页面
|
1332
|
paperquestionService.save(cpqPd);
|
ce70231e
孙向锦
增加接口
|
1333
|
questionNum++;
|
338594c8
孙向锦
添加教师端页面
|
1334
1335
1336
1337
|
}
}
}
}
|
4fd2e08c
孙向锦
修复接口中的bug
|
1338
1339
|
paperPd.put("QUESTION_NUM", "" + questionNum);
paperService.save(paperPd);
|
91a745c9
孙向锦
完善后台功能
|
1340
1341
|
} else {
|
338594c8
孙向锦
添加教师端页面
|
1342
1343
|
res.setDataError();
}
|
ce70231e
孙向锦
增加接口
|
1344
1345
1346
1347
1348
|
logger.info("uploadpaper cost time : "
+ (System.currentTimeMillis() - cur));
return res.toJson();
}
|
2ad7ca45
孙向锦
试卷bug修改
|
1349
1350
|
/**
* 上传试卷,不上传试题详细信息。试题从已有数据库中组卷
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1351
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
|
* @return
* @throws Exception
*/
@RequestMapping(value = "/publishpaper", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object publishPaper() throws Exception {
event("publishpaper");
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<String> 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();
res.setData(paperID);
paperPd.put("PAPER_ID", paperID);
paperPd.put("TITLE", paper.getTitle());
paperPd.put("USER_ID", paper.getUser_id());
paperPd.put("PAPER_TYPE", paper.getPaper_type());
paperPd.put("SUBJECT_ID", paper.getSubject_id());
paperPd.put("GRADE_ID", paper.getGrade_id());
paperPd.put("EXAM_TIME", paper.getExam_time());
|
757dfed6
孙向锦
样例报表
|
1376
|
paperPd.put("CLASS_ID", paper.getClass_id());
|
2ad7ca45
孙向锦
试卷bug修改
|
1377
1378
1379
1380
1381
1382
1383
|
paperPd.put("SCORE", paper.getScore());
paperPd.put("PAPER_STATE", "0");
paperPd.put("REMARK", "");
String schoolID = Myelfun.getUserID(paper.getUser_id());
paperPd.put("SCHOOL_ID", schoolID);
paperPd.put("CREATE_DATE", Tools.date2Str(new Date()));
paperPd.put("MODIFY_DATE", Tools.date2Str(new Date()));
|
2ad7ca45
孙向锦
试卷bug修改
|
1384
|
List<Question> questions = paper.getQuestions();
|
757dfed6
孙向锦
样例报表
|
1385
|
int questionNum = questions.size();
|
2ad7ca45
孙向锦
试卷bug修改
|
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
|
if (questions != null) {
for (Question question : questions) {
PageData pqPd = new PageData();
pqPd.put("PAPER_ID", paperID);
pqPd.put("QUESTION_ID", question.getQuestion_id());
pqPd.put("SCORE", question.getScore());
pqPd.put("PART_SCORE", "0");
pqPd.put("RANK", question.getRank());
pqPd.put("NO_NAME", question.getNo_name());
pqPd.put("PAPERQUESTION_ID", this.get32UUID());
|
c617106f
孙向锦
添加即时测功能
|
1396
|
pqPd.put("P_ID", "0");
|
227dbfbb
孙向锦
添加知识点id
|
1397
|
pqPd.put("KNOWLEDGE_ID", question.getKnowledge_id());//
|
2ad7ca45
孙向锦
试卷bug修改
|
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
|
paperquestionService.save(pqPd);
}
}
paperPd.put("QUESTION_NUM", "" + questionNum);
paperService.save(paperPd);
} else {
res.setDataError();
}
|
757dfed6
孙向锦
样例报表
|
1408
|
logger.info("publishpaper cost time : "
|
2ad7ca45
孙向锦
试卷bug修改
|
1409
1410
1411
1412
1413
1414
|
+ (System.currentTimeMillis() - cur));
return res.toJson();
}
/**
* 上传知识点
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1415
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1416
1417
1418
|
* @return
* @throws Exception
*/
|
ce70231e
孙向锦
增加接口
|
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
|
@RequestMapping(value = "/uploadpoint", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object uploadpoint() throws Exception {
event("uploadpoint");
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<String> res = new ResponseGson();
if (!StringUtils.isEmpty(pd.getJsonString())) {
try {
ResponseGson<List<Point>> req = ResponseGson.parse(
pd.getJsonString(), Point.class);
List<Point> list = req.getData();
if (list != null && list.size() > 0) {
for (Point point : list) {
savePoint(point, null);
}
}
} catch (Exception e) {
res.setError();
}
} else {
res.setDataError();
}
logger.info("uploadpoint cost time : "
+ (System.currentTimeMillis() - cur));
|
91a745c9
孙向锦
完善后台功能
|
1445
1446
1447
|
return res.toJson();
}
|
2ad7ca45
孙向锦
试卷bug修改
|
1448
|
/**
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1449
1450
|
* 上传测验成绩
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1451
1452
|
* @return
*/
|
91a745c9
孙向锦
完善后台功能
|
1453
1454
1455
|
@RequestMapping(value = "/uploadtestpaper", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object uploadTestpaper() {
|
3371dbc6
孙向锦
0720 版本
|
1456
|
event("uploadTestpaper");
|
4fd2e08c
孙向锦
修复接口中的bug
|
1457
|
long cur = System.currentTimeMillis();
|
91a745c9
孙向锦
完善后台功能
|
1458
1459
1460
|
PageData pd = this.getPageData();
ResponseGson<String> res = new ResponseGson();
if (!StringUtils.isEmpty(pd.getJsonString())) {
|
4fd2e08c
孙向锦
修复接口中的bug
|
1461
|
logger.info(pd.getJsonString());
|
91a745c9
孙向锦
完善后台功能
|
1462
1463
1464
1465
|
TestPaper testPaper = TestPaper.parse(pd.getJsonString());
try {
PageData testPd = new PageData();
String testPaperId = this.get32UUID();
|
91a745c9
孙向锦
完善后台功能
|
1466
|
testPd.put("TEACHER_ID", testPaper.getTeacherId());
|
91a745c9
孙向锦
完善后台功能
|
1467
1468
|
testPd.put("PAPER_ID", testPaper.getPaperId());
testPd.put("SCLASS_ID", testPaper.getClassId());
|
91a745c9
孙向锦
完善后台功能
|
1469
1470
1471
1472
1473
|
testPd.put(
"CREATE_DATE",
testPaper.getCreateDate() == null ? Tools
.date2Str(new Date()) : testPaper
.getCreateDate());
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1474
1475
1476
1477
|
testPd.put(
"TEST_TYPE",
testPaper.getTest_type() != null ? testPaper
.getTest_type() : "1");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
|
List<PageData> listData = testpaperService.listAll(testPd);
if (!(listData != null && listData.size() > 0)) {
testPd.put("START_DATE", testPaper.getStartDate());
testPd.put("END_DATE", testPaper.getEndDate());
testPd.put("NAME", testPaper.getName());
testPd.put("TESTPAPER_ID", testPaperId);
testPd.put("OTHER_SCORE", testPaper.getOtherScore());
testPd.put("HIGHT_SCORE", testPaper.getHighScore());
testPd.put("LOW_SCORE", testPaper.getLowScore());
testPd.put("AVG_SCORE", testPaper.getAvgScore());
testPd.put("REMARK", testPaper.getRemark());
testpaperService.save(testPd);
if (testPaper.getStudents() != null) {
List<PageData> testInfoPdList = new ArrayList();
PageData testInfoPd = null;
for (StudentAnswer studentAnswer : testPaper
.getStudents()) {
if (studentAnswer.getQuestions() != null) {
PageData studentPageData = new PageData();
studentPageData.put("STUDENTTEST_ID",
get32UUID());
studentPageData.put("STUDENT_ID",
studentAnswer.getStudentId());
studentPageData.put("TEST_ID", testPaperId);
studentPageData.put("PAPER_ID",
testPaper.getPaperId());
studentPageData.put("SCORE",
studentAnswer.getScore());
studentPageData.put("CLASS_ID",
testPaper.getClassId());
studenttestService.save(studentPageData);
for (TestPaperInfo testPaperInfo : studentAnswer
.getQuestions()) {
testInfoPd = new PageData();
testInfoPd.put("TESTPAPERINFO_ID",
this.get32UUID());
testInfoPd.put("PAPER_ID",
testPaper.getPaperId());
testInfoPd.put("STUDENT_ID",
studentAnswer.getStudentId());
testInfoPd.put("TEST_ID", testPaperId);
testInfoPd.put("QUESTION_ID",
testPaperInfo.getQuestionId());
testInfoPd.put("ANSWER",
testPaperInfo.getAnswer());
testInfoPd.put("RIGHT",
testPaperInfo.getRight());
testInfoPd.put("SCORE",
testPaperInfo.getScore());
testInfoPd.put("LIKES",
testPaperInfo.getLikes());
testInfoPd
.put("ANSWER_TYPE",
testPaperInfo
.getAnswerType() == null ? "1"
: testPaperInfo
.getAnswerType());
testInfoPd.put("PRESS_TIME",
testPaperInfo.getPressTime());
testInfoPd.put("RECEIVER_DATE",
testPaperInfo.getReceiverDate());
testInfoPd.put("SUBJECTIVE",
testPaperInfo.getSubjective());
testInfoPd.put("NOTE",
testPaperInfo.getNote());
testInfoPd.put("MARK_NO",
testPaperInfo.getMarkNo());
testInfoPdList.add(testInfoPd);
}
}
}
testpaperinfoService.batchSave(testInfoPdList);
}
|
ce70231e
孙向锦
增加接口
|
1552
|
} else {
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
|
testPaperId = listData.get(0).getString("TESTPAPER_ID");
}
res.setData(testPaperId);
} catch (Exception e) {
e.printStackTrace();
res.setError();
res.setMessage(e.getMessage());
}
} else {
res.setDataError();
}
|
757dfed6
孙向锦
样例报表
|
1564
|
logger.info("uploadTestpaper cost time:"
|
ce70231e
孙向锦
增加接口
|
1565
|
+ (System.currentTimeMillis() - cur));
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1566
1567
1568
|
return res.toJson();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1569
|
}
|
ce70231e
孙向锦
增加接口
|
1570
|
|
2ad7ca45
孙向锦
试卷bug修改
|
1571
|
/**
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1572
1573
|
* 上传测验成绩
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1574
1575
|
* @return
*/
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1576
1577
1578
|
@RequestMapping(value = "/uploadupdatetestpaper", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object uploadupdateTestpaper() {
|
3371dbc6
孙向锦
0720 版本
|
1579
|
event("uploadupdateTestpaper");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
|
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<String> res = new ResponseGson();
if (!StringUtils.isEmpty(pd.getJsonString())) {
logger.info(pd.getJsonString());
TestPaper testPaper = TestPaper.parse(pd.getJsonString());
try {
PageData testPd = new PageData();
String testPaperId = this.get32UUID();
testPd.put("TEACHER_ID", testPaper.getTeacherId());
testPd.put("PAPER_ID", testPaper.getPaperId());
testPd.put("SCLASS_ID", testPaper.getClassId());
testPd.put(
"CREATE_DATE",
testPaper.getCreateDate() == null ? Tools
.date2Str(new Date()) : testPaper
.getCreateDate());
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1597
1598
1599
1600
|
testPd.put(
"TEST_TYPE",
testPaper.getTest_type() != null ? testPaper
.getTest_type() : "1");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
|
List<PageData> listData = testpaperService.listAll(testPd);
if ((listData != null && listData.size() > 0)) {
testPaperId = listData.get(0).getString("TESTPAPER_ID");
testpaperService.deleteList(testPd);
testPd.put("TEST_ID", testPaperId);
testpaperinfoService.delete(testPd);
studenttestService.delete(testPd);
}
testPd.put("START_DATE", testPaper.getStartDate());
testPd.put("END_DATE", testPaper.getEndDate());
testPd.put("NAME", testPaper.getName());
testPd.put("TESTPAPER_ID", testPaperId);
|
91a745c9
孙向锦
完善后台功能
|
1613
1614
1615
1616
|
testPd.put("OTHER_SCORE", testPaper.getOtherScore());
testPd.put("HIGHT_SCORE", testPaper.getHighScore());
testPd.put("LOW_SCORE", testPaper.getLowScore());
testPd.put("AVG_SCORE", testPaper.getAvgScore());
|
03a14c0e
孙向锦
更新报表
|
1617
|
testPd.put("TOTAL_SCORE", testPaper.getTotalScore());
|
3a163205
孙向锦
报表优化
|
1618
|
testPd.put("SUBJECT_ID", testPaper.getSubject_id());
|
91a745c9
孙向锦
完善后台功能
|
1619
1620
1621
|
testPd.put("REMARK", testPaper.getRemark());
testpaperService.save(testPd);
if (testPaper.getStudents() != null) {
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1622
1623
|
List<PageData> testInfoPdList = new ArrayList();
PageData testInfoPd = null;
|
91a745c9
孙向锦
完善后台功能
|
1624
1625
1626
|
for (StudentAnswer studentAnswer : testPaper.getStudents()) {
if (studentAnswer.getQuestions() != null) {
PageData studentPageData = new PageData();
|
91a745c9
孙向锦
完善后台功能
|
1627
1628
1629
1630
1631
1632
1633
1634
1635
|
studentPageData.put("STUDENT_ID",
studentAnswer.getStudentId());
studentPageData.put("TEST_ID", testPaperId);
studentPageData.put("PAPER_ID",
testPaper.getPaperId());
studentPageData.put("SCORE",
studentAnswer.getScore());
studentPageData.put("CLASS_ID",
testPaper.getClassId());
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1636
|
studentPageData.put("STUDENTTEST_ID", get32UUID());
|
91a745c9
孙向锦
完善后台功能
|
1637
1638
1639
1640
|
studenttestService.save(studentPageData);
for (TestPaperInfo testPaperInfo : studentAnswer
.getQuestions()) {
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1641
|
testInfoPd = new PageData();
|
91a745c9
孙向锦
完善后台功能
|
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
|
testInfoPd.put("TESTPAPERINFO_ID",
this.get32UUID());
testInfoPd.put("PAPER_ID",
testPaper.getPaperId());
testInfoPd.put("STUDENT_ID",
studentAnswer.getStudentId());
testInfoPd.put("TEST_ID", testPaperId);
testInfoPd.put("QUESTION_ID",
testPaperInfo.getQuestionId());
testInfoPd.put("ANSWER",
testPaperInfo.getAnswer());
testInfoPd.put("RIGHT",
testPaperInfo.getRight());
testInfoPd.put("SCORE",
testPaperInfo.getScore());
testInfoPd.put("LIKES",
testPaperInfo.getLikes());
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1659
1660
1661
|
testInfoPd.put("ANSWER_TYPE", testPaperInfo
.getAnswerType() == null ? "1"
: testPaperInfo.getAnswerType());
|
91a745c9
孙向锦
完善后台功能
|
1662
1663
1664
1665
1666
1667
1668
1669
1670
|
testInfoPd.put("PRESS_TIME",
testPaperInfo.getPressTime());
testInfoPd.put("RECEIVER_DATE",
testPaperInfo.getReceiverDate());
testInfoPd.put("SUBJECTIVE",
testPaperInfo.getSubjective());
testInfoPd.put("NOTE", testPaperInfo.getNote());
testInfoPd.put("MARK_NO",
testPaperInfo.getMarkNo());
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1671
|
testInfoPdList.add(testInfoPd);
|
91a745c9
孙向锦
完善后台功能
|
1672
1673
1674
|
}
}
}
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1675
|
testpaperinfoService.batchSave(testInfoPdList);
|
91a745c9
孙向锦
完善后台功能
|
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
|
}
res.setData(testPaperId);
} catch (Exception e) {
e.printStackTrace();
res.setError();
res.setMessage(e.getMessage());
}
} else {
res.setDataError();
}
|
757dfed6
孙向锦
样例报表
|
1686
|
logger.info("uploadupdatetestpaper cost time:"
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1687
|
+ (System.currentTimeMillis() - cur));
|
91a745c9
孙向锦
完善后台功能
|
1688
1689
1690
1691
|
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1692
|
|
757dfed6
孙向锦
样例报表
|
1693
|
/**
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1694
1695
|
* 上传测验成绩
*
|
757dfed6
孙向锦
样例报表
|
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
|
* @return
*/
@RequestMapping(value = "/uploadupdatetestpaper2", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object uploadupdateTestpaper2() {
event("uploadupdateTestpaper2");
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<String> res = new ResponseGson();
if (!StringUtils.isEmpty(pd.getJsonString())) {
logger.info(pd.getJsonString());
TestPaper testPaper = TestPaper.parse(pd.getJsonString());
try {
PageData testPd = new PageData();
String testPaperId = this.get32UUID();
testPd.put("TEACHER_ID", testPaper.getTeacherId());
testPd.put("PAPER_ID", testPaper.getPaperId());
testPd.put("SCLASS_ID", testPaper.getClassId());
testPd.put(
"CREATE_DATE",
testPaper.getCreateDate() == null ? Tools
.date2Str(new Date()) : testPaper
.getCreateDate());
List<PageData> listData = testpaperService.listAll(testPd);
if ((listData != null && listData.size() > 0)) {
testPaperId = listData.get(0).getString("TESTPAPER_ID");
testpaperService.deleteList(testPd);
testPd.put("TEST_ID", testPaperId);
testpaperinfoService.delete(testPd);
studenttestService.delete(testPd);
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1727
1728
1729
1730
|
testPd.put(
"TEST_TYPE",
testPaper.getTest_type() != null ? testPaper
.getTest_type() : "101");
|
757dfed6
孙向锦
样例报表
|
1731
1732
1733
1734
1735
1736
1737
1738
1739
|
testPd.put("START_DATE", testPaper.getStartDate());
testPd.put("END_DATE", testPaper.getEndDate());
testPd.put("NAME", testPaper.getName());
testPd.put("TESTPAPER_ID", testPaperId);
testPd.put("OTHER_SCORE", testPaper.getOtherScore());
testPd.put("HIGHT_SCORE", testPaper.getHighScore());
testPd.put("LOW_SCORE", testPaper.getLowScore());
testPd.put("AVG_SCORE", testPaper.getAvgScore());
testPd.put("TOTAL_SCORE", testPaper.getTotalScore());
|
3a163205
孙向锦
报表优化
|
1740
|
testPd.put("SUBJECT_ID", testPaper.getSubject_id());
|
757dfed6
孙向锦
样例报表
|
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
|
testPd.put("REMARK", testPaper.getRemark());
testpaperService.save(testPd);
if (testPaper.getStudents() != null) {
List<PageData> testInfoPdList = new ArrayList();
PageData testInfoPd = null;
for (StudentAnswer studentAnswer : testPaper.getStudents()) {
if (studentAnswer.getQuestions() != null) {
PageData studentPageData = new PageData();
studentPageData.put("STUDENT_ID",
studentAnswer.getStudentId());
studentPageData.put("TEST_ID", testPaperId);
studentPageData.put("PAPER_ID",
testPaper.getPaperId());
studentPageData.put("SCORE",
studentAnswer.getScore());
studentPageData.put("CLASS_ID",
testPaper.getClassId());
studentPageData.put("STUDENTTEST_ID", get32UUID());
studenttestService.save(studentPageData);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1760
|
|
757dfed6
孙向锦
样例报表
|
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
|
for (TestPaperInfo testPaperInfo : studentAnswer
.getQuestions()) {
testInfoPd = new PageData();
testInfoPd.put("TESTPAPERINFO_ID",
this.get32UUID());
testInfoPd.put("PAPER_ID",
testPaperInfo.getPaperId());
testInfoPd.put("STUDENT_ID",
studentAnswer.getStudentId());
testInfoPd.put("TEST_ID", testPaperId);
testInfoPd.put("QUESTION_ID",
testPaperInfo.getQuestionId());
testInfoPd.put("ANSWER",
testPaperInfo.getAnswer());
testInfoPd.put("RIGHT",
testPaperInfo.getRight());
testInfoPd.put("SCORE",
testPaperInfo.getScore());
testInfoPd.put("LIKES",
testPaperInfo.getLikes());
testInfoPd.put("ANSWER_TYPE", testPaperInfo
.getAnswerType() == null ? "1"
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1783
|
: testPaperInfo.getAnswerType());
|
757dfed6
孙向锦
样例报表
|
1784
1785
1786
1787
1788
1789
1790
1791
1792
|
testInfoPd.put("PRESS_TIME",
testPaperInfo.getPressTime());
testInfoPd.put("RECEIVER_DATE",
testPaperInfo.getReceiverDate());
testInfoPd.put("SUBJECTIVE",
testPaperInfo.getSubjective());
testInfoPd.put("NOTE", testPaperInfo.getNote());
testInfoPd.put("MARK_NO",
testPaperInfo.getMarkNo());
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1793
1794
|
testInfoPd.put("RANDOM",
testPaperInfo.getRandom());
|
757dfed6
孙向锦
样例报表
|
1795
1796
1797
1798
1799
|
testInfoPd.put("RANK", testPaperInfo.getRank());
testInfoPdList.add(testInfoPd);
}
}
}
|
eca4feb5
孙向锦
管理员功能完善
|
1800
1801
1802
|
if(testInfoPdList.size() > 0){
testpaperinfoService.batchSave(testInfoPdList);
}
|
757dfed6
孙向锦
样例报表
|
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
|
}
res.setData(testPaperId);
} catch (Exception e) {
e.printStackTrace();
res.setError();
res.setMessage(e.getMessage());
}
} else {
res.setDataError();
}
|
bda221f4
孙向锦
0830版本
|
1813
|
logger.info("uploadupdateTestpaper2 cost time:"
|
757dfed6
孙向锦
样例报表
|
1814
|
+ (System.currentTimeMillis() - cur));
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1815
|
|
757dfed6
孙向锦
样例报表
|
1816
|
return res.toJson();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1817
|
|
757dfed6
孙向锦
样例报表
|
1818
|
}
|
91a745c9
孙向锦
完善后台功能
|
1819
|
|
2ad7ca45
孙向锦
试卷bug修改
|
1820
1821
|
/**
* 查询知识点
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1822
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1823
1824
1825
|
* @return
* @throws Exception
*/
|
ce70231e
孙向锦
增加接口
|
1826
1827
1828
|
@RequestMapping(value = "/point", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object point() throws Exception {
|
757dfed6
孙向锦
样例报表
|
1829
|
event("point");
|
ce70231e
孙向锦
增加接口
|
1830
|
ResponseGson<List<PageData>> res = new ResponseGson();
|
2ad7ca45
孙向锦
试卷bug修改
|
1831
|
|
ce70231e
孙向锦
增加接口
|
1832
|
PageData pd = getPageData();
|
2ad7ca45
孙向锦
试卷bug修改
|
1833
|
String key = this.getRequestKey(pd, "point");
|
ce70231e
孙向锦
增加接口
|
1834
1835
|
PageData pagedata = new PageData();
pagedata.put("KEY", key);
|
2ad7ca45
孙向锦
试卷bug修改
|
1836
|
if (!"".equals(key.trim())) {
|
ce70231e
孙向锦
增加接口
|
1837
|
PageData ret = cacheService.findById(pagedata);
|
2ad7ca45
孙向锦
试卷bug修改
|
1838
|
if (ret != null && ret.get("CACHE") != null) {
|
ce70231e
孙向锦
增加接口
|
1839
1840
1841
1842
1843
|
return ret.get("CACHE");
}
}
List<PageData> list = knowledgeService.listAllknowledge(pd);
String depth = pd.getString("DEPTH");
|
2ad7ca45
孙向锦
试卷bug修改
|
1844
1845
1846
|
int end = 3;
if (depth != null) {
try {
|
ce70231e
孙向锦
增加接口
|
1847
|
end = Integer.parseInt(depth);
|
2ad7ca45
孙向锦
试卷bug修改
|
1848
1849
|
} catch (Exception e) {
|
ce70231e
孙向锦
增加接口
|
1850
1851
|
}
}
|
2ad7ca45
孙向锦
试卷bug修改
|
1852
|
roundPointData(list, 1, end);
|
ce70231e
孙向锦
增加接口
|
1853
1854
|
res.setData(list);
String str = res.toJson();
|
2ad7ca45
孙向锦
试卷bug修改
|
1855
|
str = str.replaceAll("[^\\u0000-\\uFFFF]", "");
|
ce70231e
孙向锦
增加接口
|
1856
1857
1858
1859
1860
|
pagedata.put("CACHE", str);
cacheService.save(pagedata);
return str;
}
|
2ad7ca45
孙向锦
试卷bug修改
|
1861
1862
|
/**
* 知识点递归查询
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1863
1864
1865
1866
1867
1868
1869
|
*
* @param list
* 查询知识点及子知识点
* @param dept
* 深度
* @param end
* 层深
|
2ad7ca45
孙向锦
试卷bug修改
|
1870
1871
1872
1873
|
* @throws Exception
*/
private void roundPointData(List<PageData> list, int dept, int end)
throws Exception {
|
ce70231e
孙向锦
增加接口
|
1874
1875
1876
1877
1878
1879
1880
|
if (list != null) {
for (PageData pd : list) {
pd.put("P_ID", pd.getString("KNOWLEDGE_ID"));
if (pd.getString("P_ID") != null
&& !"".equals(pd.getString("P_ID")) && dept < end) {
List<PageData> ret = knowledgeService.listAllknowledge(pd);
if (ret != null && ret.size() > 0) {
|
2ad7ca45
孙向锦
试卷bug修改
|
1881
|
roundPointData(ret, dept + 1, end);
|
ce70231e
孙向锦
增加接口
|
1882
1883
1884
1885
1886
1887
1888
|
pd.put("CHILDREN", ret);
}
}
pd.remove("P_ID");
}
}
}
|
2ad7ca45
孙向锦
试卷bug修改
|
1889
1890
1891
|
/**
* 章节递归查询
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1892
1893
1894
1895
1896
1897
1898
|
*
* @param list
* 章节
* @param dept
* 深度
* @param end
* 递归深度
|
2ad7ca45
孙向锦
试卷bug修改
|
1899
1900
1901
1902
1903
|
* @throws Exception
*/
private void roundChapterData(List<PageData> list, int dept, int end)
throws Exception {
if (list != null) {
|
ce70231e
孙向锦
增加接口
|
1904
1905
|
for (PageData pd : list) {
pd.put("P_ID", pd.getString("ID"));
|
2ad7ca45
孙向锦
试卷bug修改
|
1906
1907
1908
1909
1910
1911
1912
1913
|
if (dept < end) {
if (pd.getString("P_ID") != null
&& !"".equals(pd.getString("P_ID"))) {
List<PageData> ret = chapterService.listAllChapter(pd);
if (ret != null && ret.size() > 0) {
roundChapterData(ret, dept + 1, end);
pd.put("CHILDREN", ret);
}
|
ce70231e
孙向锦
增加接口
|
1914
1915
1916
|
}
}
pd.remove("P_ID");
|
2ad7ca45
孙向锦
试卷bug修改
|
1917
|
pd.remove("TEACHINGMATERIAL_ID");
|
ce70231e
孙向锦
增加接口
|
1918
1919
1920
1921
|
}
}
}
|
2ad7ca45
孙向锦
试卷bug修改
|
1922
|
/**
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
1923
1924
|
* 下载测验成绩
*
|
2ad7ca45
孙向锦
试卷bug修改
|
1925
1926
|
* @return
*/
|
91a745c9
孙向锦
完善后台功能
|
1927
1928
1929
|
@RequestMapping(value = "/downloadtestpaper", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object downloadTestpaper() {
|
3371dbc6
孙向锦
0720 版本
|
1930
|
event("downloadTestpaper");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
1931
|
long cur = System.currentTimeMillis();
|
91a745c9
孙向锦
完善后台功能
|
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
|
PageData pd = this.getPageData();
ResponseGson<TestPaper> res = new ResponseGson();
String paperId = pd.getString("ID");
if (!StringUtils.isEmpty(paperId)) {
TestPaper testPaper = new TestPaper();
try {
pd.put("TESTPAPER_ID", paperId);
PageData testPd = testpaperService.findById(pd);
if (testPd != null) {
testPaper.setTestpaperId(paperId);
testPaper.setTeacherId(testPd.getString("TEACHER_ID"));
testPaper.setName(testPd.getString("NAME"));
testPaper.setPaperId(testPd.getString("PAPER_ID"));
testPaper.setClassId(testPd.getString("SCLASS_ID"));
testPaper.setStartDate(testPd.getString("START_DATE"));
testPaper.setEndDate(testPd.getString("END_DATE"));
testPaper.setCreateDate(testPd.getString("CREATE_DATE"));
testPaper.setOtherScore(testPd.getString("OTHER_SCORE"));
testPaper.setHighScore(testPd.getString("HIGHT_SCORE"));
testPaper.setLowScore(testPd.getString("LOW_SCORE"));
testPaper.setAvgScore(testPd.getString("AVG_SCORE"));
testPaper.setRemark(testPd.getString("REMARK"));
PageData testInfof = new PageData();
testInfof.put("TEST_ID", paperId);
List<PageData> studentList = studenttestService
.listAll(testInfof);
for (PageData sPageData : studentList) {
StudentAnswer studentAnswer = new StudentAnswer();
testInfof.put("STDUENT_ID",
sPageData.getString("STDUENT_ID"));
studentAnswer.setScore(sPageData.getString("SCORE"));
List<PageData> list = testpaperinfoService
.listAll(testInfof);
for (PageData testInfoPd : list) {
TestPaperInfo testPaperInfo = new TestPaperInfo();
testPaperInfo.setTestPaperInfoId(testInfoPd
.getString("TESTPAPERINFO_ID"));
testPaperInfo.setQuestionId(testInfoPd
.getString("QUESTION_ID"));
testPaperInfo.setAnswer(testInfoPd
.getString("ANSWER"));
testPaperInfo.setRight(testInfoPd
.getString("RIGHT"));
testPaperInfo.setScore(testInfoPd
.getString("SCORE"));
testPaperInfo.setLikes(testInfoPd
.getString("LIKES"));
testPaperInfo.setAnswerType(testInfoPd
.getString("ANSWER_TYPE"));
testPaperInfo.setPressTime(testInfoPd
.getString("PRESS_TIME"));
testPaperInfo.setReceiverDate(testInfoPd
.getString("RECEIVER_DATE"));
testPaperInfo.setSubjective(testInfoPd
.getString("SUBJECTIVE"));
testPaperInfo.setNote(testInfoPd.getString("NOTE"));
testPaperInfo.setMarkNo(testInfoPd
.getString("MARK_NO"));
testPaperInfo.setRank(testInfoPd.getString("RANK"));
studentAnswer.getQuestions().add(testPaperInfo);
}
testPaper.getStudents().add(studentAnswer);
}
}
res.setData(testPaper);
} catch (Exception e) {
e.printStackTrace();
res.setError();
}
}
|
ce70231e
孙向锦
增加接口
|
2007
2008
|
logger.info("downloadtestpaper cost time:"
+ (System.currentTimeMillis() - cur));
|
338594c8
孙向锦
添加教师端页面
|
2009
|
return res.toJson();
|
91a745c9
孙向锦
完善后台功能
|
2010
|
|
338594c8
孙向锦
添加教师端页面
|
2011
2012
|
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2013
2014
|
/**
*
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2015
2016
|
* 下载测验成绩
*
|
2ad7ca45
孙向锦
试卷bug修改
|
2017
2018
|
* @return
*/
|
91a745c9
孙向锦
完善后台功能
|
2019
2020
2021
|
@RequestMapping(value = "/testpaper", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object testpaper() {
|
3371dbc6
孙向锦
0720 版本
|
2022
|
event("testpaper");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2023
|
long cur = System.currentTimeMillis();
|
91a745c9
孙向锦
完善后台功能
|
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
|
PageData pd = this.getPageData();
ResponseGson<List<TestPaper>> res = new ResponseGson();
pd.put("TEACHER_ID", pd.getString("USER_ID"));
try {
List<PageData> pageList = testpaperService.listAll(pd);
List<TestPaper> list = new ArrayList<TestPaper>();
if (pageList != null) {
for (PageData testPd : pageList) {
TestPaper testPaper = new TestPaper();
testPaper.setTestpaperId(testPd.getString("TESTPAPER_ID"));
testPaper.setTeacherId(testPd.getString("TEACHER_ID"));
testPaper.setName(testPd.getString("NAME"));
testPaper.setPaperId(testPd.getString("PAPER_ID"));
testPaper.setClassId(testPd.getString("SCLASS_ID"));
testPaper.setStartDate(testPd.getString("START_DATE"));
testPaper.setEndDate(testPd.getString("END_DATE"));
testPaper.setCreateDate(testPd.getString("CREATE_DATE"));
testPaper.setOtherScore(testPd.getString("OTHER_SCORE"));
testPaper.setHighScore(testPd.getString("HIGHT_SCORE"));
testPaper.setLowScore(testPd.getString("LOW_SCORE"));
testPaper.setAvgScore(testPd.getString("AVG_SCORE"));
testPaper.setRemark(testPd.getString("REMARK"));
list.add(testPaper);
}
}
res.setData(list);
} catch (Exception e) {
res.setError();
res.setMessage(e.getMessage());
e.printStackTrace();
}
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2055
|
logger.info("testpaper cost time:" + (System.currentTimeMillis() - cur));
|
91a745c9
孙向锦
完善后台功能
|
2056
2057
2058
|
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
2059
|
|
2ad7ca45
孙向锦
试卷bug修改
|
2060
2061
2062
|
/***
*
*/
|
4fd2e08c
孙向锦
修复接口中的bug
|
2063
2064
|
@RequestMapping(value = "/schooladmin", produces = "application/json;charset=UTF-8")
@ResponseBody
|
ce70231e
孙向锦
增加接口
|
2065
|
public void schoolAdmin() {
|
3371dbc6
孙向锦
0720 版本
|
2066
|
event("schoolAdmin");
|
4fd2e08c
孙向锦
修复接口中的bug
|
2067
2068
|
PageData pd = this.getPageData();
this.getUserID();
|
4fd2e08c
孙向锦
修复接口中的bug
|
2069
|
}
|
ce70231e
孙向锦
增加接口
|
2070
|
|
2ad7ca45
孙向锦
试卷bug修改
|
2071
2072
|
/***
* 网络
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2073
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
2074
2075
2076
|
* @return
* @throws Exception
*/
|
9338b563
孙向锦
添加报表
|
2077
2078
|
@RequestMapping(value = "/network", produces = "application/json;charset=UTF-8")
@ResponseBody
|
ce70231e
孙向锦
增加接口
|
2079
|
public Object network() throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
2080
|
event("network");
|
9338b563
孙向锦
添加报表
|
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
|
PageData pd = this.getPageData();
ResponseGson<PageData> res = new ResponseGson();
PageData spd = networkstatisticsService.findByClientID(pd);
String seqStr = pd.getString("SEQ");
if (seqStr != null && pd.getString("CLIENT_ID") != null
&& pd.getString("SESSION_ID") != null) {
int seq = Integer.parseInt(seqStr);
if (spd != null) {
int successCount = Integer.parseInt(spd
.getString("SUCCESS_COUNT"));
spd.put("SUCCESS_COUNT", ++successCount + "");
int fail = seq - successCount;
|
ce70231e
孙向锦
增加接口
|
2093
|
if (fail < 0) {
|
9338b563
孙向锦
添加报表
|
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
|
fail = 0;
}
spd.put("FAIL_COUNT", fail + "");
networkstatisticsService.edit(spd);
spd.remove("NETWORKSTATISTICS_ID");
spd.remove("CLIENT_ID");
spd.remove("SESSION_ID");
res.setData(spd);
} else {
pd.put("NETWORKSTATISTICS_ID", get32UUID());
pd.put("SUCCESS_COUNT", "1");
pd.put("CLIENT_IP", getRemoteIp());
int fail = seq - 1;
|
ce70231e
孙向锦
增加接口
|
2107
|
if (fail < 0) {
|
9338b563
孙向锦
添加报表
|
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
|
fail = 0;
}
pd.put("FAIL_COUNT", fail + "");
networkstatisticsService.save(pd);
pd.remove("JSON");
pd.remove("CLIENT_ID");
pd.remove("SESSION_ID");
pd.remove("SEQ");
pd.remove("NETWORKSTATISTICS_ID");
res.setData(pd);
}
|
ce70231e
孙向锦
增加接口
|
2119
|
} else {
|
9338b563
孙向锦
添加报表
|
2120
2121
2122
2123
|
res.setDataError();
}
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
2124
|
|
2ad7ca45
孙向锦
试卷bug修改
|
2125
2126
|
/**
* 获取远端ip地址
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2127
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
2128
2129
|
* @return
*/
|
ce70231e
孙向锦
增加接口
|
2130
|
public String getRemoteIp() {
|
9338b563
孙向锦
添加报表
|
2131
2132
2133
2134
2135
2136
2137
2138
2139
|
HttpServletRequest request = getRequest();
String ip = "";
if (request.getHeader("x-forwarded-for") == null) {
ip = request.getRemoteAddr();
} else {
ip = request.getHeader("x-forwarded-for");
}
return ip;
}
|
ce70231e
孙向锦
增加接口
|
2140
|
|
2ad7ca45
孙向锦
试卷bug修改
|
2141
2142
|
/**
* 查询新版本信息
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2143
|
*
|
2ad7ca45
孙向锦
试卷bug修改
|
2144
2145
2146
2147
|
* @param request
* @return
* @throws Exception
*/
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2148
2149
|
@RequestMapping(value = "/newversion", produces = "application/json;charset=UTF-8")
@ResponseBody
|
ce70231e
孙向锦
增加接口
|
2150
|
public Object getNewVersion(HttpServletRequest request) throws Exception {
|
3371dbc6
孙向锦
0720 版本
|
2151
|
event("getNewVersion");
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2152
2153
2154
|
PageData pd = this.getPageData();
String softId = pd.getString("SOFTID");
String path = request.getContextPath();
|
ce70231e
孙向锦
增加接口
|
2155
2156
|
String basePath = request.getScheme() + "://" + request.getServerName()
+ ":" + request.getServerPort() + path + "/";
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2157
|
ResponseGson<PageData> res = new ResponseGson();
|
ce70231e
孙向锦
增加接口
|
2158
|
if (softId != null && !"".equals(softId)) {
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2159
2160
|
pd.put("SOFTWARE_ID", softId);
PageData result = softwareversionService.findNewVersion(pd);
|
ce70231e
孙向锦
增加接口
|
2161
|
if (result != null) {
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2162
2163
|
result.remove("SOFTWAREVERSION_ID");
result.remove("SOFTWARE_ID");
|
ce70231e
孙向锦
增加接口
|
2164
2165
|
result.put("VERSION_PATH", basePath + "uploadFiles/uploadFile/"
+ result.getString("VERSION_PATH"));
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2166
|
res.setData(result);
|
ce70231e
孙向锦
增加接口
|
2167
|
} else {
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2168
2169
|
res.setDataError();
}
|
ce70231e
孙向锦
增加接口
|
2170
|
} else {
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2171
2172
2173
2174
|
res.setDataError();
}
return res.toJson();
}
|
ce70231e
孙向锦
增加接口
|
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
|
/**
* 获取教材版本
*
* @return
* @throws Exception
*/
@RequestMapping(value = "/teachingmaterial", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object teachingmaterial() throws Exception {
PageData pd = getPageData();
ResponseGson<List<PageData>> ret = new ResponseGson<List<PageData>>();
List<PageData> lpd = new ArrayList<PageData>();
List<PageData> list = teachingmaterialService.listAll(pd);
String subjectID = pd.getString("SUBJECT_ID");
if (subjectID != null && !"".equals(subjectID)) {
for (PageData pad : list) {
String subis = pad.getString("SUBJECT_ID");
if (subis != null) {
String[] subs = subis.split(",");
if (subs != null) {
for (String sub : subs) {
if (subjectID.trim().equals(sub.trim())) {
pad.remove("SUBJECT_ID");
|
2ad7ca45
孙向锦
试卷bug修改
|
2199
2200
|
pad.put("VERSION_CODE",
pad.getString("VERSION_CODE"));
|
ce70231e
孙向锦
增加接口
|
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
|
lpd.add(pad);
break;
}
}
}
}
}
} else {
for (PageData pad : list) {
pad.remove("SUBJECT_ID");
pad.put("VERSION_CODE", pad.getString("VERSION_CODE"));
lpd.add(pad);
}
}
ret.setData(lpd);
return ret.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2218
|
|
c617106f
孙向锦
添加即时测功能
|
2219
2220
2221
2222
2223
2224
2225
2226
2227
|
@RequestMapping(value = "/textbook", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object textbook() throws Exception {
PageData pd = getPageData();
ResponseGson<List<PageData>> ret = new ResponseGson<List<PageData>>();
List<PageData> list = textbookService.listAll(pd);
ret.setData(list);
return ret.toJson();
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2228
|
|
ce70231e
孙向锦
增加接口
|
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
|
/**
* 获取教材版本
*
* @return
* @throws Exception
*/
@RequestMapping(value = "/chapter", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object chapter() throws Exception {
PageData pd = getPageData();
|
2ad7ca45
孙向锦
试卷bug修改
|
2239
|
String key = this.getRequestKey(pd, "chapter");
|
ce70231e
孙向锦
增加接口
|
2240
2241
|
PageData pagedata = new PageData();
pagedata.put("KEY", key);
|
2ad7ca45
孙向锦
试卷bug修改
|
2242
|
if (!"".equals(key.trim())) {
|
ce70231e
孙向锦
增加接口
|
2243
|
PageData ret = cacheService.findById(pagedata);
|
2ad7ca45
孙向锦
试卷bug修改
|
2244
|
if (ret != null && ret.get("CACHE") != null) {
|
ce70231e
孙向锦
增加接口
|
2245
2246
2247
2248
2249
2250
|
return ret.get("CACHE");
}
}
ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
List<PageData> list = chapterService.listAllChapter(pd);
String depth = pd.getString("DEPTH");
|
2ad7ca45
孙向锦
试卷bug修改
|
2251
2252
2253
|
int end = 3;
if (depth != null) {
try {
|
ce70231e
孙向锦
增加接口
|
2254
|
end = Integer.parseInt(depth);
|
2ad7ca45
孙向锦
试卷bug修改
|
2255
2256
|
} catch (Exception e) {
|
ce70231e
孙向锦
增加接口
|
2257
2258
|
}
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2259
|
roundChapterData(list, 1, end);
|
ce70231e
孙向锦
增加接口
|
2260
2261
|
res.setData(list);
String str = res.toJson();
|
ce70231e
孙向锦
增加接口
|
2262
2263
2264
2265
|
pagedata.put("CACHE", str);
cacheService.save(pagedata);
return str;
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2266
|
|
ce70231e
孙向锦
增加接口
|
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
|
/**
* 获取试题
*
* @return
* @throws Exception
*/
@RequestMapping(value = "/questions", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object questions() throws Exception {
PageData pd = getPageData();
ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
String teachingmaterialId = pd.getString("TEACHINGMATERIAL_ID");
String chapterId = pd.getString("CHAPTER_ID");
|
2ad7ca45
孙向锦
试卷bug修改
|
2280
2281
|
if (teachingmaterialId != null && !teachingmaterialId.equals("")
&& chapterId == null) {
|
ce70231e
孙向锦
增加接口
|
2282
2283
|
PageData chapterPd = new PageData();
chapterPd.put("TEACHINGMATERIAL_ID", teachingmaterialId);
|
2ad7ca45
孙向锦
试卷bug修改
|
2284
2285
|
List<PageData> chapterList = chapterService
.listAllChapter(chapterPd);
|
ce70231e
孙向锦
增加接口
|
2286
|
roundChapterData(chapterList, 1, 3);
|
2ad7ca45
孙向锦
试卷bug修改
|
2287
|
List<String> ids = getIds(chapterList, "ID");
|
ce70231e
孙向锦
增加接口
|
2288
|
pd.put("CHAPTER_IDS", ids);
|
2ad7ca45
孙向锦
试卷bug修改
|
2289
|
} else {
|
ce70231e
孙向锦
增加接口
|
2290
|
List<String> ids = new ArrayList<String>();
|
2ad7ca45
孙向锦
试卷bug修改
|
2291
|
if (chapterId != null && !"".equals(chapterId.trim())) {
|
ce70231e
孙向锦
增加接口
|
2292
2293
2294
2295
2296
2297
|
ids.add(chapterId);
}
pd.put("CHAPTER_IDS", ids);
}
pd.remove("CHAPTER_ID");
String knowledge = pd.getString("KNOWLEDGE_ID");
|
2ad7ca45
孙向锦
试卷bug修改
|
2298
|
if (knowledge != null && !"".equals(knowledge.trim())) {
|
ce70231e
孙向锦
增加接口
|
2299
2300
2301
2302
|
PageData knowPd = new PageData();
knowPd.put("P_ID", knowledge);
List<PageData> knowlist = knowledgeService.listAllknowledge(knowPd);
roundPointData(knowlist, 1, 3);
|
2ad7ca45
孙向锦
试卷bug修改
|
2303
|
List<String> ids = getIds(knowlist, "KNOWLEDGE_ID");
|
ce70231e
孙向锦
增加接口
|
2304
|
ids.add(knowledge);
|
2ad7ca45
孙向锦
试卷bug修改
|
2305
|
pd.put("KNOWLEDGE_IDS", ids);
|
ce70231e
孙向锦
增加接口
|
2306
2307
|
pd.remove("KNOWLEDGE_ID");
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2308
2309
|
int pageNumI = 0;
int count = 30;
|
0aad4b6b
孙向锦
修复试题分页功能
|
2310
2311
|
String pageNum = pd.getString("PAGENUM");
String countStr = pd.getString("COUNT");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2312
2313
|
if (pageNum != null && !"".equals(pageNum) && countStr != null
&& !"".equals(countStr)) {
|
0aad4b6b
孙向锦
修复试题分页功能
|
2314
2315
|
pageNumI = Integer.parseInt(pageNum);
count = Integer.parseInt(countStr);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2316
2317
2318
2319
|
if (pageNumI >= 1) {
pageNumI = (pageNumI - 1) * count;
} else {
pageNumI = 0;
|
0aad4b6b
孙向锦
修复试题分页功能
|
2320
2321
2322
2323
|
}
pd.put("PAGENUM", "" + pageNumI);
pd.put("COUNT", "" + count);
}
|
ce70231e
孙向锦
增加接口
|
2324
|
List<PageData> list = questionService.listAllquestion(pd);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2325
|
for (PageData pad : list) {
|
c617106f
孙向锦
添加即时测功能
|
2326
|
String optionContent = pad.getString("OPTION_CONTENT");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2327
2328
2329
2330
|
if (optionContent != null && optionContent.startsWith("[")
&& optionContent.endsWith("]")) {
String[] options = optionContent.substring(1,
optionContent.length() - 1).split(",");
|
c617106f
孙向锦
添加即时测功能
|
2331
|
pad.put("OPTION_CONTENT", options);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2332
2333
|
} else {
pad.put("OPTION_CONTENT", new String[] { optionContent });
|
c617106f
孙向锦
添加即时测功能
|
2334
2335
|
}
}
|
ce70231e
孙向锦
增加接口
|
2336
2337
2338
|
res.setData(list);
return res.toJson();
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2339
|
|
ce70231e
孙向锦
增加接口
|
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
|
/**
* 随机获取试题
*
* @return
* @throws Exception
*/
@RequestMapping(value = "/randquestions", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object randquestions() throws Exception {
PageData pd = getPageData();
ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
String teachingmaterialId = pd.getString("TEACHINGMATERIAL_ID");
String chapterId = pd.getString("CHAPTER_ID");
|
2ad7ca45
孙向锦
试卷bug修改
|
2353
2354
|
if (teachingmaterialId != null && !teachingmaterialId.equals("")
&& chapterId == null) {
|
ce70231e
孙向锦
增加接口
|
2355
2356
|
PageData chapterPd = new PageData();
chapterPd.put("TEACHINGMATERIAL_ID", teachingmaterialId);
|
2ad7ca45
孙向锦
试卷bug修改
|
2357
2358
|
List<PageData> chapterList = chapterService
.listAllChapter(chapterPd);
|
ce70231e
孙向锦
增加接口
|
2359
|
roundChapterData(chapterList, 1, 3);
|
2ad7ca45
孙向锦
试卷bug修改
|
2360
|
List<String> ids = getIds(chapterList, "ID");
|
ce70231e
孙向锦
增加接口
|
2361
|
pd.put("CHAPTER_IDS", ids);
|
2ad7ca45
孙向锦
试卷bug修改
|
2362
|
} else {
|
ce70231e
孙向锦
增加接口
|
2363
|
List<String> ids = new ArrayList<String>();
|
2ad7ca45
孙向锦
试卷bug修改
|
2364
|
if (chapterId != null && !"".equals(chapterId.trim())) {
|
ce70231e
孙向锦
增加接口
|
2365
2366
2367
2368
2369
2370
|
ids.add(chapterId);
}
pd.put("CHAPTER_IDS", ids);
}
pd.remove("CHAPTER_ID");
String knowledge = pd.getString("KNOWLEDGE_ID");
|
2ad7ca45
孙向锦
试卷bug修改
|
2371
|
if (knowledge != null && !"".equals(knowledge.trim())) {
|
ce70231e
孙向锦
增加接口
|
2372
2373
2374
2375
|
PageData knowPd = new PageData();
knowPd.put("P_ID", knowledge);
List<PageData> knowlist = knowledgeService.listAllknowledge(knowPd);
roundPointData(knowlist, 1, 3);
|
2ad7ca45
孙向锦
试卷bug修改
|
2376
|
List<String> ids = getIds(knowlist, "KNOWLEDGE_ID");
|
ce70231e
孙向锦
增加接口
|
2377
|
ids.add(knowledge);
|
2ad7ca45
孙向锦
试卷bug修改
|
2378
|
pd.put("KNOWLEDGE_IDS", ids);
|
ce70231e
孙向锦
增加接口
|
2379
2380
2381
|
pd.remove("KNOWLEDGE_ID");
}
List<PageData> list = questionService.listAllRandquestion(pd);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2382
|
for (PageData pad : list) {
|
c617106f
孙向锦
添加即时测功能
|
2383
|
String optionContent = pad.getString("OPTION_CONTENT");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2384
2385
2386
2387
|
if (optionContent != null && optionContent.startsWith("[")
&& optionContent.endsWith("]")) {
String[] options = optionContent.substring(1,
optionContent.length() - 1).split(",");
|
c617106f
孙向锦
添加即时测功能
|
2388
|
pad.put("OPTION_CONTENT", options);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2389
2390
|
} else {
pad.put("OPTION_CONTENT", new String[] { optionContent });
|
c617106f
孙向锦
添加即时测功能
|
2391
2392
|
}
}
|
ce70231e
孙向锦
增加接口
|
2393
2394
2395
|
res.setData(list);
return res.toJson();
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2396
2397
2398
2399
2400
2401
2402
2403
|
/**
*
* @param chapterList
* @param key
* @return
*/
public List<String> getIds(List<PageData> chapterList, String key) {
|
ce70231e
孙向锦
增加接口
|
2404
|
List<String> ids = new ArrayList<String>();
|
2ad7ca45
孙向锦
试卷bug修改
|
2405
2406
|
if (chapterList != null && chapterList.size() > 0) {
for (PageData pd : chapterList) {
|
ce70231e
孙向锦
增加接口
|
2407
|
String chapterid = pd.getString(key);
|
2ad7ca45
孙向锦
试卷bug修改
|
2408
|
if (chapterid != null && !"".equals(chapterid)) {
|
ce70231e
孙向锦
增加接口
|
2409
2410
2411
|
ids.add(chapterid);
}
Object obj = pd.get("CHILDREN");
|
2ad7ca45
孙向锦
试卷bug修改
|
2412
|
if (obj != null && (obj instanceof List)) {
|
ce70231e
孙向锦
增加接口
|
2413
|
@SuppressWarnings("unchecked")
|
2ad7ca45
孙向锦
试卷bug修改
|
2414
2415
2416
|
List<PageData> list = (List<PageData>) obj;
List<String> ret = getIds(list, key);
if (ret != null && ret.size() > 0) {
|
ce70231e
孙向锦
增加接口
|
2417
2418
2419
2420
2421
|
ids.addAll(ret);
}
}
}
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2422
|
|
ce70231e
孙向锦
增加接口
|
2423
|
return ids;
|
2ad7ca45
孙向锦
试卷bug修改
|
2424
|
|
ce70231e
孙向锦
增加接口
|
2425
2426
|
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2427
2428
2429
2430
2431
|
/**
*
* @return
* @throws Exception
*/
|
d3d7b2ca
孙向锦
修改表格固定
|
2432
2433
|
@RequestMapping(value = "/tempcreateUser", produces = "application/json;charset=UTF-8")
@ResponseBody
|
ce70231e
孙向锦
增加接口
|
2434
|
public Object tempCreateUser() throws Exception {
|
d3d7b2ca
孙向锦
修改表格固定
|
2435
2436
2437
2438
|
PageData pd = new PageData();
pd = this.getPageData();
pd.put("ID", this.get32UUID());
teacherService.save(pd);
|
ce70231e
孙向锦
增加接口
|
2439
2440
2441
2442
|
pd.put("USER_ID", pd.getString("ID")); // ID 主键
pd.put("LAST_LOGIN", ""); // 最后登录时间
pd.put("IP", ""); // IP
pd.put("STATUS", "0"); // 状态
|
d3d7b2ca
孙向锦
修改表格固定
|
2443
|
pd.put("SKIN", "default");
|
ce70231e
孙向锦
增加接口
|
2444
|
pd.put("RIGHTS", "");
|
d3d7b2ca
孙向锦
修改表格固定
|
2445
|
pd.put("USERNAME", pd.getString("ACCOUT"));
|
ce70231e
孙向锦
增加接口
|
2446
2447
2448
2449
2450
2451
2452
|
pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
pd.put("PASSWORD",
new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
.getString("PASSWORD")).toString()); // 密码加密
if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
userService.saveU(pd); // 执行保存
|
d3d7b2ca
孙向锦
修改表格固定
|
2453
|
}
|
ce70231e
孙向锦
增加接口
|
2454
2455
2456
|
// ID, TEACHER_ID, CLASS_ID, SUBJECT_ID, START_DATE, END_DATE, GRADE_ID,
// TERM_ID, REMARK
|
d3d7b2ca
孙向锦
修改表格固定
|
2457
2458
2459
2460
|
pd.put("TEACHER_ID", pd.get("ID"));
pd.put("CLASS_ID", "bc33389101ec46e6b7d47daa8adf58ac");
pd.put("SUBJECT_ID", "1");
pd.put("GRADE_ID", "1");
|
ce70231e
孙向锦
增加接口
|
2461
|
pd.put("TERM_ID", "0d8ea2efdef74accbd0d00e9bc07dfbb");
|
d3d7b2ca
孙向锦
修改表格固定
|
2462
|
coursemanagementService.save(pd);
|
ce70231e
孙向锦
增加接口
|
2463
|
|
d3d7b2ca
孙向锦
修改表格固定
|
2464
2465
|
return "{'res':'success'}";
}
|
2480c889
孙向锦
添加软件管理模块。对软件形成统一的管理
|
2466
|
|
2ad7ca45
孙向锦
试卷bug修改
|
2467
2468
2469
2470
|
/**
*
* @param apiName
*/
|
ce70231e
孙向锦
增加接口
|
2471
|
private void event(String apiName) {
|
3371dbc6
孙向锦
0720 版本
|
2472
2473
2474
2475
|
PageData eventPd = new PageData();
eventPd.put("EVENT_ID", get32UUID());
eventPd.put("EVENT_NAME", apiName);
eventPd.put("EVENT_USER", getUsername());
|
67dfaf5c
孙向锦
提交代码
|
2476
|
eventPd.put("EVENT_TYPE", "-1");
|
3371dbc6
孙向锦
0720 版本
|
2477
2478
2479
|
eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
eventPd.put("CLIENT_ID", "SERVER");
eventPd.put("EVENT_IP", getRemoteIp());
|
ce70231e
孙向锦
增加接口
|
2480
|
try {
|
3371dbc6
孙向锦
0720 版本
|
2481
|
eventService.save(eventPd);
|
ce70231e
孙向锦
增加接口
|
2482
2483
2484
2485
2486
2487
2488
|
} catch (Exception e) {
}
}
static int index = 0;
|
2ad7ca45
孙向锦
试卷bug修改
|
2489
2490
2491
2492
2493
|
/**
*
* @param point
* @param pid
*/
|
ce70231e
孙向锦
增加接口
|
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
|
private void savePoint(Point point, String pid) {
List<Point> children = point.getChildren();
if (children != null && children.size() > 0) {
for (Point p : children) {
savePoint(p, point.getCode());
}
}
PageData pageData = new PageData();
pageData.put("KNOWLEDGE_ID", point.getCode());
pageData.put("NAME", point.getName());
pageData.put("P_ID", pid);
pageData.put("RANK", ++index);
try {
knowledgeService.save(pageData);
} catch (Exception e) {
e.printStackTrace();
}
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2513
2514
2515
2516
2517
|
/**
*
* @return
* @throws Exception
*/
|
ce70231e
孙向锦
增加接口
|
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
|
@RequestMapping(value = "/uploadbook", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object uploadbook() throws Exception {
event("uploadbook");
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<String> res = new ResponseGson();
if (!StringUtils.isEmpty(pd.getJsonString())) {
try {
ResponseGson<List<Point>> req = ResponseGson.parse(
pd.getJsonString(), Point.class);
List<Point> list = req.getData();
if (list != null && list.size() > 0) {
for (Point point : list) {
saveBook(point);
}
}
} catch (Exception e) {
res.setError();
}
} else {
res.setDataError();
}
logger.info("uploadpoint cost time : "
+ (System.currentTimeMillis() - cur));
return res.toJson();
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2547
2548
2549
2550
|
/**
*
* @param point
*/
|
ce70231e
孙向锦
增加接口
|
2551
2552
2553
2554
2555
2556
2557
2558
2559
|
private void saveBook(Point point) {
PageData pd = new PageData();
pd.put("ID", point.getCode());
pd.put("NAME", point.getName());
pd.put("SUBJECT_ID", point.getSubjectCode());
try {
teachingmaterialService.save(pd);
} catch (Exception e) {
|
ce70231e
孙向锦
增加接口
|
2560
2561
2562
|
e.printStackTrace();
}
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2563
2564
2565
2566
2567
2568
|
/**
*
* @return
* @throws Exception
*/
|
ce70231e
孙向锦
增加接口
|
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
|
@RequestMapping(value = "/uploadyuncelianquestion", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object uploadyuncelianquestion() throws Exception {
event("uploadyuncelianquestion");
long cur = System.currentTimeMillis();
PageData pd = this.getPageData();
ResponseGson<Object> res = new ResponseGson();
if (!StringUtils.isEmpty(pd.getJsonString())) {
try {
|
2ad7ca45
孙向锦
试卷bug修改
|
2579
2580
|
ResponseGson<Object> req = ResponseGson.parse(pd
.getJsonString());
|
ce70231e
孙向锦
增加接口
|
2581
|
Object data = req.getData();
|
2ad7ca45
孙向锦
试卷bug修改
|
2582
2583
2584
2585
2586
2587
|
if (data instanceof List) {
List<Object> list = (List) data;
for (Object obj : list) {
if (obj instanceof Map) {
Map map = (Map) obj;
|
ce70231e
孙向锦
增加接口
|
2588
2589
2590
|
PageData pageData = new PageData();
pageData.put("QUESTION_ID", map.get("id"));
Object cateObj = map.get("cate");
|
2ad7ca45
孙向锦
试卷bug修改
|
2591
|
if (cateObj != null) {
|
ce70231e
孙向锦
增加接口
|
2592
2593
|
String cate = cateObj.toString();
float catef = Float.parseFloat(cate);
|
2ad7ca45
孙向锦
试卷bug修改
|
2594
|
pageData.put("QUESTION_TYPE_ID", (int) catef);
|
ce70231e
孙向锦
增加接口
|
2595
2596
|
}
Object contentObj = map.get("content");
|
2ad7ca45
孙向锦
试卷bug修改
|
2597
|
if (contentObj != null) {
|
ce70231e
孙向锦
增加接口
|
2598
2599
2600
2601
2602
|
String content = contentObj.toString();
content = replaceWebUrl(content);
pageData.put("CONTENT", content);
}
Object subjectCodeObj = map.get("subjectCode");
|
2ad7ca45
孙向锦
试卷bug修改
|
2603
|
if (subjectCodeObj != null) {
|
ce70231e
孙向锦
增加接口
|
2604
|
String subjectCode = subjectCodeObj.toString();
|
2ad7ca45
孙向锦
试卷bug修改
|
2605
|
pageData.put("SUBJECT_ID", subjectCode);
|
ce70231e
孙向锦
增加接口
|
2606
2607
|
}
Object optionsObj = map.get("options");
|
2ad7ca45
孙向锦
试卷bug修改
|
2608
2609
2610
2611
|
if (optionsObj instanceof List) {
List ss = (List) optionsObj;
pageData.put("OPTION_CONTENT",
optionsObj.toString());
|
ce70231e
孙向锦
增加接口
|
2612
2613
2614
|
pageData.put("OPTION_NUM", "" + ss.size());
}
Object answersObj = map.get("answers");
|
2ad7ca45
孙向锦
试卷bug修改
|
2615
2616
|
if (answersObj instanceof List) {
List answers = (List) answersObj;
|
ce70231e
孙向锦
增加接口
|
2617
|
StringBuilder sb = new StringBuilder();
|
2ad7ca45
孙向锦
试卷bug修改
|
2618
|
for (Object as : answers) {
|
ce70231e
孙向锦
增加接口
|
2619
2620
2621
2622
|
sb.append(as.toString());
}
pageData.put("ANSWER", sb.toString());
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2623
2624
|
Object difficulty = map.get("difficulty");
try {
|
ce70231e
孙向锦
增加接口
|
2625
2626
2627
2628
2629
2630
|
if (difficulty != null) {
float fdifficulty = Float
.parseFloat(difficulty.toString());
pageData.put("DIFFICULTY",
(int) fdifficulty);
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2631
|
} catch (Exception ex) {
|
ce70231e
孙向锦
增加接口
|
2632
2633
2634
|
ex.printStackTrace();
}
Object discussObj = map.get("discuss");
|
2ad7ca45
孙向锦
试卷bug修改
|
2635
|
if (discussObj != null) {
|
ce70231e
孙向锦
增加接口
|
2636
2637
2638
2639
2640
|
String discuss = discussObj.toString();
discuss = replaceWebUrl(discuss);
pageData.put("REMARK", discuss);
}
Object analyseObj = map.get("analyse");
|
2ad7ca45
孙向锦
试卷bug修改
|
2641
|
if (analyseObj != null) {
|
ce70231e
孙向锦
增加接口
|
2642
2643
2644
2645
2646
|
String analyse = analyseObj.toString();
analyse = replaceWebUrl(analyse);
pageData.put("ANALYSIS", analyse);
}
Object methodObj = map.get("method");
|
2ad7ca45
孙向锦
试卷bug修改
|
2647
|
if (methodObj != null) {
|
ce70231e
孙向锦
增加接口
|
2648
2649
2650
2651
2652
2653
|
String method = methodObj.toString();
method = replaceWebUrl(method);
pageData.put("METHOD", method);
}
Object points = map.get("points");
StringBuilder sb = new StringBuilder();
|
2ad7ca45
孙向锦
试卷bug修改
|
2654
2655
2656
2657
2658
|
if (points instanceof List) {
List pointsList = (List) points;
for (Object pObject : pointsList) {
if (pObject instanceof Map) {
Map pMap = (Map) pObject;
|
ce70231e
孙向锦
增加接口
|
2659
2660
2661
|
sb.append(pMap.get("code")).append(",");
}
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2662
2663
|
if (sb.toString().length() > 1) {
|
ce70231e
孙向锦
增加接口
|
2664
2665
2666
2667
2668
|
sb.deleteCharAt(sb.length() - 1);
}
pageData.put("KNOWLEDGE_ID", sb.toString());
}
pageData.put("QUESTION_FROM", "101");
|
2ad7ca45
孙向锦
试卷bug修改
|
2669
|
try {
|
ce70231e
孙向锦
增加接口
|
2670
|
questionService.save(pageData);
|
2ad7ca45
孙向锦
试卷bug修改
|
2671
2672
|
} catch (Exception e) {
logger.error("save fail:" + map.get("id"), e);
|
ce70231e
孙向锦
增加接口
|
2673
2674
2675
2676
2677
2678
2679
2680
2681
|
}
}
}
}
} catch (Exception e) {
res.setError();
}
} else {
res.setDataError();
|
3371dbc6
孙向锦
0720 版本
|
2682
|
}
|
ce70231e
孙向锦
增加接口
|
2683
2684
2685
|
logger.info("uploadyuncelianquestion cost time : "
+ (System.currentTimeMillis() - cur));
return res.toJson();
|
3371dbc6
孙向锦
0720 版本
|
2686
|
}
|
ce70231e
孙向锦
增加接口
|
2687
|
|
2ad7ca45
孙向锦
试卷bug修改
|
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
|
/**
*
* @param content
* @return
*/
private String replaceWebUrl(String content) {
if (content != null) {
content = content.replaceAll(
"http://image.yuncelian.com/1/analysis/",
"http://image.yuncelian.com/1/analysis/");
|
ce70231e
孙向锦
增加接口
|
2698
2699
2700
|
}
return content;
}
|
2ad7ca45
孙向锦
试卷bug修改
|
2701
2702
2703
2704
2705
2706
2707
2708
2709
|
/**
*
* @param pd
* @param methodName
* @return
*/
public String getRequestKey(PageData pd, String methodName) {
StringBuilder key = new StringBuilder();
|
ce70231e
孙向锦
增加接口
|
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
|
key.append(methodName).append("{");
if (pd != null) {
Iterator iterator = pd.keySet().iterator();
while (iterator.hasNext()) {
Object obj = iterator.next();
key.append(obj.toString()).append(":")
.append(pd.get(obj).toString()).append(";");
}
}
key.append("}");
|
2ad7ca45
孙向锦
试卷bug修改
|
2720
|
|
ce70231e
孙向锦
增加接口
|
2721
2722
|
return key.toString();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2723
|
|
c617106f
孙向锦
添加即时测功能
|
2724
2725
|
/**
* 根据ID,获取科目中文名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2726
|
*
|
c617106f
孙向锦
添加即时测功能
|
2727
2728
2729
2730
2731
2732
|
* @param type
* @return
* @throws Exception
*/
@RequestMapping(value = "/subjectename", produces = "application/json;charset=UTF-8")
@ResponseBody
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2733
|
public String findSubjectEName() throws Exception {
|
c617106f
孙向锦
添加即时测功能
|
2734
2735
2736
|
PageData pageData = this.getPageData();
ResponseGson<String> res = new ResponseGson<String>();
pageData = subjectService.findById(pageData);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2737
|
if (pageData != null) {
|
c617106f
孙向锦
添加即时测功能
|
2738
|
res.setData(pageData.getString("ENAME"));
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2739
|
} else {
|
c617106f
孙向锦
添加即时测功能
|
2740
2741
2742
2743
|
res.setDataError();
}
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2744
|
|
c617106f
孙向锦
添加即时测功能
|
2745
2746
|
/**
* 根据ID或者科目英文名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2747
|
*
|
c617106f
孙向锦
添加即时测功能
|
2748
2749
2750
2751
2752
2753
|
* @param type
* @return
* @throws Exception
*/
@RequestMapping(value = "/subjectcname", produces = "application/json;charset=UTF-8")
@ResponseBody
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2754
|
public String findSubjectCName() throws Exception {
|
c617106f
孙向锦
添加即时测功能
|
2755
2756
2757
|
ResponseGson<String> res = new ResponseGson<String>();
PageData pageData = new PageData();
StringBuilder sb = new StringBuilder();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2758
2759
|
String type = this.getPageData().getString("ID");
if (type.contains(",")) {
|
c617106f
孙向锦
添加即时测功能
|
2760
2761
2762
2763
2764
2765
2766
2767
|
String[] types = type.split(",");
for (String t : types) {
pageData.put("ID", t);
pageData = subjectService.findById(pageData);
if (pageData != null) {
sb.append(pageData.getString("CNAME") + "; ");
}
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2768
2769
|
sb.delete(sb.length() - 3, sb.length());
} else {
|
c617106f
孙向锦
添加即时测功能
|
2770
2771
2772
2773
2774
2775
2776
2777
2778
|
pageData.put("ID", type);
pageData = subjectService.findById(pageData);
if (pageData != null) {
sb.append(pageData.getString("CNAME"));
}
}
res.setData(sb.toString());
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2779
|
|
c617106f
孙向锦
添加即时测功能
|
2780
2781
|
/**
* 根据ID班级名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2782
|
*
|
c617106f
孙向锦
添加即时测功能
|
2783
2784
2785
2786
2787
2788
|
* @param id
* @return
* @throws Exception
*/
@RequestMapping(value = "/classname", produces = "application/json;charset=UTF-8")
@ResponseBody
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2789
|
public String findClassName() throws Exception {
|
c617106f
孙向锦
添加即时测功能
|
2790
2791
2792
|
ResponseGson<String> res = new ResponseGson<String>();
PageData pageData = this.getPageData();
pageData = sclassService.findById(pageData);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2793
2794
|
String className = "";
if (pageData != null) {
|
c617106f
孙向锦
添加即时测功能
|
2795
|
className = pageData.getString("CLASS_NAME");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2796
|
} else {
|
c617106f
孙向锦
添加即时测功能
|
2797
2798
2799
2800
|
res.setDataError();
}
res.setData(className);
return res.toJson();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2801
|
|
c617106f
孙向锦
添加即时测功能
|
2802
|
}
|
694fbd54
孙向锦
添加作业管理模块
|
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
|
/**
* 获取作业列表
*
* @param id
* @return
* @throws Exception
*/
@RequestMapping(value = "/listhomework", produces = "application/json;charset=UTF-8")
@ResponseBody
public String listhomework() throws Exception {
ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
PageData pageData = this.getPageData();
|
416902b7
孙向锦
添加课后作业部分API
|
2816
|
List<PageData> list = homeworkService.qlistAll(pageData);
|
694fbd54
孙向锦
添加作业管理模块
|
2817
2818
2819
2820
|
res.setData(list);
return res.toJson();
}
|
416902b7
孙向锦
添加课后作业部分API
|
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
|
/**
* 获取作业详情
*
* @param id
* @return
* @throws Exception
*/
@RequestMapping(value = "/homework", produces = "application/json;charset=UTF-8")
@ResponseBody
public String homework() throws Exception {
ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
PageData pageData = this.getPageData();
List<PageData> list = homeworkproblemService.listProblem(pageData);
for(PageData pd : list){
if(pd.get("P_HOMEWORK_PROBLEM_ID") != null){
List<PageData> childList = homeworkproblemService.listProblem(pd);
pd.put("PROBLEMS", childList);
}
}
res.setData(list);
return res.toJson();
}
/**
* 获取作业详情
*
* @param id
* @return
* @throws Exception
*/
@RequestMapping(value = "/uploadhomework", produces = "application/json;charset=UTF-8")
@ResponseBody
public String uploadhomework() throws Exception {
ResponseGson<String> res = new ResponseGson<String>();
PageData pd = this.getPageData();
if (!StringUtils.isEmpty(pd.getJsonString())) {
res.setData("success");
}
res.setDataError();
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2870
|
|
757dfed6
孙向锦
样例报表
|
2871
2872
|
/**
* 根据ID班级名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2873
|
*
|
757dfed6
孙向锦
样例报表
|
2874
2875
2876
2877
2878
2879
|
* @param id
* @return
* @throws Exception
*/
@RequestMapping(value = "/qstudentinfo", produces = "application/json;charset=UTF-8")
@ResponseBody
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2880
|
public String qstudentinfo() throws Exception {
|
757dfed6
孙向锦
样例报表
|
2881
2882
2883
2884
2885
2886
|
ResponseGson<List<PageData>> res = new ResponseGson();
PageData pageData = this.getPageData();
if (pageData.containsKey("TEST_ID")
&& pageData.containsKey("QUESTION_ID")) {
List<PageData> list = v1Service.getQuestionWrongInfo(pageData);
res.setData(list);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2887
|
} else {
|
757dfed6
孙向锦
样例报表
|
2888
2889
2890
|
res.setDataError();
}
return res.toJson();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2891
|
|
bda221f4
孙向锦
0830版本
|
2892
|
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2893
|
|
bda221f4
孙向锦
0830版本
|
2894
2895
|
/**
* 根据ID班级名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2896
|
*
|
bda221f4
孙向锦
0830版本
|
2897
2898
2899
2900
2901
2902
|
* @param id
* @return
* @throws Exception
*/
@RequestMapping(value = "/wrongquestion", produces = "application/json;charset=UTF-8")
@ResponseBody
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2903
|
public String wrongquestion() throws Exception {
|
bda221f4
孙向锦
0830版本
|
2904
2905
2906
2907
2908
|
ResponseGson<List<PageData>> res = new ResponseGson();
PageData pageData = this.getPageData();
List<PageData> list = v1Service.getLastWrongQuestionInfo(pageData);
res.setData(list);
return res.toJson();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2909
|
|
757dfed6
孙向锦
样例报表
|
2910
|
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2911
|
|
227dbfbb
孙向锦
添加知识点id
|
2912
2913
|
/**
* 根据ID班级名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2914
|
*
|
227dbfbb
孙向锦
添加知识点id
|
2915
2916
2917
2918
2919
2920
|
* @param id
* @return
* @throws Exception
*/
@RequestMapping(value = "/printmsg", produces = "application/json;charset=UTF-8")
@ResponseBody
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2921
|
public String printmsg() throws Exception {
|
227dbfbb
孙向锦
添加知识点id
|
2922
2923
2924
|
ResponseGson<Map> res = new ResponseGson();
res.setData(FileUploadProgressListener.map);
return res.toJson();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2925
|
|
37b828b6
孙向锦
速度监测
|
2926
|
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2927
|
|
37b828b6
孙向锦
速度监测
|
2928
2929
|
/**
* 根据ID班级名称
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2930
|
*
|
37b828b6
孙向锦
速度监测
|
2931
2932
2933
2934
2935
2936
|
* @param id
* @return
* @throws Exception
*/
@RequestMapping(value = "/printresult", produces = "application/json;charset=UTF-8")
@ResponseBody
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2937
|
public String printresult() throws Exception {
|
37b828b6
孙向锦
速度监测
|
2938
2939
2940
|
ResponseGson<Map> res = new ResponseGson();
res.setData(FileUploadProgressListener.result);
return res.toJson();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2941
|
|
227dbfbb
孙向锦
添加知识点id
|
2942
|
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2943
|
|
757dfed6
孙向锦
样例报表
|
2944
2945
|
@RequestMapping(value = "/uploadfile", produces = "application/json;charset=UTF-8")
@ResponseBody
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2946
2947
2948
|
public String uploadFile(
@RequestParam(value = "file", required = false) MultipartFile file,
HttpServletRequest request) throws Exception {
|
757dfed6
孙向锦
样例报表
|
2949
2950
2951
2952
|
ResponseGson<String> res = new ResponseGson<String>();
if (file != null) {
String path = request.getSession().getServletContext()
.getRealPath("/uploadFiles/uploadFile/");
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2953
2954
|
String name = System.currentTimeMillis()
+ file.getOriginalFilename();
|
757dfed6
孙向锦
样例报表
|
2955
2956
2957
|
File pathFile = new File(path);
pathFile.mkdirs();
File saveFile = new File(path + File.separator + name);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2958
|
if (saveFile.exists()) {
|
757dfed6
孙向锦
样例报表
|
2959
2960
2961
2962
2963
|
saveFile.delete();
}
saveFile.createNewFile();
file.transferTo(saveFile);
path = request.getContextPath();
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2964
2965
2966
|
String basePath = request.getScheme() + "://"
+ request.getServerName() + ":" + request.getServerPort()
+ path + "/";
|
757dfed6
孙向锦
样例报表
|
2967
|
res.setData("/uploadFiles/uploadFile/" + name);
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2968
|
} else {
|
757dfed6
孙向锦
样例报表
|
2969
2970
2971
2972
|
res.setDataError();
}
return res.toJson();
}
|
107fa3a0
孙向锦
修改试卷单选多远混合出题
|
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
|
@RequestMapping(value = "/liuqin", produces = "application/json;charset=UTF-8")
@ResponseBody
public String dosunvotedata() /*throws Exception*/ {
PageData pd = new PageData();
pd.put("dbtype", "mysql");
pd.put("username", "root");
pd.put("password", "admin");
pd.put("dbAddress", "120.78.57.84");
pd.put("dbport", "3306");
pd.put("databaseName", "sunvote");
pd.put("dbport", "3306");
List<PageData> resultList = new ArrayList<PageData>();
try {
Connection conn = DbFH.getFHCon(pd);
Statement stmt = conn.createStatement();
ResultSet rs = stmt
.executeQuery("select reportId,paperName,createTime,paperScore,classAverage,className from t_report where userId = '4000001' and className = 'G205' ");
while (rs.next()) {
PageData coloumData = new PageData();
String reportId = rs.getString("reportId");
coloumData.put("PAPER_ID", reportId);
coloumData.put("TESTPAPER_ID", reportId);
coloumData.put("NAME", rs.getString("paperName"));
coloumData.put("START_DATE", rs.getString("createTime"));
coloumData.put("END_DATE", rs.getString("createTime"));
coloumData.put("CREATE_DATE", rs.getString("createTime"));
coloumData.put("REMARK", rs.getString("paperScore"));
coloumData.put("TOTAL_SCORE", rs.getString("paperScore"));
coloumData.put("AVG_SCORE", rs.getString("classAverage"));
String className = rs.getString("className");
if ("G201".equals(className)) {
coloumData.put("SCLASS_ID",
"2af1ca03c40c4acab7b7d0f8243c9849");
}
if ("G202".equals(className)) {
coloumData.put("SCLASS_ID",
"49f1b14d10424bb6abc8aed56a4693cf");
}
if ("G203".equals(className)) {
coloumData.put("SCLASS_ID",
"80b5dde0138b405bb2bcfc5f33bad649");
}
if ("G204".equals(className)) {
coloumData.put("SCLASS_ID",
"f9de4a939ec54d7ba27d1248279a2f95");
}
if ("G205".equals(className)) {
coloumData.put("SCLASS_ID",
"0f10ce0a3bf146769213c49825c35feb");
}
if ("G206".equals(className)) {
coloumData.put("SCLASS_ID",
"d33edcd7a0f74ca9a0e92ebda9442869");
}
if ("G207".equals(className)) {
coloumData.put("SCLASS_ID",
"ffef54ef21c64525831f266b6fae34fc");
}
coloumData
.put("TEACHER_ID", "dbf8b49c641d47a8a811bb6d7480be72");
coloumData.put("TEST_TYPE", "1");
List<PageData> detailList = new ArrayList<PageData>();
Statement stmt1 = conn.createStatement();
ResultSet rs1 = stmt1
.executeQuery("select studentName,answerStr,score,totalScore from t_reportdetail where reportId = '"
+ reportId + "'");
while (rs1.next()) {
PageData detailPd = new PageData();
detailPd.put("NAME", rs1.getString("studentName"));
detailPd.put("answerStr", rs1.getString("answerStr"));
detailPd.put("SCORE", rs1.getString("totalScore"));
detailPd.put("totalScore", rs.getString("paperScore"));
detailList.add(detailPd);
}
rs1.close();
stmt1.close();
stmt1 = null;
coloumData.put("STUDENT", detailList);
resultList.add(coloumData);
}
rs.close();
stmt.close();
conn.close();
}catch(Exception e){
e.printStackTrace();
}
for (PageData paper : resultList) {
PageData testPd = new PageData();
testPd.put("TESTPAPER_ID", paper.get("TESTPAPER_ID"));
testPd.put("PAPER_ID", paper.get("PAPER_ID"));
List<PageData> listData = null;
try {
listData = testpaperService.listAll(testPd);
} catch (Exception e) {
e.printStackTrace();
}
if ((listData != null && listData.size() > 0)) {
String testPaperId = listData.get(0).getString("TESTPAPER_ID");
try {
testpaperService.deleteList(testPd);
} catch (Exception e) {
e.printStackTrace();
}
testPd.put("TEST_ID", testPaperId);
try {
testpaperinfoService.delete(testPd);
} catch (Exception e) {
e.printStackTrace();
}
try {
studenttestService.delete(testPd);
} catch (Exception e) {
e.printStackTrace();
}
listData.clear();
}
if (!(listData != null && listData.size() > 0)) {
logger.info(paper);
try {
testpaperService.save(paper);
} catch (Exception e) {
e.printStackTrace();
}
logger.info("添加测试名称成功:" + paper.get("TESTPAPER_ID"));
List<PageData> detailList = (List<PageData>) paper.get("STUDENT");
int i = 0;
List<PageData> testInfoPdList = new ArrayList();
for (PageData student : detailList) {
i++;
PageData studentDetail = null;
try {
studentDetail = studentService.findByName(student);
} catch (Exception e) {
e.printStackTrace();
}
PageData studentPageData = new PageData();
studentPageData.put("STUDENTTEST_ID", get32UUID());
studentPageData.put("STUDENT_ID", studentDetail.get("ID"));
studentPageData.put("TEST_ID", paper.get("TESTPAPER_ID"));
studentPageData.put("PAPER_ID", paper.get("TESTPAPER_ID"));
studentPageData.put("SCORE", student.get("SCORE"));
studentPageData.put("CLASS_ID", paper.get("SCLASS_ID"));
logger.info("学生测试数据");
logger.info(studentPageData);
try {
studenttestService.save(studentPageData);
} catch (Exception e) {
e.printStackTrace();
}
logger.info("添加学生测试成功:" + studentDetail.get("NAME"));
String answerStr = student.getString("answerStr");
String[] answerStrs = answerStr.split(";");
int j = 0;
for (String answers : answerStrs) {
j++;
PageData testInfoPd = new PageData();
testInfoPd.put("TESTPAPERINFO_ID", this.get32UUID());
testInfoPd.put("PAPER_ID", paper.get("TESTPAPER_ID"));
testInfoPd.put("STUDENT_ID", studentDetail.get("ID"));
testInfoPd.put("TEST_ID", paper.get("TESTPAPER_ID"));
testInfoPd.put("QUESTION_ID", paper.get("TESTPAPER_ID") + "" + i);
String[] ans = answers.split(",");
testInfoPd.put("ANSWER", ans[0]);
testInfoPd.put("RIGHT", ans[1]);
testInfoPd.put("SCORE", "");
testInfoPd.put("LIKES", "");
testInfoPd.put("ANSWER_TYPE", "1");
testInfoPd.put("PRESS_TIME", "");
testInfoPd.put("RECEIVER_DATE", "");
testInfoPd.put("SUBJECTIVE", "");
testInfoPd.put("MARK_NO", "" + j);
testInfoPd.put("RANDOM", "" + j);
testInfoPd.put("RANK", "" + j);
try {
logger.info("学生详细测试数据");
logger.info(testInfoPd);
testpaperinfoService.save(testInfoPd);
logger.info("添加学生详细情况成功:");
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// testInfoPdList.add(testInfoPd);
}
// logger.info("学生详细测试数据");
// logger.info(testInfoPdList);
try {
// testpaperinfoService.batchSave(testInfoPdList);
} catch (Exception e) {
e.printStackTrace();
}
// logger.info("添加学生详细情况成功:");
}
}
}
ResponseGson<String> res = new ResponseGson<String>();
return res.toJson();
}
|
bed6e1fc
孙向锦
添加其他功能
|
3181
|
}
|