From 64e0d665c708631a06d570cfffae02f7ac346352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E4=B8=9C?= <13396135+anton-aoi@user.noreply.gitee.com> Date: Mon, 20 Nov 2023 19:52:57 +0800 Subject: [PATCH] =?UTF-8?q?Result=E4=BF=AE=E6=94=B9=E4=B8=BAR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/february/common/domain/Constants.java | 18 ----- .../common/domain/HistoricalDetail.java | 2 +- .../com/february/common/domain/Result.java | 76 ------------------- february-vehicle-server/pom.xml | 42 +++++----- .../controller/TrajectoryController.java | 21 +++-- .../trajectory/service/TrajectoryService.java | 6 +- .../service/impl/TrajectoryServiceImpl.java | 13 ++-- 7 files changed, 45 insertions(+), 133 deletions(-) delete mode 100644 february-vehicle-common/src/main/java/com/february/common/domain/Constants.java delete mode 100644 february-vehicle-common/src/main/java/com/february/common/domain/Result.java diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/Constants.java b/february-vehicle-common/src/main/java/com/february/common/domain/Constants.java deleted file mode 100644 index 8d87b54..0000000 --- a/february-vehicle-common/src/main/java/com/february/common/domain/Constants.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.february.system.domain.constants; - -/** - * @description: 系统常量 - * @author - */ -public class Constants { - /** - * 成功标记 - */ - public static final Integer SUCCESS = 200; - public static final String SUCCESS_MSG = "操作成功"; - /** - * 失败标记 - */ - public static final Integer ERROR = 500; - public static final String ERROR_MSG = "操作异常"; -} diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/HistoricalDetail.java b/february-vehicle-common/src/main/java/com/february/common/domain/HistoricalDetail.java index 8b535ed..9d246a0 100644 --- a/february-vehicle-common/src/main/java/com/february/common/domain/HistoricalDetail.java +++ b/february-vehicle-common/src/main/java/com/february/common/domain/HistoricalDetail.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * + * 历史轨迹详情 */ @Data @Builder diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/Result.java b/february-vehicle-common/src/main/java/com/february/common/domain/Result.java deleted file mode 100644 index 80919c0..0000000 --- a/february-vehicle-common/src/main/java/com/february/common/domain/Result.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.february.common.domain; - -import com.february.system.domain.constants.Constants; -import lombok.Data; - -import java.io.Serializable; - -/** - * @author - * @description: 响应信息主体 - */ -@Data -public class Result implements Serializable { - - private static final long serialVersionUID = 1L; - /** - * 成功 - */ - public static final int SUCCESS = Constants.SUCCESS; - /** - * 失败 - */ - public static final int FAIL = Constants.ERROR; - /** - * 返回状态码 - */ - private int code; - /** - * 响应信息 - */ - private String msg; - /** - * 响应数据 - */ - private T data; - - public static Result success() { - return restResult(null, SUCCESS, Constants.SUCCESS_MSG); - } - - public static Result success(T data) { - return restResult(data, SUCCESS, Constants.SUCCESS_MSG); - } - - public static Result success(T data, String msg) { - return restResult(data, SUCCESS, msg); - } - - public static Result error() { - return restResult(null, FAIL, Constants.ERROR_MSG); - } - - public static Result error(String msg) { - return restResult(null, FAIL, msg); - } - - public static Result error(T data) { - return restResult(data, FAIL, Constants.ERROR_MSG); - } - - public static Result error(T data, String msg) { - return restResult(data, FAIL, msg); - } - - public static Result error(int code, String msg) { - return restResult(null, code, msg); - } - - private static Result restResult(T data, int code, String msg) { - Result apiResult = new Result<>(); - apiResult.setCode(code); - apiResult.setData(data); - apiResult.setMsg(msg); - return apiResult; - } -} diff --git a/february-vehicle-server/pom.xml b/february-vehicle-server/pom.xml index 5d4f974..e936d57 100644 --- a/february-vehicle-server/pom.xml +++ b/february-vehicle-server/pom.xml @@ -27,39 +27,41 @@ compile + + com.february + february-vehicle-remote + 3.6.3 + compile + + - - - - - + + com.february + february-common-log + 3.6.3 + + com.february february-common-datascope 3.6.3 + + + + com.february + february-common-core + 3.6.3 + + + com.february february-common-datasource 3.6.3 - - com.february - february-common-redis - 3.6.3 - - - - - - - - org.redisson - redisson - 3.16.0 - diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java index 6087be8..0b316ca 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java @@ -1,8 +1,9 @@ package com.vehicle.trajectory.controller; +import com.alibaba.nacos.api.model.v2.Result; +import com.february.common.core.domain.R; import com.february.common.domain.Car; import com.february.common.domain.RealData; -import com.february.common.domain.Result; import com.vehicle.trajectory.service.TrajectoryService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; - import java.util.List; @Log4j2 @@ -23,21 +23,26 @@ public class TrajectoryController { @Autowired private HttpServletRequest request; - + /** + * 实时数据 + */ @GetMapping("/realDateList") - public Result> realDateList() { + public R> realDateList() { log.info("功能名称：【实时数据查看】，请求路径：【{}】，请求方式：【{}】", request.getRequestURI(), request.getMethod()); - Result> result = trajectoryService.realDateList(); + R> result = trajectoryService.realDateList(); log.info("请求结果：【{}】", result); return result; } + + + /** - * 查询车辆信息 + * 车辆信息 */ @GetMapping("/carList") - public Result> carList() { + public R> carList() { log.info("功能名称：【查看在线车辆】，请求路径：【{}】，请求方式：【{}】", request.getRequestURI(), request.getMethod()); - Result> result = trajectoryService.carList(); + R> result = trajectoryService.carList(); log.info("请求结果：【{}】", result); return result; } diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java index e970d5a..986de3d 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/TrajectoryService.java @@ -1,13 +1,13 @@ package com.vehicle.trajectory.service; +import com.february.common.core.domain.R; import com.february.common.domain.Car; import com.february.common.domain.RealData; -import com.february.common.domain.Result; import java.util.List; public interface TrajectoryService { - Result> realDateList(); + R> realDateList(); - Result> carList(); + R> carList(); } diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java index 2283c83..f2afb1e 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/service/impl/TrajectoryServiceImpl.java @@ -3,9 +3,9 @@ package com.vehicle.trajectory.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.february.common.core.domain.R; import com.february.common.domain.Car; import com.february.common.domain.RealData; -import com.february.common.domain.Result; import com.february.common.redis.service.RedisService; import com.vehicle.trajectory.mapper.TrajectoryMapper; import com.vehicle.trajectory.service.TrajectoryService; @@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Service; - import java.util.ArrayList; import java.util.List; @@ -24,15 +23,15 @@ public class TrajectoryServiceImpl implements TrajectoryService { private TrajectoryMapper mapper; @Override - public Result> realDateList() { + public R> realDateList() { List realData = mapper.realDateList(); - return Result.success(realData); + return R.ok(realData); } @Autowired private RedisService redisService; @Override - public Result> carList() { + public R> carList() { Boolean aBoolean = redisService.hasKey("状态为上线的车辆信息"); if (Boolean.TRUE.equals(aBoolean)){ List list = redisService.redisTemplate.opsForList().range("状态为上线的车辆信息", 0, -1); @@ -43,13 +42,13 @@ public class TrajectoryServiceImpl implements TrajectoryService { Car notice = JSON.parseObject(o1, Car.class); carArrayList.add(notice); } - return Result.success(carArrayList); + return R.ok(carArrayList); } } List carList = mapper.carList(); //上线车辆的信息 for (Car car : carList) { redisService.redisTemplate.opsForList().leftPush("状态为上线的车辆信息", JSONObject.toJSONString(car)); } - return Result.success(carList); + return R.ok(carList); } }