|
@@ -1,5 +1,6 @@
|
|
|
package org.dromara.server.consume.controller.v1;
|
|
package org.dromara.server.consume.controller.v1;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.dromara.common.core.domain.R;
|
|
import org.dromara.common.core.domain.R;
|
|
@@ -44,10 +45,10 @@ public class TermsController {
|
|
|
|
|
|
|
|
// 4. 处理业务结果
|
|
// 4. 处理业务结果
|
|
|
if (R.isError(result)) {
|
|
if (R.isError(result)) {
|
|
|
- log.error("{}-[失败: {}]", logPrefix, result.getMsg());
|
|
|
|
|
|
|
+ log.error("{}-[失败:{}]", logPrefix, result.getMsg());
|
|
|
return ErrorResult.badRequestResponse("获取设备信息失败: " + result.getMsg());
|
|
return ErrorResult.badRequestResponse("获取设备信息失败: " + result.getMsg());
|
|
|
}
|
|
}
|
|
|
- log.info("{}-[成功: {}]", logPrefix, result.getData());
|
|
|
|
|
|
|
+ log.info("{}-[成功:{}]-[耗时 {} ms]", logPrefix, JSONUtil.toJsonStr(result.getData()), System.currentTimeMillis() - startTime);
|
|
|
return ResponseEntity.ok(result.getData());
|
|
return ResponseEntity.ok(result.getData());
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -55,8 +56,6 @@ public class TermsController {
|
|
|
log.error("{}-[系统异常: {}]-[详情: {}]",
|
|
log.error("{}-[系统异常: {}]-[详情: {}]",
|
|
|
logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
|
|
logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
|
|
|
return ErrorResult.innternalErrorResponse("服务暂时不可用,请稍后重试");
|
|
return ErrorResult.innternalErrorResponse("服务暂时不可用,请稍后重试");
|
|
|
- } finally {
|
|
|
|
|
- log.info("{}-[结束,耗时: {}ms]", logPrefix, System.currentTimeMillis() - startTime);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -69,7 +68,6 @@ public class TermsController {
|
|
|
@GetMapping("/CheckTime/{termNo}")
|
|
@GetMapping("/CheckTime/{termNo}")
|
|
|
public Object checkTermTime(@PathVariable("termNo") Integer termNo) {
|
|
public Object checkTermTime(@PathVariable("termNo") Integer termNo) {
|
|
|
final String logPrefix = String.format("[设备校时]-[termNo:%s]", termNo);
|
|
final String logPrefix = String.format("[设备校时]-[termNo:%s]", termNo);
|
|
|
- log.info("{}-[开始]", logPrefix);
|
|
|
|
|
long startTime = System.currentTimeMillis();
|
|
long startTime = System.currentTimeMillis();
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
@@ -83,10 +81,10 @@ public class TermsController {
|
|
|
|
|
|
|
|
// 4. 处理业务结果
|
|
// 4. 处理业务结果
|
|
|
if (R.isError(result)) {
|
|
if (R.isError(result)) {
|
|
|
- log.error("{}-[失败: {}]", logPrefix, result.getMsg());
|
|
|
|
|
|
|
+ log.error("{}-[失败:{}]", logPrefix, result.getMsg());
|
|
|
return ErrorResult.badRequestResponse("设备校时失败: " + result.getMsg());
|
|
return ErrorResult.badRequestResponse("设备校时失败: " + result.getMsg());
|
|
|
}
|
|
}
|
|
|
- log.info("{}-[成功: {}]", logPrefix, result.getData());
|
|
|
|
|
|
|
+ log.info("{}-[成功:{}]-[耗时 {} ms]", logPrefix, result.getData(), System.currentTimeMillis() - startTime);
|
|
|
return ResponseEntity.ok(result.getData());
|
|
return ResponseEntity.ok(result.getData());
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -94,8 +92,6 @@ public class TermsController {
|
|
|
log.error("{}-[系统异常: {}]-[详情: {}]",
|
|
log.error("{}-[系统异常: {}]-[详情: {}]",
|
|
|
logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
|
|
logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
|
|
|
return ErrorResult.innternalErrorResponse("服务暂时不可用,请稍后重试");
|
|
return ErrorResult.innternalErrorResponse("服务暂时不可用,请稍后重试");
|
|
|
- } finally {
|
|
|
|
|
- log.info("{}-[结束,耗时: {}ms]", logPrefix, System.currentTimeMillis() - startTime);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|