Commit 5684bebedde4ab7305df505602748d93b8d76030

Authored by 孙向锦
1 parent d184cfe4

修改密码

WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
... ... @@ -185,7 +185,7 @@
185 185 <p onclick="event.stopPropagation();pagetemplate('${SCHOOL_ID}')">模板设置</p>
186 186 </li>
187 187  
188   - <li>
  188 + <li style="display:none">
189 189 <p onclick="event.stopPropagation();other('${SCHOOL_ID}')">其他配置</p>
190 190 </li>
191 191 </ul>
... ...
resources/mybatis1/sunvote/HomeworkMapper.xml
... ... @@ -311,6 +311,7 @@
311 311 sv_homework.ALL_SCORE as PAPER_SCORE,
312 312 sv_homework.GET_SCORE as AVG_SCORE,
313 313 sv_homework.HOMEWORK_ID,
  314 + sv_homework.COMPLETE_DESC,
314 315 sv_homework.NAME,
315 316 sv_homework.GET_MAX_SCORE,
316 317 sv_homeworkreport.STUDNET_NO,
... ...
resources/mybatis1/sunvote/TeacherMapper.xml
... ... @@ -85,17 +85,39 @@
85 85 update
86 86 <include refid="tableName"></include>
87 87 set
  88 + <if test="SCHOOL_ID !=null and SCHOOL_ID">
88 89 SCHOOL_ID = #{SCHOOL_ID},
  90 + </if>
  91 + <if test="NAME !=null and NAME">
89 92 NAME = #{NAME},
  93 + </if>
  94 + <if test="PHONE !=null and PHONE">
90 95 PHONE = #{PHONE},
  96 + </if>
  97 + <if test="SEAT_PHONE !=null and SEAT_PHONE">
91 98 SEAT_PHONE = #{SEAT_PHONE},
  99 + </if>
  100 + <if test="CARD_NO !=null and CARD_NO">
92 101 CARD_NO = #{CARD_NO},
  102 + </if>
  103 + <if test="ACCOUT !=null and ACCOUT">
93 104 ACCOUT = #{ACCOUT},
  105 + </if>
  106 + <if test="PASSWORD !=null and PASSWORD">
94 107 PASSWORD = #{PASSWORD},
  108 + </if>
  109 + <if test="SEX !=null and SEX">
95 110 SEX = #{SEX},
  111 + </if>
  112 + <if test="SUBJECT_IDS !=null and SUBJECT_IDS">
96 113 SUBJECT_IDS = #{SUBJECT_IDS},
  114 + </if>
  115 + <if test="KEYPAD_ID !=null and KEYPAD_ID">
97 116 KEYPAD_ID = #{KEYPAD_ID},
  117 + </if>
  118 + <if test="HEADMASTER !=null and HEADMASTER">
98 119 HEADMASTER = #{HEADMASTER},
  120 + </if>
99 121 ID = ID
100 122 where
101 123 ID = #{ID}
... ...
src/com/fh/controller/sunvote/teacher/TeacherController.java
... ... @@ -189,6 +189,7 @@ public class TeacherController extends BaseController {
189 189 ModelAndView mv = this.getModelAndView();
190 190 PageData pd = new PageData();
191 191 pd = this.getPageData();
  192 + PageData n = teacherService.findById(pd);
192 193 teacherService.edit(pd);
193 194 pd.put("USER_ID", pd.getString("ID")); // ID 主键
194 195 pd.put("LAST_LOGIN", ""); // 最后登录时间
... ... @@ -211,6 +212,46 @@ public class TeacherController extends BaseController {
211 212 mv.setViewName("save_result2");
212 213 return mv;
213 214 }
  215 +
  216 +
  217 + /**
  218 + * 修改
  219 + *
  220 + * @param
  221 + * @throws Exception
  222 + */
  223 + @RequestMapping(value = "/updatePassword", produces = "application/json;charset=UTF-8")
  224 + @ResponseBody
  225 + public String updatePassword() throws Exception {
  226 + PageData pd = new PageData();
  227 + pd = this.getPageData();
  228 + PageData n = teacherService.findById(pd);
  229 + ResponseGson<String> ret = new ResponseGson<String>();
  230 + if(n.get("PASSWORD").equals(pd.get("OLDPASSWORD"))){
  231 + teacherService.edit(pd);
  232 + pd.put("USER_ID", pd.getString("ID")); // ID 主键
  233 + pd.put("LAST_LOGIN", ""); // 最后登录时间
  234 + pd.put("IP", ""); // IP
  235 + pd.put("STATUS", "0"); // 状态
  236 + pd.put("SKIN", "default");
  237 + pd.put("RIGHTS", "");
  238 + pd.put("USERNAME", pd.getString("ACCOUT"));
  239 + pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
  240 + pd.put("PASSWORD",
  241 + new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
  242 + .getString("PASSWORD")).toString()); // 密码加密
  243 +
  244 + if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
  245 + userService.saveU(pd); // 执行保存
  246 + FHLOG.save(Jurisdiction.getUsername(),
  247 + "新增系统用户:" + pd.getString("USERNAME"));
  248 + }
  249 + ret.setData("Success");
  250 + }else{
  251 + ret.setData("Fail");
  252 + }
  253 + return ret.toJson();
  254 + }
214 255  
215 256 /**
216 257 * 列表
... ... @@ -598,6 +639,7 @@ public class TeacherController extends BaseController {
598 639 pd = this.getPageData();
599 640 pd.put("ID", pd.get("TEACHER_ID"));
600 641 pd = teacherService.findById(pd); // 根据ID读取
  642 + pd.put("PASSWORD", "");
601 643 mv.setViewName("sunvote/teacher/teacher_edit3");
602 644 List<PageData> schools = schoolService.listAll(pd);
603 645 mv.addObject("schools", schools);
... ...