fix

src/main/java/cn/com/qmth/markingaudit/controller/MonitorController.java

@@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.qmth.boot.api.annotation.Aac;
 
-import cn.com.qmth.markingaudit.bean.AccessInfo;
-import cn.com.qmth.markingaudit.bean.CustConstants;
 import cn.com.qmth.markingaudit.service.MonitorService;
+import cn.com.qmth.markingaudit.support.AccessInfo;
+import cn.com.qmth.markingaudit.support.CustConstants;
 import cn.com.qmth.markingaudit.utils.ServletUtil;
 import io.swagger.annotations.ApiOperation;
 
@@ -23,7 +23,7 @@ public class MonitorController {
 
     @ApiOperation(value = "考试数据")
     @PostMapping("examDataSync")
-    public String examData() {
+    public String examData() throws Exception {
         AccessInfo ai = ServletUtil.getAccessInfo();
         return monitorService.examData(ai.getSchoolCode());
     }

src/main/java/cn/com/qmth/markingaudit/enums/DataType.java

@@ -1,32 +0,0 @@
-package cn.com.qmth.markingaudit.enums;
-
-/**数据源类型
- *
- */
-public enum DataType {
-
-	MARKING_CLOUD("云阅卷"),
-	TEACH_CLOUD("知学知考"),
-	;
-
-	private DataType(String name){
-		this.name = name;
-	}
-
-	private String name;
-
-	public String getName() {
-		return name;
-	}
-
-	
-	public static DataType getByName(String name) {
-    	for(DataType r:DataType.values()) {
-    		if(r.getName().equals(name)) {
-    			return r;
-    		}
-    	}
-    	return null;
-    }
-
-}

src/main/java/cn/com/qmth/markingaudit/enums/ImportFileName.java

@@ -1,30 +0,0 @@
-package cn.com.qmth.markingaudit.enums;
-
-public enum ImportFileName {
-
-	QUESTION_IMPORT("question-import.xlsx"),
-	STUDENT_IMPORT("student-import.xlsx"),
-	SCORE_IMPORT("score-import.xlsx"),
-	;
-
-	private ImportFileName(String name){
-		this.name = name;
-	}
-
-	private String name;
-
-	public String getName() {
-		return name;
-	}
-
-	
-	public static ImportFileName getByName(String name) {
-    	for(ImportFileName r:ImportFileName.values()) {
-    		if(r.getName().equals(name)) {
-    			return r;
-    		}
-    	}
-    	return null;
-    }
-
-}

src/main/java/cn/com/qmth/markingaudit/enums/LockType.java

@@ -1,21 +0,0 @@
-package cn.com.qmth.markingaudit.enums;
-
-public enum LockType {
-	STUDENT_IMPORT("student_import"),
-	QUESTION_IMPORT("question_import"),
-	MARKING_SCORE_IMPORT("marking_score_import"),
-	OCR("ocr"),
-    AI_MARKING("ai_marking"),
-    ;
-
-    private String name;
-
-    private LockType(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-}

src/main/java/cn/com/qmth/markingaudit/service/impl/AuthServiceImpl.java

@@ -8,8 +8,8 @@ import com.qmth.boot.core.security.annotation.AuthorizationComponent;
 import com.qmth.boot.core.security.service.AuthorizationService;
 import com.qmth.boot.tools.signature.SignatureType;
 
-import cn.com.qmth.markingaudit.bean.AccessInfo;
-import cn.com.qmth.markingaudit.bean.CustConstants;
+import cn.com.qmth.markingaudit.support.AccessInfo;
+import cn.com.qmth.markingaudit.support.CustConstants;
 import cn.com.qmth.markingaudit.utils.MD5Util;
 
 @Service

src/main/java/cn/com/qmth/markingaudit/bean/AccessInfo.java → src/main/java/cn/com/qmth/markingaudit/support/AccessInfo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.markingaudit.bean;
+package cn.com.qmth.markingaudit.support;
 
 import com.qmth.boot.core.security.model.AccessEntity;
 

src/main/java/cn/com/qmth/markingaudit/bean/CustConstants.java → src/main/java/cn/com/qmth/markingaudit/support/CustConstants.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.markingaudit.bean;
+package cn.com.qmth.markingaudit.support;
 
 /**
  * @Description: 系统常量

src/main/java/cn/com/qmth/markingaudit/support/ResponseAdvice.java

@@ -0,0 +1,38 @@
+package cn.com.qmth.markingaudit.support;
+
+import org.springframework.core.MethodParameter;
+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.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+import com.alibaba.fastjson.JSON;
+import com.qmth.boot.api.exception.ExceptionResponseEntity;
+
+@RestControllerAdvice
+public class ResponseAdvice implements ResponseBodyAdvice<Object> {
+
+    @Override
+    public boolean supports(MethodParameter returnType, Class<? extends HttpMessageConverter<?>> converterType) {
+        return true;
+    }
+
+    @Override
+    public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
+            Class<? extends HttpMessageConverter<?>> selectedConverterType, ServerHttpRequest request,
+            ServerHttpResponse response) {
+        if (body instanceof String) {
+            return JSON.toJSONString(Result.of(body));
+        }
+        if (body instanceof Result) {
+            return body;
+        }
+        if (body instanceof ExceptionResponseEntity) {
+            ExceptionResponseEntity t = (ExceptionResponseEntity) body;
+            return Result.of(t.getMessage());
+        }
+        return Result.of(body);
+    }
+}

src/main/java/cn/com/qmth/markingaudit/support/Result.java

@@ -0,0 +1,59 @@
+package cn.com.qmth.markingaudit.support;
+
+public class Result<T> {
+
+    private Integer code;
+
+    private String msg;
+
+    private T data;
+
+    public Result(Integer code, String msg) {
+        super();
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public Result(Integer code, String msg, T data) {
+        super();
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public Result() {
+        super();
+    }
+
+    public static <T> Result<T> of(T data) {
+        Result<T> r = new Result<T>();
+        r.code = 0;
+        r.data = data;
+        return r;
+    }
+
+}

src/main/java/cn/com/qmth/markingaudit/utils/AuthorizationCreateUtil.java

@@ -2,7 +2,7 @@ package cn.com.qmth.markingaudit.utils;
 
 import java.security.NoSuchAlgorithmException;
 
-import cn.com.qmth.markingaudit.bean.CustConstants;
+import cn.com.qmth.markingaudit.support.CustConstants;
 
 /**
  * 后台生成签名工具类

src/main/java/cn/com/qmth/markingaudit/utils/ServletUtil.java

@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import cn.com.qmth.markingaudit.bean.AccessInfo;
+import cn.com.qmth.markingaudit.support.AccessInfo;
 
 public class ServletUtil {