孙向锦 / SunvoteEducation

Commit d70c9e8ca86308b51fc3ae96402ff9cae8978dd5

Authored by jack
1 parent 23bcd26d

1.修改教师密码导出为明文 

2.修改试卷列表样式问题
Inline Side-by-side
Showing 2 changed files with 196 additions and 168 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
  View file @d70c9e8
@@ -59,8 +59,8 @@ @@ -59,8 +59,8 @@
59 <col style="width: 10%" /> 59 <col style="width: 10%" />
60 <col style="width: 10%" /> 60 <col style="width: 10%" />
61 <col style="width: 15%" /> 61 <col style="width: 15%" />
62 - <col style="width: 15%" />  
63 <col style="width: 10%" /> 62 <col style="width: 10%" />
  63 + <col style="width: 15%" />
64 <thead> 64 <thead>
65 <tr> 65 <tr>
66 <th><input type="checkbox" name='ids' id="ids" />序号</th> 66 <th><input type="checkbox" name='ids' id="ids" />序号</th>
@@ -84,8 +84,8 @@ @@ -84,8 +84,8 @@
84 <col style="width: 10%" /> 84 <col style="width: 10%" />
85 <col style="width: 10%" /> 85 <col style="width: 10%" />
86 <col style="width: 15%" /> 86 <col style="width: 15%" />
87 - <col style="width: 15%" />  
88 <col style="width: 10%" /> 87 <col style="width: 10%" />
  88 + <col style="width: 15%" />
89 <tbody> 89 <tbody>
90 <c:choose> 90 <c:choose>
91 <c:when test="${not empty varList}"> 91 <c:when test="${not empty varList}">
src/com/fh/controller/sunvote/teacher/TeacherController.java
  View file @d70c9e8
