孙向锦 / SunvoteEducation

Commit 48d44272308983e9ea9d70109b4aeadf01206153

Authored by 孙向锦
1 parent 416902b7

添加一些action

Inline Side-by-side
Showing 7 changed files with 127 additions and 28 deletions
resources/mybatis1/sunvote/HeadmasterMapper.xml
  View file @48d4427
... ... @@ -15,6 +15,7 @@
15 15 SCHOOL_ID,
16 16 PERMISSION,
17 17 PHONE,
  18 + KEYPAD_ID,
18 19 HEADMASTER_ID
19 20 </sql>
20 21  
... ... @@ -26,6 +27,7 @@
26 27 #{SCHOOL_ID},
27 28 #{PERMISSION},
28 29 #{PHONE},
  30 + #{KEYPAD_ID},
29 31 #{HEADMASTER_ID}
30 32 </sql>
31 33  
... ... @@ -59,6 +61,7 @@
59 61 SCHOOL_ID = #{SCHOOL_ID},
60 62 PERMISSION = #{PERMISSION},
61 63 PHONE = #{PHONE},
  64 + KEYPAD_ID = #{KEYPAD_ID},
62 65 HEADMASTER_ID = HEADMASTER_ID
63 66 where
64 67 HEADMASTER_ID = #{HEADMASTER_ID}
... ... @@ -74,6 +77,22 @@
74 77 HEADMASTER_ID = #{HEADMASTER_ID}
75 78 </select>
76 79  
  80 + <!-- 通过ID获取数据 -->
  81 + <select id="findByUsenameAndPassword" parameterType="pd" resultType="pd">
  82 + select
  83 + <include refid="Field"></include>
  84 + from
  85 + <include refid="tableName"></include>
  86 + where
  87 + <if test="pd.KEYPAD_ID != null and pd.KEYPAD_ID != ''">
  88 + KEYPAD_ID = #{KEYPAD_ID}
  89 + </if>
  90 + <if test="pd.KEYPAD_ID == null or pd.KEYPAD_ID != ''">
  91 + USERNAME = #{USERNAME} and
  92 + PASSWORD = #{PASSWORD}
  93 + </if>
  94 + </select>
  95 +
77 96 <!-- 列表 -->
78 97 <select id="datalistPage" parameterType="page" resultType="pd">
79 98 select
... ...
resources/mybatis1/sunvote/SClassMapper.xml
  View file @48d4427
... ... @@ -15,6 +15,7 @@
15 15 CLASS_NAME,
16 16 CLASS_CODE,
17 17 BASESTATION_ID,
  18 + HEADMASTER_ID,
18 19 ID
19 20 </sql>
20 21  
... ... @@ -26,6 +27,7 @@
26 27 #{CLASS_NAME},
27 28 #{CLASS_CODE},
28 29 #{BASESTATION_ID},
  30 + #{HEADMASTER_ID},
29 31 #{ID}
30 32 </sql>
31 33  
... ... @@ -40,6 +42,7 @@
40 42 CLASS_NAME,
41 43 CLASS_CODE,
42 44 ID,
  45 + HEADMASTER_ID,
43 46 BASESTATION_ID
44 47 ) values (
45 48 #{SCHOOL_ID},
... ... @@ -48,6 +51,7 @@
48 51 #{CLASS_NAME},
49 52 #{CLASS_CODE},
50 53 #{ID},
  54 + #{HEADMASTER_ID},
51 55 #{BASESTATION_ID}
52 56 )
53 57 </insert>
... ... @@ -71,6 +75,7 @@
71 75 CLASS_NAME = #{CLASS_NAME},
72 76 CLASS_CODE = #{CLASS_CODE},
73 77 BASESTATION_ID = #{BASESTATION_ID},
  78 + HEADMASTER_ID = #{HEADMASTER_ID},
