浏览代码

修复登录重置密码,新增用户禁用,同步数据保存显示

ting.yin 5 年之前
父节点
当前提交
c072567883

+ 7 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/DataSyncController.java

@@ -120,13 +120,19 @@ public class DataSyncController extends BaseExamController {
 
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @RoleRequire(Role.SCHOOL_ADMIN)
-    public String save(HttpServletRequest request, DataSync dataSync) {
+    public String save(HttpServletRequest request, DataSync dataSync, RedirectAttributes redirectAttributes) {
         int examId = getSessionExamId(request);
         if (lockService.trylock(LockType.DATA_SYNC, examId)) {
             DataSyncThread thread = new DataSyncThread(dataSync, pageSize, baseDir, config, lockService,
                     dataSyncService, examService, studentService);
             taskExecutor.submit(thread);
         }
+        DataSync sync = dataSyncService.findByExamId(examId);
+        if (sync == null) {
+            addMessage(redirectAttributes, "同步失败");
+        } else {
+            addMessage(redirectAttributes, "创建成功");
+        }
         return "redirect:/admin/exam-list";
     }
 

+ 1 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/thread/DataSyncThread.java

@@ -92,6 +92,7 @@ public class DataSyncThread implements Runnable {
             if (sync == null) {
                 sync = dataSync;
                 sync.setCreateTime(new Date());
+                dataSyncService.save(sync);
             }
             JSONObject datas = new JSONObject();
             datas.accumulate("examId", sync.getCloudExamId());

+ 0 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -102,7 +102,6 @@ public class UserController extends BaseController {
             if (message == null) {
                 user.setPassword(Md5EncryptUtils.md5(user.getPassword()));
                 user.setSchoolId(current.getSchoolId());
-                user.setEnable(true);
                 user.setCreatedTime(new Date());
                 userService.save(user);
             } else {

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/reset.jsp

@@ -64,7 +64,7 @@
 	   </div>
 	   <div class="right">
 	     <div class="title">
-	       <h1 data-i18n-text="user.reset.title">首次登,请完善资料</h1>
+	       <h1 data-i18n-text="user.reset.title">首次登,请完善资料</h1>
 	       <br/>
 	     </div>
 	     <div class="loginbox">