修改接口路径

web/src/main/java/cn/jlw/Interceptor/ResponseControllerAdvice.java

@@ -6,30 +6,26 @@ import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.service.SysLogService;
 import org.apache.commons.lang3.StringUtils;
-import org.beetl.ext.fn.Json;
-import javax.annotation.Resource;
 import org.springframework.core.MethodParameter;
-import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import static cn.jlw.Interceptor.ActionLog.sysLogMap;
+import static com.ibeetl.admin.core.service.CorePlatformService.T_STUDENT;
 
 /**
   * @author TLT
@@ -74,7 +70,7 @@ public class ResponseControllerAdvice implements ResponseBodyAdvice<Object> {
         @Override
         public Boolean call() {
             try {
-                actionLog.run(uuid,JSONArray.toJSONString(o),new Date(),sysLogService);
+                ActionLog.run(uuid,JSONArray.toJSONString(o),new Date(),sysLogService);
                 return true;
             }catch (Exception e){
                 e.printStackTrace();
@@ -135,7 +131,7 @@ public class ResponseControllerAdvice implements ResponseBodyAdvice<Object> {
             }
         }
 
-        request.removeAttribute("t_student");
+        request.removeAttribute(T_STUDENT);
         request.removeAttribute("r_isWx");
         request.removeAttribute("token");
         request.removeAttribute("loginTime");

web/src/main/java/cn/jlw/util/CacheUserUtil.java

@@ -6,6 +6,7 @@ import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.jlw.entity.Student;
 
 import static com.ibeetl.admin.core.service.CorePlatformService.ACCESS_CURRENT_ORG;
+import static com.ibeetl.admin.core.service.CorePlatformService.T_STUDENT;
 import static com.ibeetl.admin.core.util.servlet.ServletUtils.getRequest;
 
 /**
@@ -27,7 +28,7 @@ public final class CacheUserUtil {
 
     public static Student getStudent() {
         checkSession();
-        return (Student)getRequest().getAttribute("t_student");
+        return (Student)getRequest().getAttribute(T_STUDENT);
     }
 
     public static void checkSession() {

web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherIndexData.java

@@ -0,0 +1,32 @@
+package com.ibeetl.jlw.entity.api.teacher;
+
+import com.ibeetl.admin.core.annotation.DictDeep;
+import com.ibeetl.admin.core.entity.CoreUser;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 教师端-首页实体
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Accessors(chain = true)
+public class TeacherIndexData {
+
+    /**
+     * 当前登录用户信息
+     */
+    @DictDeep
+    private CoreUser coreUser;
+
+    /**
+     * 根据身份获取到信息
+     */
+    private Object identityInfo;
+
+}

web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java

@@ -8,6 +8,7 @@ import com.ibeetl.admin.core.util.PlatformException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 
 import static com.ibeetl.admin.core.service.CorePlatformService.*;
 
@@ -28,7 +29,7 @@ public class WebPlatformService {
      * 根据身份，将用户信息存到Session中
      * @param user
      */
-    public void setUserInfoToSessionByIdentity(CoreUser user) {
+    public void setUserInfoToSessionByIdentity(@NotNull(message = "登录用户不能为空！") CoreUser user) {
         Long userId = user.getId();
 
         switch (EnumUtil.fromString(MenuEnums.class, user.getJobType1())) {
@@ -51,7 +52,7 @@ public class WebPlatformService {
      * 根据身份，从Session中获取用户信息
      * @param user
      */
-    public Object getUserInfoFromSessionByIdentity(CoreUser user) {
+    public Object getUserInfoFromSessionByIdentity(@NotNull(message = "登录用户不能为空！") CoreUser user) {
         switch (EnumUtil.fromString(MenuEnums.class, user.getJobType1())) {
             case JT_S_01: {
                 return httpRequestLocal.getSessionValue(ACCESS_CURRENT_USER);
@@ -67,6 +68,6 @@ public class WebPlatformService {
             }
         }
 
-        throw new PlatformException("用户身份异常！");
+        throw new PlatformException("获取用户信息失败！");
     }
 }

web/src/main/java/com/ibeetl/jlw/service/api/teacher/TeacherIndexService.java

@@ -0,0 +1,26 @@
+package com.ibeetl.jlw.service.api.teacher;
+
+import com.ibeetl.jlw.entity.api.teacher.TeacherIndexData;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  教师端
+ * </p>
+ *
+ * @author mlx
+ * @date 2022/10/20
+ * @modified
+ */
+@Service
+public class TeacherIndexService {
+
+
+    /**
+     * 教师端-首页数据
+     * @return
+     */
+    public TeacherIndexData index() {
+        return new TeacherIndexData();
+    }
+}

web/src/main/java/com/ibeetl/jlw/web/api/IndexBaseController.java

@@ -1,4 +1,4 @@
-package com.ibeetl.jlw.web.module;
+package com.ibeetl.jlw.web.api;
 
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.CurrentUserInfo;

web/src/main/java/com/ibeetl/jlw/web/api/teacher/TeacherIndexController.java

@@ -1,8 +1,8 @@
-package com.ibeetl.jlw.web.module.teacher;
+package com.ibeetl.jlw.web.api.teacher;
 
 import com.ibeetl.admin.core.web.JsonResult;
-import com.ibeetl.jlw.entity.CurrentUserInfo;
+import com.ibeetl.jlw.entity.api.teacher.TeacherIndexData;
-import com.ibeetl.jlw.service.IndexBaseService;
+import com.ibeetl.jlw.service.api.teacher.TeacherIndexService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,13 +15,12 @@ public class TeacherIndexController {
 
     private final Log log = LogFactory.getLog(this.getClass());
 
-    private static final String MODEL = "/jlw/teacherIndex";
     private static final String API = "/api/teacherIndex";
 
-    @Resource private IndexBaseService indexBaseService;
+    @Resource private TeacherIndexService teacherIndexService;
 
-    @PostMapping(API + "/index.json")
+    @PostMapping(API + "/index.do")
-    public JsonResult<CurrentUserInfo> index() {
+    public JsonResult<TeacherIndexData> index() {
-        return JsonResult.success(indexBaseService.userInfo());
+        return JsonResult.success(teacherIndexService.index());
     }
 }