74 79 ID = #{ID}
75 80 where
76 81 ID = #{ID}
... ... @@ -120,6 +125,9 @@
120 125 <if test="CLASS_TYPE != null and CLASS_TYPE != ''">
121 126 and ( CLASS_TYPE = #{CLASS_TYPE} )
122 127 </if>
  128 + <if test="HEADMASTER_ID != null and HEADMASTER_ID != ''">
  129 + and ( HEADMASTER_ID = #{HEADMASTER_ID} )
  130 + </if>
123 131  
124 132 </select>
125 133  
... ...
src/com/fh/controller/api/V1.java
  View file @48d4427
... ... @@ -45,6 +45,7 @@ import com.fh.service.sunvote.classtype.ClassTypeManager;
45 45 import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
46 46 import com.fh.service.sunvote.event.EventManager;
47 47 import com.fh.service.sunvote.grade.GradeManager;
  48 +import com.fh.service.sunvote.headmaster.HeadmasterManager;
48 49 import com.fh.service.sunvote.homework.HomeworkManager;
49 50 import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
50 51 import com.fh.service.sunvote.keypad.KeypadManager;
... ... @@ -149,6 +150,9 @@ public class V1 extends BaseController {
149 150  
150 151 @Resource(name = "teacherService")
151 152 private TeacherManager teacherService;
  153 +
  154 + @Resource(name="headmasterService")
  155 + private HeadmasterManager headmasterService;
152 156  
153 157 @Resource(name = "testpaperinfoService")
154 158 private TestPaperInfoManager testpaperinfoService;
... ... @@ -213,7 +217,22 @@ public class V1 extends BaseController {
213 217 if (((pd.containsKey("USERNAME") || (pd.containsKey("ACCOUT") && pd
214 218 .get("ACCOUT") != null)) && pd.containsKey("PASSWORD"))
215 219 || pd.containsKey("KEYPAD_ID")) {
  220 + PageData eventPd = new PageData();
  221 + eventPd.put("EVENT_ID", get32UUID());
  222 + eventPd.put("EVENT_NAME", "login");
  223 + eventPd.put("EVENT_USER", pd.getString("USERNAME"));
  224 + eventPd.put("EVENT_TYPE", "0");
  225 + eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
  226 + if (pd.getString("CLIENT_ID") != null) {
  227 + eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
  228 + } else {
  229 + eventPd.put("CLIENT_ID", "CLIENT");
  230 + }
  231 + eventPd.put("EVENT_IP", getRemoteIp());
  232 + eventService.save(eventPd);
  233 +
216 234 PageData pageData = teacherService.getUserInfo(pd);
  235 + PageData headerMaster = headmasterService.findByUsenameAndPassword(pd);
217 236 if (pageData != null && pageData.getString("ID") != null) {
218 237 pageData.put("PASSWORD", "");// 返回参数中不返回密码
219 238 PageData pt = new PageData();
... ... @@ -231,23 +250,18 @@ public class V1 extends BaseController {
231 250  
232 251 pageData.remove("SUBJECT_IDS");
233 252  
234   - PageData eventPd = new PageData();
235   - eventPd.put("EVENT_ID", get32UUID());
236   - eventPd.put("EVENT_NAME", "login");
237   - eventPd.put("EVENT_USER", pageData.getString("ID"));
238   - eventPd.put("EVENT_TYPE", "0");
239   - eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
240   - if (pd.getString("CLIENT_ID") != null) {
241   - eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
242   - } else {
243   - eventPd.put("CLIENT_ID", "CLIENT");
244   - }
245   - eventPd.put("EVENT_IP", getRemoteIp());
246   - eventService.save(eventPd);
247   -
  253 +
  254 + pageData.put("role", "teacher");
248 255 res.setData(pageData);
249 256 // 填充数据到返回数据中
250   - } else {
  257 + } else if(headerMaster != null && headerMaster.get("HEADMASTER_ID") != null){
  258 + headerMaster.put("PASSWORD", "");
  259 + headerMaster.put("role", "headermaster");
  260 + List<PageData> classInfoList = sclassService.listAll(headerMaster);
  261 + headerMaster.put("classInfoList", classInfoList);
  262 +
  263 +
  264 + }else{
251 265 res.set1Error();
252 266 }
253 267 } else {
... ... @@ -2469,19 +2483,19 @@ public class V1 extends BaseController {
2469 2483 * @param apiName
2470 2484 */
2471 2485 private void event(String apiName) {
2472   - PageData eventPd = new PageData();
2473   - eventPd.put("EVENT_ID", get32UUID());
2474   - eventPd.put("EVENT_NAME", apiName);
2475   - eventPd.put("EVENT_USER", getUsername());
2476   - eventPd.put("EVENT_TYPE", "-1");
2477   - eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
2478   - eventPd.put("CLIENT_ID", "SERVER");
2479   - eventPd.put("EVENT_IP", getRemoteIp());
2480   - try {
2481   - eventService.save(eventPd);
2482   - } catch (Exception e) {
2483   -
2484   - }
  2486 +// PageData eventPd = new PageData();
  2487 +// eventPd.put("EVENT_ID", get32UUID());
  2488 +// eventPd.put("EVENT_NAME", apiName);
  2489 +// eventPd.put("EVENT_USER", getUsername());
  2490 +// eventPd.put("EVENT_TYPE", "-1");
  2491 +// eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
  2492 +// eventPd.put("CLIENT_ID", "SERVER");
  2493 +// eventPd.put("EVENT_IP", getRemoteIp());
  2494 +// try {
  2495 +// eventService.save(eventPd);
  2496 +// } catch (Exception e) {
  2497 +//
  2498 +// }
2485 2499 }
2486 2500  
2487 2501 static int index = 0;
... ...
src/com/fh/controller/sunvote/sclass/SClassController.java
  View file @48d4427
... ... @@ -233,6 +233,30 @@ public class SClassController extends BaseController {
233 233 return mv;
234 234 }
235 235  
  236 + /**去修改页面
  237 + * @param
  238 + * @throws Exception
  239 + */
  240 + @RequestMapping(value="/goEdit2")
  241 + public ModelAndView goEdit2()throws Exception{
  242 + ModelAndView mv = this.getModelAndView();
  243 + PageData pd = new PageData();
  244 + pd = this.getPageData();
  245 + pd = sclassService.findById(pd); //根据ID读取
  246 + mv.setViewName("sunvote/sclass/sclass_edit2");
  247 + List<PageData> schools = schoolService.listAll(pd);
  248 + mv.addObject("schools",schools);
  249 + List<PageData> basestations = basestationService.listAll(pd);
  250 + mv.addObject("basestations",basestations);
  251 + List<PageData> grades = gradeService.listAll(pd);
  252 + mv.addObject("grades", grades);
  253 + List<PageData> classTypes = classtypeService.listAll(pd);
  254 + mv.addObject("classTypes", classTypes);
  255 + mv.addObject("msg", "edit");
  256 + mv.addObject("pd", pd);
  257 + return mv;
  258 + }
  259 +
236 260 /**批量删除
237 261 * @param
238 262 * @throws Exception
... ...
src/com/fh/controller/sunvote/teacher/TeacherController.java
  View file @48d4427
... ... @@ -490,6 +490,26 @@ public class TeacherController extends BaseController {
490 490 mv.addObject("pd", pd);
491 491 return mv;
492 492 }
  493 +
  494 + /**
  495 + * 去修改页面
  496 + *
  497 + * @param
  498 + * @throws Exception
  499 + */
  500 + @RequestMapping(value = "/goEdit2")
  501 + public ModelAndView goEdit2() throws Exception {
  502 + ModelAndView mv = this.getModelAndView();
  503 + PageData pd = new PageData();
  504 + pd = this.getPageData();
  505 + pd = teacherService.findById(pd); // 根据ID读取
  506 + mv.setViewName("sunvote/teacher/teacher_edit2");
  507 + List<PageData> schools = schoolService.listAll(pd);
  508 + mv.addObject("schools", schools);
  509 + mv.addObject("msg", "edit");
  510 + mv.addObject("pd", pd);
  511 + return mv;
  512 + }
493 513  
494 514 /**
495 515 * 批量删除
... ...
src/com/fh/service/sunvote/headmaster/HeadmasterManager.java
  View file @48d4427
... ... @@ -48,6 +48,12 @@ public interface HeadmasterManager{
48 48 */
49 49 public PageData findById(PageData pd)throws Exception;
50 50  
  51 + /**通过id获取数据
  52 + * @param pd
  53 + * @throws Exception
  54 + */
  55 + public PageData findByUsenameAndPassword(PageData pd)throws Exception;
  56 +
51 57 /**批量删除
52 58 * @param ArrayDATA_IDS
53 59 * @throws Exception
... ...
src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java
  View file @48d4427
... ... @@ -70,6 +70,14 @@ public class HeadmasterService implements HeadmasterManager{
70 70 return (PageData)dao.findForObject("HeadmasterMapper.findById", pd);
71 71 }
72 72  
  73 + /**通过用户名或密码获取数据
  74 + * @param pd
  75 + * @throws Exception
  76 + */
  77 + public PageData findByUsenameAndPassword(PageData pd)throws Exception{
  78 + return (PageData)dao.findForObject("HeadmasterMapper.findByUsenameAndPassword", pd);
  79 + }
  80 +
73 81 /**批量删除
74 82 * @param ArrayDATA_IDS
75 83 * @throws Exception
... ...