@@ -61,16 +61,16 @@ public class TeacherController extends BaseController { @@ -61,16 +61,16 @@ public class TeacherController extends BaseController {
61 61
62 @Resource(name = "fhlogService") 62 @Resource(name = "fhlogService")
63 private FHlogManager FHLOG; 63 private FHlogManager FHLOG;
64 - 64 +
65 @Resource(name = "v1Service") 65 @Resource(name = "v1Service")
66 private V1Manager v1Service; 66 private V1Manager v1Service;
67 67
68 - @Resource(name="subjectService") 68 + @Resource(name = "subjectService")
69 private SubjectManager subjectService; 69 private SubjectManager subjectService;
70 -  
71 - @Resource(name="coursemanagementService") 70 +
  71 + @Resource(name = "coursemanagementService")
72 private CourseManagementManager coursemanagementService; 72 private CourseManagementManager coursemanagementService;
73 - 73 +
74 /** 74 /**
75 * 保存 75 * 保存
76 * 76 *
@@ -111,7 +111,7 @@ public class TeacherController extends BaseController { @@ -111,7 +111,7 @@ public class TeacherController extends BaseController {
111 mv.setViewName("save_result"); 111 mv.setViewName("save_result");
112 return mv; 112 return mv;
113 } 113 }
114 - 114 +
115 /** 115 /**
116 * 保存 116 * 保存
117 * 117 *
@@ -124,7 +124,7 @@ public class TeacherController extends BaseController { @@ -124,7 +124,7 @@ public class TeacherController extends BaseController {
124 PageData pd = new PageData(); 124 PageData pd = new PageData();
125 pd = this.getPageData(); 125 pd = this.getPageData();
126 pd.put("ID", this.get32UUID()); 126 pd.put("ID", this.get32UUID());
127 - 127 +
128 pd.put("USER_ID", pd.getString("ID")); // ID 主键 128 pd.put("USER_ID", pd.getString("ID")); // ID 主键
129 pd.put("LAST_LOGIN", ""); // 最后登录时间 129 pd.put("LAST_LOGIN", ""); // 最后登录时间
130 pd.put("IP", ""); // IP 130 pd.put("IP", ""); // IP
@@ -136,19 +136,18 @@ public class TeacherController extends BaseController { @@ -136,19 +136,18 @@ public class TeacherController extends BaseController {
136 pd.put("PASSWORD", 136 pd.put("PASSWORD",
137 new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd 137 new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
138 .getString("PASSWORD")).toString()); // 密码加密 138 .getString("PASSWORD")).toString()); // 密码加密
139 - 139 +
140 if (null == userService.findByUsername(pd)) { // 判断用户名是否存在 140 if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
141 teacherService.save(pd); 141 teacherService.save(pd);
142 userService.saveU(pd); // 执行保存 142 userService.saveU(pd); // 执行保存
143 mv.addObject("msg", "success"); 143 mv.addObject("msg", "success");
144 FHLOG.save(Jurisdiction.getUsername(), 144 FHLOG.save(Jurisdiction.getUsername(),
145 "新增系统用户：" + pd.getString("USERNAME")); 145 "新增系统用户：" + pd.getString("USERNAME"));
146 - }else{ 146 + } else {
147 mv.addObject("msg", "用户名系统已存在。"); 147 mv.addObject("msg", "用户名系统已存在。");
148 - 148 +
149 } 149 }
150 -  
151 - 150 +
152 mv.setViewName("save_result2"); 151 mv.setViewName("save_result2");
153 return mv; 152 return mv;
154 } 153 }
@@ -166,7 +165,7 @@ public class TeacherController extends BaseController { @@ -166,7 +165,7 @@ public class TeacherController extends BaseController {
166 return; 165 return;
167 } // 校验权限 166 } // 校验权限
168 PageData pd = new PageData(); 167 PageData pd = new PageData();
169 - pd = this.getPageData(); 168 + pd = this.getPageData();
170 pd.put("USER_ID", pd.get("ID")); 169 pd.put("USER_ID", pd.get("ID"));
171 teacherService.delete(pd); 170 teacherService.delete(pd);
172 userService.deleteU(pd); 171 userService.deleteU(pd);
@@ -206,7 +205,7 @@ public class TeacherController extends BaseController { @@ -206,7 +205,7 @@ public class TeacherController extends BaseController {
206 mv.setViewName("save_result"); 205 mv.setViewName("save_result");
207 return mv; 206 return mv;
208 } 207 }
209 - 208 +
210 /** 209 /**
211 * 修改 210 * 修改
212 * 211 *
@@ -221,7 +220,7 @@ public class TeacherController extends BaseController { @@ -221,7 +220,7 @@ public class TeacherController extends BaseController {
221 pd = this.getPageData(); 220 pd = this.getPageData();
222 PageData n = teacherService.findById(pd); 221 PageData n = teacherService.findById(pd);
223 PageData temp = new PageData(); 222 PageData temp = new PageData();
224 - temp.put("TEACHER_ID",n.get("ID").toString()); 223 + temp.put("TEACHER_ID", n.get("ID").toString());
225 PageData p = coursemanagementService.findByTid(temp); 224 PageData p = coursemanagementService.findByTid(temp);
226 pd.put("PASSWORD", 225 pd.put("PASSWORD",
227 new SimpleHash("SHA-1", n.getString("ACCOUT"), pd 226 new SimpleHash("SHA-1", n.getString("ACCOUT"), pd
@@ -235,7 +234,7 @@ public class TeacherController extends BaseController { @@ -235,7 +234,7 @@ public class TeacherController extends BaseController {
235 pd.put("RIGHTS", ""); 234 pd.put("RIGHTS", "");
236 pd.put("USERNAME", n.getString("ACCOUT")); 235 pd.put("USERNAME", n.getString("ACCOUT"));
237 pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64"); 236 pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
238 - 237 +
239 userService.editU(pd); // 执行保存 238 userService.editU(pd); // 执行保存
240 p.put("SUBJECT_ID", pd.get("SUBJECT_IDS")); 239 p.put("SUBJECT_ID", pd.get("SUBJECT_IDS"));
241 coursemanagementService.edit(p); 240 coursemanagementService.edit(p);
@@ -243,8 +242,7 @@ public class TeacherController extends BaseController { @@ -243,8 +242,7 @@ public class TeacherController extends BaseController {
243 mv.setViewName("save_result2"); 242 mv.setViewName("save_result2");
244 return mv; 243 return mv;
245 } 244 }
246 -  
247 - 245 +
248 /** 246 /**
249 * 修改 247 * 修改
250 * 248 *
@@ -258,8 +256,9 @@ public class TeacherController extends BaseController { @@ -258,8 +256,9 @@ public class TeacherController extends BaseController {
258 pd = this.getPageData(); 256 pd = this.getPageData();
259 PageData n = teacherService.findById(pd); 257 PageData n = teacherService.findById(pd);
260 ResponseGson<String> ret = new ResponseGson<String>(); 258 ResponseGson<String> ret = new ResponseGson<String>();
261 - String oldPass = new SimpleHash("SHA-1", n.getString("ACCOUT"), pd.get("OLDPASSWORD")).toString();  
262 - if(n.get("PASSWORD").equals(oldPass)){ 259 + String oldPass = new SimpleHash("SHA-1", n.getString("ACCOUT"),
  260 + pd.get("OLDPASSWORD")).toString();
  261 + if (n.get("PASSWORD").equals(oldPass)) {
263 teacherService.edit(pd); 262 teacherService.edit(pd);
264 pd.put("USER_ID", pd.getString("ID")); // ID 主键 263 pd.put("USER_ID", pd.getString("ID")); // ID 主键
265 pd.put("LAST_LOGIN", ""); // 最后登录时间 264 pd.put("LAST_LOGIN", ""); // 最后登录时间
@@ -269,13 +268,12 @@ public class TeacherController extends BaseController { @@ -269,13 +268,12 @@ public class TeacherController extends BaseController {
269 pd.put("RIGHTS", ""); 268 pd.put("RIGHTS", "");
270 pd.put("USERNAME", n.getString("ACCOUT")); 269 pd.put("USERNAME", n.getString("ACCOUT"));
271 pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64"); 270 pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
272 - pd.put("PASSWORD",  
273 - new SimpleHash("SHA-1", n.getString("ACCOUT"), pd  
274 - .getString("PASSWORD")).toString()); // 密码加密 271 + pd.put("PASSWORD", new SimpleHash("SHA-1", n.getString("ACCOUT"),
  272 + pd.getString("PASSWORD")).toString()); // 密码加密
275 userService.editU(pd); // 执行保存 273 userService.editU(pd); // 执行保存
276 teacherService.edit(pd); 274 teacherService.edit(pd);
277 ret.setData("Success"); 275 ret.setData("Success");
278 - }else{ 276 + } else {
279 ret.set5Error(); 277 ret.set5Error();
280 ret.setData("Fail"); 278 ret.setData("Fail");
281 } 279 }
@@ -295,16 +293,16 @@ public class TeacherController extends BaseController { @@ -295,16 +293,16 @@ public class TeacherController extends BaseController {
295 ModelAndView mv = this.getModelAndView(); 293 ModelAndView mv = this.getModelAndView();
296 PageData pd = new PageData(); 294 PageData pd = new PageData();
297 pd = this.getPageData(); 295 pd = this.getPageData();
298 - if(isChineseLanguageClient()){ 296 + if (isChineseLanguageClient()) {
299 mv.setViewName("sunvote/teacher/teach_paper"); 297 mv.setViewName("sunvote/teacher/teach_paper");
300 - }else{ 298 + } else {
301 mv.setViewName("sunvote/teacher/en_teach_paper"); 299 mv.setViewName("sunvote/teacher/en_teach_paper");
302 } 300 }
303 pd.put("userId", userId); 301 pd.put("userId", userId);
304 mv.addObject("pd", pd); 302 mv.addObject("pd", pd);
305 return mv; 303 return mv;
306 } 304 }
307 - 305 +
308 /** 306 /**
309 * 列表 307 * 列表
310 * 308 *
@@ -323,6 +321,7 @@ public class TeacherController extends BaseController { @@ -323,6 +321,7 @@ public class TeacherController extends BaseController {
323 mv.addObject("pd", pd); 321 mv.addObject("pd", pd);
324 return mv; 322 return mv;
325 } 323 }
  324 +
326 /** 325 /**
327 * 列表 326 * 列表
328 * 327 *
@@ -337,15 +336,15 @@ public class TeacherController extends BaseController { @@ -337,15 +336,15 @@ public class TeacherController extends BaseController {
337 PageData pd = new PageData(); 336 PageData pd = new PageData();
338 pd = this.getPageData(); 337 pd = this.getPageData();
339 pd.put("userId", userId); 338 pd.put("userId", userId);
340 - if(isChineseLanguageClient()){ 339 + if (isChineseLanguageClient()) {
341 mv.setViewName("sunvote/teacher/test_list"); 340 mv.setViewName("sunvote/teacher/test_list");
342 - }else{ 341 + } else {
343 mv.setViewName("sunvote/teacher/en_test_list"); 342 mv.setViewName("sunvote/teacher/en_test_list");
344 } 343 }
345 mv.addObject("pd", pd); 344 mv.addObject("pd", pd);
346 return mv; 345 return mv;
347 } 346 }
348 - 347 +
349 /** 348 /**
350 * 列表 349 * 列表
351 * 350 *
@@ -362,16 +361,16 @@ public class TeacherController extends BaseController { @@ -362,16 +361,16 @@ public class TeacherController extends BaseController {
362 pd.put("userId", userId); 361 pd.put("userId", userId);
363 pd.put("ID", getTeacherID()); 362 pd.put("ID", getTeacherID());
364 PageData pageData = teacherService.findById(pd); 363 PageData pageData = teacherService.findById(pd);
365 - pd.put("subject_id", pageData.get("SUBJECT_IDS"));  
366 - if(isChineseLanguageClient()){ 364 + pd.put("subject_id", pageData.get("SUBJECT_IDS"));
  365 + if (isChineseLanguageClient()) {
367 mv.setViewName("sunvote/teacher/paper_view"); 366 mv.setViewName("sunvote/teacher/paper_view");
368 - }else{ 367 + } else {
369 mv.setViewName("sunvote/teacher/en_paper_view"); 368 mv.setViewName("sunvote/teacher/en_paper_view");
370 } 369 }
371 mv.addObject("pd", pd); 370 mv.addObject("pd", pd);
372 return mv; 371 return mv;
373 } 372 }
374 - 373 +
375 private String getSubjectID(String userId) { 374 private String getSubjectID(String userId) {
376 PageData pt = new PageData(); 375 PageData pt = new PageData();
377 pt.put("TEACHER_ID", userId); 376 pt.put("TEACHER_ID", userId);
@@ -380,7 +379,8 @@ public class TeacherController extends BaseController { @@ -380,7 +379,8 @@ public class TeacherController extends BaseController {
380 if (subjectList != null && subjectList.size() > 0) { 379 if (subjectList != null && subjectList.size() > 0) {
381 return subjectList.get(0).getString("SUBJECT_ID"); 380 return subjectList.get(0).getString("SUBJECT_ID");
382 } 381 }
383 - }catch(Exception ex){} 382 + } catch (Exception ex) {
  383 + }
384 return null; 384 return null;
385 } 385 }
386 386
@@ -398,15 +398,15 @@ public class TeacherController extends BaseController { @@ -398,15 +398,15 @@ public class TeacherController extends BaseController {
398 PageData pd = new PageData(); 398 PageData pd = new PageData();
399 pd = this.getPageData(); 399 pd = this.getPageData();
400 pd.put("userId", userId); 400 pd.put("userId", userId);
401 - if(isChineseLanguageClient()){ 401 + if (isChineseLanguageClient()) {
402 mv.setViewName("sunvote/teacher/paper_view2"); 402 mv.setViewName("sunvote/teacher/paper_view2");
403 - }else{ 403 + } else {
404 mv.setViewName("sunvote/teacher/en_paper_view2"); 404 mv.setViewName("sunvote/teacher/en_paper_view2");
405 } 405 }
406 mv.addObject("pd", pd); 406 mv.addObject("pd", pd);
407 return mv; 407 return mv;
408 } 408 }
409 - 409 +
410 /** 410 /**
411 * 列表 411 * 列表
412 * 412 *
@@ -421,16 +421,16 @@ public class TeacherController extends BaseController { @@ -421,16 +421,16 @@ public class TeacherController extends BaseController {
421 PageData pd = new PageData(); 421 PageData pd = new PageData();
422 pd = this.getPageData(); 422 pd = this.getPageData();
423 pd.put("userId", userId); 423 pd.put("userId", userId);
424 - if(isChineseLanguageClient()){ 424 + if (isChineseLanguageClient()) {
425 mv.setViewName("sunvote/teacher/paper_view1"); 425 mv.setViewName("sunvote/teacher/paper_view1");
426 - }else{ 426 + } else {
427 mv.setViewName("sunvote/teacher/en_paper_view1"); 427 mv.setViewName("sunvote/teacher/en_paper_view1");
428 } 428 }
429 - 429 +
430 mv.addObject("pd", pd); 430 mv.addObject("pd", pd);
431 return mv; 431 return mv;
432 } 432 }
433 - 433 +
434 /** 434 /**
435 * 列表 435 * 列表
436 * 436 *
@@ -445,38 +445,46 @@ public class TeacherController extends BaseController { @@ -445,38 +445,46 @@ public class TeacherController extends BaseController {
445 PageData pd = new PageData(); 445 PageData pd = new PageData();
446 pd = this.getPageData(); 446 pd = this.getPageData();
447 pd.put("userId", userId); 447 pd.put("userId", userId);
448 - if(pd.get("TEST_ID") == null){ 448 + if (pd.get("TEST_ID") == null) {
449 pd.put("TEST_ID", pd.get("TESTPAPERID")); 449 pd.put("TEST_ID", pd.get("TESTPAPERID"));
450 } 450 }
451 - List<PageData> diffcultClassList = teacherService.diffcultClassReport(pd);  
452 - for(PageData diffcultPd : diffcultClassList){  
453 - double rightNum = Double.parseDouble(diffcultPd.getString("RIGHT_NUM")); 451 + List<PageData> diffcultClassList = teacherService
  452 + .diffcultClassReport(pd);
  453 + for (PageData diffcultPd : diffcultClassList) {
  454 + double rightNum = Double.parseDouble(diffcultPd
  455 + .getString("RIGHT_NUM"));
454 double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM")); 456 double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM"));
455 - double persent = rightNum * 100.0 / allNum ; 457 + double persent = rightNum * 100.0 / allNum;
456 diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent)); 458 diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent));
457 } 459 }
458 -  
459 - List<PageData> diffcultStudentList = teacherService.diffcultStudentReport(pd);  
460 - for(PageData diffcultPd : diffcultStudentList){  
461 - double rightNum = Double.parseDouble(diffcultPd.getString("RIGHT_NUM")); 460 +
  461 + List<PageData> diffcultStudentList = teacherService
  462 + .diffcultStudentReport(pd);
  463 + for (PageData diffcultPd : diffcultStudentList) {
  464 + double rightNum = Double.parseDouble(diffcultPd
  465 + .getString("RIGHT_NUM"));
462 double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM")); 466 double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM"));
463 - double persent = rightNum * 100.0 / allNum ; 467 + double persent = rightNum * 100.0 / allNum;
464 diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent)); 468 diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent));
465 } 469 }
466 -  
467 - List<PageData> knowadgeClassList = teacherService.knowadgeClassReport(pd);  
468 - for(PageData diffcultPd : knowadgeClassList){  
469 - double rightNum = Double.parseDouble(diffcultPd.getString("RIGHT_NUM")); 470 +
  471 + List<PageData> knowadgeClassList = teacherService
  472 + .knowadgeClassReport(pd);
  473 + for (PageData diffcultPd : knowadgeClassList) {
  474 + double rightNum = Double.parseDouble(diffcultPd
  475 + .getString("RIGHT_NUM"));
470 double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM")); 476 double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM"));
471 - double persent = rightNum * 100.0 / allNum ; 477 + double persent = rightNum * 100.0 / allNum;
472 diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent)); 478 diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent));
473 } 479 }
474 -  
475 - List<PageData> knowadgeStudentList = teacherService.knowadgeStudentReport(pd);  
476 - for(PageData diffcultPd : knowadgeStudentList){  
477 - double rightNum = Double.parseDouble(diffcultPd.getString("RIGHT_NUM")); 480 +
  481 + List<PageData> knowadgeStudentList = teacherService
  482 + .knowadgeStudentReport(pd);
  483 + for (PageData diffcultPd : knowadgeStudentList) {
  484 + double rightNum = Double.parseDouble(diffcultPd
  485 + .getString("RIGHT_NUM"));
478 double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM")); 486 double allNum = Double.parseDouble(diffcultPd.getString("ALL_NUM"));
479 - double persent = rightNum * 100.0 / allNum ; 487 + double persent = rightNum * 100.0 / allNum;
480 diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent)); 488 diffcultPd.put("RIGHT_PERSENT", String.format("%.2f", persent));
481 } 489 }
482 mv.addObject("diffcultClassList", diffcultClassList); 490 mv.addObject("diffcultClassList", diffcultClassList);
@@ -485,14 +493,11 @@ public class TeacherController extends BaseController { @@ -485,14 +493,11 @@ public class TeacherController extends BaseController {
485 mv.addObject("knowadgeClassList", knowadgeClassList); 493 mv.addObject("knowadgeClassList", knowadgeClassList);
486 mv.addObject("knowadgeClassListSize", knowadgeClassList.size()); 494 mv.addObject("knowadgeClassListSize", knowadgeClassList.size());
487 mv.addObject("knowadgeStudentList", knowadgeStudentList); 495 mv.addObject("knowadgeStudentList", knowadgeStudentList);
488 - 496 +
489 mv.setViewName("sunvote/teacher/paper_report"); 497 mv.setViewName("sunvote/teacher/paper_report");
490 mv.addObject("pd", pd); 498 mv.addObject("pd", pd);
491 return mv; 499 return mv;
492 } 500 }
493 -  
494 -  
495 -  
496 501
497 /** 502 /**
498 * 列表 503 * 列表
@@ -508,9 +513,9 @@ public class TeacherController extends BaseController { @@ -508,9 +513,9 @@ public class TeacherController extends BaseController {
508 PageData pd = new PageData(); 513 PageData pd = new PageData();
509 pd = this.getPageData(); 514 pd = this.getPageData();
510 pd.put("userId", userId); 515 pd.put("userId", userId);
511 - if(isChineseLanguageClient()){ 516 + if (isChineseLanguageClient()) {
512 mv.setViewName("sunvote/teacher/set_question"); 517 mv.setViewName("sunvote/teacher/set_question");
513 - }else{ 518 + } else {
514 mv.setViewName("sunvote/teacher/en_set_question"); 519 mv.setViewName("sunvote/teacher/en_set_question");
515 } 520 }
516 mv.addObject("pd", pd); 521 mv.addObject("pd", pd);
@@ -547,7 +552,7 @@ public class TeacherController extends BaseController { @@ -547,7 +552,7 @@ public class TeacherController extends BaseController {
547 mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限 552 mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限
548 return mv; 553 return mv;
549 } 554 }
550 - 555 +
551 /** 556 /**
552 * 列表 557 * 列表
553 * 558 *
@@ -563,18 +568,18 @@ public class TeacherController extends BaseController { @@ -563,18 +568,18 @@ public class TeacherController extends BaseController {
563 page.setPd(pd); 568 page.setPd(pd);
564 page.setLangIsChina(isChineseLanguageClient()); 569 page.setLangIsChina(isChineseLanguageClient());
565 List<PageData> varList = teacherService.list(page); // 列出Teacher列表 570 List<PageData> varList = teacherService.list(page); // 列出Teacher列表
566 - if(isChineseLanguageClient()){ 571 + if (isChineseLanguageClient()) {
567 mv.setViewName("sunvote/teacher/teacher_list2"); 572 mv.setViewName("sunvote/teacher/teacher_list2");
568 - }else{ 573 + } else {
569 mv.setViewName("sunvote/teacher/en_teacher_list2"); 574 mv.setViewName("sunvote/teacher/en_teacher_list2");
570 } 575 }
571 - 576 +
572 mv.addObject("varList", varList); 577 mv.addObject("varList", varList);
573 - 578 +
574 mv.addObject("pd", pd); 579 mv.addObject("pd", pd);
575 return mv; 580 return mv;
576 } 581 }
577 - 582 +
578 /** 583 /**
579 * 列表 584 * 列表
580 * 585 *
@@ -612,27 +617,24 @@ public class TeacherController extends BaseController { @@ -612,27 +617,24 @@ public class TeacherController extends BaseController {
612 mv.addObject("pd", pd); 617 mv.addObject("pd", pd);
613 return mv; 618 return mv;
614 } 619 }
615 - 620 +
616 @RequestMapping(value = "/goAdd2") 621 @RequestMapping(value = "/goAdd2")
617 public ModelAndView goAdd2() throws Exception { 622 public ModelAndView goAdd2() throws Exception {
618 ModelAndView mv = this.getModelAndView(); 623 ModelAndView mv = this.getModelAndView();
619 PageData pd = new PageData(); 624 PageData pd = new PageData();
620 pd = this.getPageData(); 625 pd = this.getPageData();
621 - if(isChineseLanguageClient()){ 626 + if (isChineseLanguageClient()) {
622 mv.setViewName("sunvote/teacher/teacher_edit2"); 627 mv.setViewName("sunvote/teacher/teacher_edit2");
623 - }else{ 628 + } else {
624 mv.setViewName("sunvote/teacher/en_teacher_edit2"); 629 mv.setViewName("sunvote/teacher/en_teacher_edit2");
625 } 630 }
626 -  
627 - 631 +
628 List<PageData> schools = schoolService.listAll(pd); 632 List<PageData> schools = schoolService.listAll(pd);
629 mv.addObject("schools", schools); 633 mv.addObject("schools", schools);
630 - 634 +
631 List<PageData> subjects = subjectService.listAllSchool(pd); 635 List<PageData> subjects = subjectService.listAllSchool(pd);
632 mv.addObject("subjects", subjects); 636 mv.addObject("subjects", subjects);
633 -  
634 -  
635 - 637 +
636 mv.addObject("msg", "save2"); 638 mv.addObject("msg", "save2");
637 mv.addObject("pd", pd); 639 mv.addObject("pd", pd);
638 return mv; 640 return mv;
@@ -657,7 +659,7 @@ public class TeacherController extends BaseController { @@ -657,7 +659,7 @@ public class TeacherController extends BaseController {
657 mv.addObject("pd", pd); 659 mv.addObject("pd", pd);
658 return mv; 660 return mv;
659 } 661 }
660 - 662 +
661 /** 663 /**
662 * 去修改页面 664 * 去修改页面
663 * 665 *
@@ -670,9 +672,9 @@ public class TeacherController extends BaseController { @@ -670,9 +672,9 @@ public class TeacherController extends BaseController {
670 PageData pd = new PageData(); 672 PageData pd = new PageData();
671 pd = this.getPageData(); 673 pd = this.getPageData();
672 pd = teacherService.findById(pd); // 根据ID读取 674 pd = teacherService.findById(pd); // 根据ID读取
673 - if(isChineseLanguageClient()){ 675 + if (isChineseLanguageClient()) {
674 mv.setViewName("sunvote/teacher/teacher_edit2"); 676 mv.setViewName("sunvote/teacher/teacher_edit2");
675 - }else{ 677 + } else {
676 mv.setViewName("sunvote/teacher/en_teacher_edit2"); 678 mv.setViewName("sunvote/teacher/en_teacher_edit2");
677 } 679 }
678 List<PageData> schools = schoolService.listAll(pd); 680 List<PageData> schools = schoolService.listAll(pd);
@@ -683,7 +685,7 @@ public class TeacherController extends BaseController { @@ -683,7 +685,7 @@ public class TeacherController extends BaseController {
683 mv.addObject("pd", pd); 685 mv.addObject("pd", pd);
684 return mv; 686 return mv;
685 } 687 }
686 - 688 +
687 /** 689 /**
688 * 去修改页面 690 * 去修改页面
689 * 691 *
@@ -735,131 +737,149 @@ public class TeacherController extends BaseController { @@ -735,131 +737,149 @@ public class TeacherController extends BaseController {
735 map.put("list", pdList); 737 map.put("list", pdList);
736 return AppUtil.returnObject(pd, map); 738 return AppUtil.returnObject(pd, map);
737 } 739 }
738 -  
739 - /**打开上传EXCEL页面 740 +
  741 + /**
  742 + * 打开上传EXCEL页面
  743 + *
740 * @return 744 * @return
741 * @throws Exception 745 * @throws Exception
742 */ 746 */
743 - @RequestMapping(value="/goUploadExcel")  
744 - public ModelAndView goUploadExcel()throws Exception{ 747 + @RequestMapping(value = "/goUploadExcel")
  748 + public ModelAndView goUploadExcel() throws Exception {
745 ModelAndView mv = this.getModelAndView(); 749 ModelAndView mv = this.getModelAndView();
746 mv.addObject("pd", getPageData()); 750 mv.addObject("pd", getPageData());
747 -  
748 - if(isChineseLanguageClient()){ 751 +
  752 + if (isChineseLanguageClient()) {
749 mv.setViewName("sunvote/teacher/uploadexcel"); 753 mv.setViewName("sunvote/teacher/uploadexcel");
750 - }else{ 754 + } else {
751 mv.setViewName("sunvote/teacher/en_uploadexcel"); 755 mv.setViewName("sunvote/teacher/en_uploadexcel");
752 } 756 }
753 return mv; 757 return mv;
754 } 758 }
755 759
756 -  
757 - /**从EXCEL导入到数据库 760 + /**
  761 + * 从EXCEL导入到数据库
  762 + *
758 * @param file 763 * @param file
759 * @return 764 * @return
760 * @throws Exception 765 * @throws Exception
761 */ 766 */
762 - @RequestMapping(value="/readExcel") 767 + @RequestMapping(value = "/readExcel")
763 public ModelAndView readExcel( 768 public ModelAndView readExcel(
764 - @RequestParam(value="excel",required=false) MultipartFile file  
765 - ) throws Exception{  
766 - logBefore(logger,Jurisdiction.getUsername() + "从EXCEL导入到数据库"); 769 + @RequestParam(value = "excel", required = false) MultipartFile file)
  770 + throws Exception {
  771 + logBefore(logger, Jurisdiction.getUsername() + "从EXCEL导入到数据库");
767 ModelAndView mv = this.getModelAndView(); 772 ModelAndView mv = this.getModelAndView();
768 PageData tpd = getPageData(); 773 PageData tpd = getPageData();
769 PageData pd = new PageData(); 774 PageData pd = new PageData();
770 - 775 +
771 String schoolID = tpd.getString("SCHOOL_ID"); 776 String schoolID = tpd.getString("SCHOOL_ID");
772 if (null != file && !file.isEmpty()) { 777 if (null != file && !file.isEmpty()) {
773 - String filePath = PathUtil.getClasspath() + Const.FILEPATHFILE; //文件上传路径  
774 - String fileName = FileUpload.fileUp(file, filePath, "userexcel"); //执行上传  
775 - List<PageData> listPd = (List)ObjectExcelRead.readExcel(filePath, fileName, 0, 0, 0); //执行读EXCEL操作,读出的数据导入List 2:从第3行开始；0:从第A列开始；0:第0个sheet  
776 - if(listPd.size() > 0 ){  
777 - pd= listPd.get(0);  
778 - for(int i = 1 ; i < listPd.size();i++){ 778 + String filePath = PathUtil.getClasspath() + Const.FILEPATHFILE; // 文件上传路径
  779 + String fileName = FileUpload.fileUp(file, filePath, "userexcel"); // 执行上传
  780 + List<PageData> listPd = (List) ObjectExcelRead.readExcel(filePath,
  781 + fileName, 0, 0, 0); // 执行读EXCEL操作,读出的数据导入List
  782 + // 2:从第3行开始；0:从第A列开始；0:第0个sheet
  783 + if (listPd.size() > 0) {
  784 + pd = listPd.get(0);
  785 + for (int i = 1; i < listPd.size(); i++) {
779 PageData savePd = new PageData(); 786 PageData savePd = new PageData();
780 PageData temp = listPd.get(i); 787 PageData temp = listPd.get(i);
781 - for(int j = 0 ; j<9 ;j++){  
782 - if(temp.get("var" + j) == null|| temp.get("var" + j).toString().equals("")){  
783 - if(j==0){ //姓名  
784 - mv.addObject("state","fail");  
785 - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行姓名不能为空"); 788 + for (int j = 0; j < 9; j++) {
  789 + if (temp.get("var" + j) == null
  790 + || temp.get("var" + j).toString().equals("")) {
  791 + if (j == 0) { // 姓名
  792 + mv.addObject("state", "fail");
  793 + mv.addObject("msg", "本次成功导入"
  794 + + (i - 1 >= 0 ? i - 1 : 0) + "条数据，第"
  795 + + i + "行姓名不能为空");
786 mv.setViewName("save_result2"); 796 mv.setViewName("save_result2");
787 return mv; 797 return mv;
788 - }else if(j==4){ //账户  
789 - mv.addObject("state","fail");  
790 - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行账户不能为空"); 798 + } else if (j == 4) { // 账户
  799 + mv.addObject("state", "fail");
  800 + mv.addObject("msg", "本次成功导入"
  801 + + (i - 1 >= 0 ? i - 1 : 0) + "条数据，第"
  802 + + i + "行账户不能为空");
791 mv.setViewName("save_result2"); 803 mv.setViewName("save_result2");
792 return mv; 804 return mv;
793 - }else if(j==5){ //密码  
794 - savePd.put(pd.getString("var" + j).toUpperCase(), "123456");  
795 - }else if(j==8){ //科目  
796 - mv.addObject("state","fail");  
797 - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行科目不能为空"); 805 + } else if (j == 5) { // 密码
  806 + savePd.put(pd.getString("var" + j)
  807 + .toUpperCase(), "123456");
  808 + } else if (j == 8) { // 科目
  809 + mv.addObject("state", "fail");
  810 + mv.addObject("msg", "本次成功导入"
  811 + + (i - 1 >= 0 ? i - 1 : 0) + "条数据，第"
  812 + + i + "行科目不能为空");
798 mv.setViewName("save_result2"); 813 mv.setViewName("save_result2");
799 return mv; 814 return mv;
800 } 815 }
801 - 816 +
802 } 817 }
803 - if(temp.get("var" + j) != null && !"".equals(temp.get("var" + j).toString())){  
804 - savePd.put(pd.getString("var" + j).toUpperCase(), temp.get("var" + j)); 818 + if (temp.get("var" + j) != null
  819 + && !"".equals(temp.get("var" + j).toString())) {
  820 + savePd.put(pd.getString("var" + j).toUpperCase(),
  821 + temp.get("var" + j));
805 } 822 }
806 - 823 +
807 } 824 }
  825 + savePd.put("PASSWORD",
  826 + new SimpleHash("SHA-1", savePd.getString("ACCOUT"),
  827 + savePd.getString("PASSWORD")).toString()); // 密码加密
808 PageData page = subjectService.findByCname(savePd); 828 PageData page = subjectService.findByCname(savePd);
809 - if(page!=null){ 829 + if (page != null) {
810 savePd.put("SUBJECT_IDS", page.get("ID")); 830 savePd.put("SUBJECT_IDS", page.get("ID"));
811 - }else{ 831 + } else {
812 savePd.put("SUBJECT_IDS", ""); 832 savePd.put("SUBJECT_IDS", "");
813 } 833 }
814 - if(!savePd.containsKey("ID")){ 834 + if (!savePd.containsKey("ID")) {
815 if (savePd.values().size() > 0) { 835 if (savePd.values().size() > 0) {
816 String teacherId = this.get32UUID(); 836 String teacherId = this.get32UUID();
817 savePd.put("ID", teacherId); 837 savePd.put("ID", teacherId);
818 savePd.put("SCHOOL_ID", schoolID); 838 savePd.put("SCHOOL_ID", schoolID);
819 - 839 +
820 PageData p = new PageData(); 840 PageData p = new PageData();
821 p.put("USERNAME", savePd.getString("ACCOUT")); 841 p.put("USERNAME", savePd.getString("ACCOUT"));
822 -  
823 - if(null==userService.findByUsername(p)){ 842 +
  843 + if (null == userService.findByUsername(p)) {
824 p.put("USER_ID", savePd.get("ID")); 844 p.put("USER_ID", savePd.get("ID"));
825 - p.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");  
826 - p.put("PASSWORD",  
827 - new SimpleHash("SHA-1", savePd.getString("ACCOUT"), savePd  
828 - .getString("PASSWORD")).toString()); // 密码加密 845 + p.put("ROLE_ID",
  846 + "57bb1e6f138247a0b05cc721a5da1b64");
  847 + p.put("PASSWORD", savePd.getString("PASSWORD")
  848 + .toString()); // 密码加密
829 p.put("LAST_LOGIN", ""); // 最后登录时间 849 p.put("LAST_LOGIN", ""); // 最后登录时间
830 p.put("IP", ""); // IP 850 p.put("IP", ""); // IP
831 p.put("STATUS", "0"); // 状态 851 p.put("STATUS", "0"); // 状态
832 p.put("SKIN", "default"); 852 p.put("SKIN", "default");
833 p.put("RIGHTS", ""); 853 p.put("RIGHTS", "");
834 - p.put("NAME",savePd.getString("NAME") );  
835 - 854 + p.put("NAME", savePd.getString("NAME"));
  855 +
836 userService.saveU(p); 856 userService.saveU(p);
837 FHLOG.save(Jurisdiction.getUsername(), 857 FHLOG.save(Jurisdiction.getUsername(),
838 "新增系统用户：" + pd.getString("USERNAME")); 858 "新增系统用户：" + pd.getString("USERNAME"));
839 - }else{  
840 - mv.addObject("state","fail");  
841 - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行用户名系统已存在。"); 859 + } else {
  860 + mv.addObject("state", "fail");
  861 + mv.addObject("msg", "本次成功导入"
  862 + + (i - 1 >= 0 ? i - 1 : 0) + "条数据，第"
  863 + + i + "行用户名系统已存在。");
842 mv.setViewName("save_result2"); 864 mv.setViewName("save_result2");
843 return mv; 865 return mv;
844 } 866 }
845 -  
846 -  
847 - 867 +
848 teacherService.save(savePd); 868 teacherService.save(savePd);
849 } 869 }
850 -  
851 - }else{ 870 +
  871 + } else {
852 teacherService.edit(savePd); 872 teacherService.edit(savePd);
853 } 873 }
854 } 874 }
855 - 875 +
856 } 876 }
857 } 877 }
858 - mv.addObject("msg","success"); 878 + mv.addObject("msg", "success");
859 mv.setViewName("save_result2"); 879 mv.setViewName("save_result2");
860 return mv; 880 return mv;
861 } 881 }
862 - 882 +
863 /** 883 /**
864 * 导出到excel 884 * 导出到excel
865 * 885 *
@@ -890,15 +910,26 @@ public class TeacherController extends BaseController { @@ -890,15 +910,26 @@ public class TeacherController extends BaseController {
890 for (int i = 0; i < varOList.size(); i++) { 910 for (int i = 0; i < varOList.size(); i++) {
891 PageData vpd = new PageData(); 911 PageData vpd = new PageData();
892 vpd.put("var1", varOList.get(i).get("SCHOOL_NAME").toString()); // 1 912 vpd.put("var1", varOList.get(i).get("SCHOOL_NAME").toString()); // 1
893 - vpd.put("var2", varOList.get(i).getString("NAME")==null?"":varOList.get(i).getString("NAME")); // 2  
894 - vpd.put("var3", varOList.get(i).getString("PHONE")==null?"":varOList.get(i).getString("PHONE")); // 3  
895 - vpd.put("var4", varOList.get(i).getString("SEAT_PHONE")==null?"":varOList.get(i).getString("SEAT_PHONE")); // 4  
896 - vpd.put("var5", varOList.get(i).getString("CARD_NO")==null?"":varOList.get(i).getString("CARD_NO")); // 5  
897 - vpd.put("var6", varOList.get(i).getString("ACCOUT")==null?"":varOList.get(i).getString("ACCOUT")); // 6  
898 - vpd.put("var7", varOList.get(i).getString("PASSWORD")==null?"":varOList.get(i).getString("PASSWORD")); // 7  
899 - vpd.put("var8", varOList.get(i).get("SEX")==null?"":varOList.get(i).get("SEX").toString().equals("1")?"男":"女"); // 8  
900 - vpd.put("var9", varOList.get(i).getString("CNAME")==null?"":varOList.get(i).getString("CNAME")); // 9  
901 - vpd.put("var10", varOList.get(i).getString("KEYPAD_ID")==null?"":varOList.get(i).getString("KEYPAD_ID")); // 10 913 + vpd.put("var2", varOList.get(i).getString("NAME") == null ? ""
  914 + : varOList.get(i).getString("NAME")); // 2
  915 + vpd.put("var3", varOList.get(i).getString("PHONE") == null ? ""
  916 + : varOList.get(i).getString("PHONE")); // 3
  917 + vpd.put("var4",
  918 + varOList.get(i).getString("SEAT_PHONE") == null ? ""
  919 + : varOList.get(i).getString("SEAT_PHONE")); // 4
  920 + vpd.put("var5", varOList.get(i).getString("CARD_NO") == null ? ""
  921 + : varOList.get(i).getString("CARD_NO")); // 5
  922 + vpd.put("var6", varOList.get(i).getString("ACCOUT") == null ? ""
  923 + : varOList.get(i).getString("ACCOUT")); // 6
  924 + vpd.put("var7", varOList.get(i).getString("PASSWORD") == null ? ""
  925 + : varOList.get(i).getString("PASSWORD")); // 7
  926 + vpd.put("var8", varOList.get(i).get("SEX") == null ? "" : varOList
  927 + .get(i).get("SEX").toString().equals("1") ? "男" : "女"); // 8
  928 + vpd.put("var9", varOList.get(i).getString("CNAME") == null ? ""
  929 + : varOList.get(i).getString("CNAME")); // 9
  930 + vpd.put("var10",
  931 + varOList.get(i).getString("KEYPAD_ID") == null ? ""
  932 + : varOList.get(i).getString("KEYPAD_ID")); // 10
902 varList.add(vpd); 933 varList.add(vpd);
903 } 934 }
904 dataMap.put("varList", varList); 935 dataMap.put("varList", varList);
@@ -932,24 +963,23 @@ public class TeacherController extends BaseController { @@ -932,24 +963,23 @@ public class TeacherController extends BaseController {
932 PageData pt = new PageData(); 963 PageData pt = new PageData();
933 pt.put("TEACHER_ID", pageData.get("ID")); 964 pt.put("TEACHER_ID", pageData.get("ID"));
934 // 在任课表中查找老师教哪些班级，然后查出班级信息 965 // 在任课表中查找老师教哪些班级，然后查出班级信息
935 - List<PageData> classInfoList = v1Service  
936 - .getTeacherClassInfo(pt); 966 + List<PageData> classInfoList = v1Service.getTeacherClassInfo(pt);
937 pt.put("ID", pageData.get("SUBJECT_IDS")); 967 pt.put("ID", pageData.get("SUBJECT_IDS"));
938 - 968 +
939 pageData.put("classInfoList", classInfoList); 969 pageData.put("classInfoList", classInfoList);
940 // 在认可表中查找老师教哪些科目，然后查出科目信息 970 // 在认可表中查找老师教哪些科目，然后查出科目信息
941 List<PageData> subjectList = new ArrayList<PageData>(); 971 List<PageData> subjectList = new ArrayList<PageData>();
942 PageData tmpd = subjectService.findById(pt); 972 PageData tmpd = subjectService.findById(pt);
943 - if(tmpd != null){ 973 + if (tmpd != null) {
944 tmpd.put("SUBJECT_ID", tmpd.get("ID")); 974 tmpd.put("SUBJECT_ID", tmpd.get("ID"));
945 } 975 }
946 subjectList.add(tmpd); 976 subjectList.add(tmpd);
947 -// v1Service.getTeacherSubjectInfo(pt); 977 + // v1Service.getTeacherSubjectInfo(pt);
948 // 一个sql语句完成。 978 // 一个sql语句完成。
949 pageData.put("subjectList", subjectList); 979 pageData.put("subjectList", subjectList);
950 - 980 +
951 pageData.remove("SUBJECT_IDS"); 981 pageData.remove("SUBJECT_IDS");
952 - 982 +
953 PageData eventPd = new PageData(); 983 PageData eventPd = new PageData();
954 eventPd.put("EVENT_ID", get32UUID()); 984 eventPd.put("EVENT_ID", get32UUID());
955 eventPd.put("EVENT_NAME", "login"); 985 eventPd.put("EVENT_NAME", "login");
@@ -966,10 +996,8 @@ public class TeacherController extends BaseController { @@ -966,10 +996,8 @@ public class TeacherController extends BaseController {
966 } else { 996 } else {
967 res.set1Error(); 997 res.set1Error();
968 } 998 }
969 - 999 +
970 return res.toJson(); 1000 return res.toJson();
971 } 1001 }
972 -  
973 -  
974 1002
975 } 1003 }