synclog

src/main/java/com/yunhai/bschclassmanage/aspect/SyncLogAspect.java

@@ -51,7 +51,6 @@ public class SyncLogAspect {
         // 大类：Send / Sync（由 key 前缀推导）
         boolean isSend = dataType.getKey() != null && dataType.getKey().startsWith("Send");
         entity.setSyncType(isSend ? "Send" : "Sync");
-        entity.setSyncTypeKey(isSend ? "Send" : "Sync");
         entity.setSyncTypeName(isSend ? "推送" : "同步");
 
         entity.setClassMethod(classMethod);
@@ -67,9 +66,11 @@ public class SyncLogAspect {
             result = pjp.proceed();
         } catch (Throwable t) {
             entity.setErrorMsg(truncate(t.getMessage(), MAX_ERROR_MSG));
+            entity.setStatus(0);
             syncLogService.saveAsync(entity);
             throw t;
         }
+        entity.setStatus(1);
         syncLogService.saveAsync(entity);
         return result;
     }

src/main/java/com/yunhai/bschclassmanage/entity/SyncLog.java

@@ -38,10 +38,6 @@ public class SyncLog implements Serializable {
     @Column(name = "sync_type", nullable = false, length = 16)
     private String syncType;
 
-    /** 大类 key：Sync / Send */
-    @Column(name = "sync_type_key", nullable = false, length = 16)
-    private String syncTypeKey;
-
     /** 大类名称：同步 / 推送 */
     @Column(name = "sync_type_name", length = 32)
     private String syncTypeName;
@@ -74,6 +70,10 @@ public class SyncLog implements Serializable {
     @Column(name = "error_msg", columnDefinition = "TEXT")
     private String errorMsg;
 
+    /** 执行状态：1 成功 / 0 失败（NULL 表示未判定） */
+    @Column(name = "status")
+    private Integer status;
+
     @CreationTimestamp
     @Column(name = "create_time", nullable = false, updatable = false, columnDefinition = "DATETIME(3)")
     private LocalDateTime createTime;

src/main/java/com/yunhai/bschclassmanage/service/impl/sync/SyncUserBaseService.java

@@ -51,13 +51,13 @@ public class SyncUserBaseService implements ISyncUserBaseService {
         YschBaseOpenApi.editGroup(id,group);
     }
 
-    //@@SyncOpLog(SyncDataType.SEND_DELETE_GROUP)
+    @SyncOpLog(SyncDataType.SEND_DELETE_GROUP)
     public void deleteGroup(Integer id){
         YschBaseOpenApi.deleteGroup(id);
     }
 
 
-    //@@SyncOpLog(SyncDataType.SEND_ADD_TEACHER)
+    @SyncOpLog(SyncDataType.SEND_ADD_TEACHER)
     public BoaUser addTeacher(SchTeacher teacher,String pwd, Integer groupId){
         SysUserRequest sysUser=new SysUserRequest();
         sysUser.setAccount(teacher.getAccount());
@@ -70,26 +70,28 @@ public class SyncUserBaseService implements ISyncUserBaseService {
         sysUser.setRoles(Arrays.asList(UserRole.TEACHER_USER.getValue()));
         if (StringUtils.isNotBlank(pwd)) {
             sysUser.setPassword(pwd);
+            sysUser.setConfirmPassword(pwd);
         }
         return YschBaseOpenApi.addUser(sysUser);
     }
 
-    //@@SyncOpLog(SyncDataType.SEND_ADD_STUDENT)
+    @SyncOpLog(SyncDataType.SEND_ADD_STUDENT)
     public BoaUser addStudent(SchStudent student,String pwd){
-        SysUserRequest user=new SysUserRequest();
+        SysUserRequest sysUser=new SysUserRequest();
-        user.setAccount(student.getAccount());
+        sysUser.setAccount(student.getAccount());
-        user.setRealName(student.getName());
+        sysUser.setRealName(student.getName());
-        user.setGender(student.getGender());
+        sysUser.setGender(student.getGender());
-        user.setIdcard(student.getIdCard());
+        sysUser.setIdcard(student.getIdCard());
-        user.setGroupId(student.getGroupId());
+        sysUser.setGroupId(student.getGroupId());
-        user.setRoles(Arrays.asList(UserRole.STU_USER.getValue()));
+        sysUser.setRoles(Arrays.asList(UserRole.STU_USER.getValue()));
         if (StringUtils.isNotBlank(pwd)) {
-            user.setPassword(pwd);
+            sysUser.setPassword(pwd);
+            sysUser.setConfirmPassword(pwd);
         }
-        return YschBaseOpenApi.addUser(user);
+        return YschBaseOpenApi.addUser(sysUser);
     }
 
-    //@@SyncOpLog(SyncDataType.SEND_EDIT_TEACHER)
+    @SyncOpLog(SyncDataType.SEND_EDIT_TEACHER)
     public BoaUser editTeacher(SchTeacher teacher,String pwd, Integer groupId){
         if (teacher.getTeaId()==null||teacher.getTeaId()<=0){
             throw new DException("教师Id不允许为null");
@@ -108,7 +110,7 @@ public class SyncUserBaseService implements ISyncUserBaseService {
         return YschBaseOpenApi.editUser(teacher.getTeaId(),user);
     }
 
-    //@@SyncOpLog(SyncDataType.SEND_EDIT_STUDENT)
+    @SyncOpLog(SyncDataType.SEND_EDIT_STUDENT)
     public BoaUser editStudent(SchStudent student,String pwd){
         if (student.getStuId()==null||student.getStuId()<=0){
             throw new DException("学生Id不允许为null");
@@ -127,14 +129,14 @@ public class SyncUserBaseService implements ISyncUserBaseService {
     }
 
 
-    //@@SyncOpLog(SyncDataType.SEND_DELETE_TEACHER)
+    @SyncOpLog(SyncDataType.SEND_DELETE_TEACHER)
     public void deleteTeacher(List<Integer> userIds,Integer groupId){
         for (Integer userId :userIds) {
             YschBaseOpenApi.deleteUser(userId,groupId);
         }
     }
 
-    //@@SyncOpLog(SyncDataType.SEND_DELETE_STUDENT)
+    @SyncOpLog(SyncDataType.SEND_DELETE_STUDENT)
     public void deleteStudent(List<Integer> userIds,Integer groupId){
         for (Integer userId :userIds) {
             YschBaseOpenApi.deleteUser(userId,groupId);