From 8332d53c6492c280de1b226e530322ead73acd97 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: Tue, 21 Nov 2023 10:46:50 +0800 Subject: [PATCH] =?UTF-8?q?R=E4=BF=AE=E6=94=B9=E4=B8=BAResult?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- february-vehicle-server/pom.xml | 27 +++++-------------- .../controller/TrajectoryController.java | 12 ++++----- .../trajectory/service/TrajectoryService.java | 8 +++--- .../service/impl/TrajectoryServiceImpl.java | 16 +++++------ 4 files changed, 23 insertions(+), 40 deletions(-) diff --git a/february-vehicle-server/pom.xml b/february-vehicle-server/pom.xml index e936d57..e972fad 100644 --- a/february-vehicle-server/pom.xml +++ b/february-vehicle-server/pom.xml @@ -22,24 +22,16 @@ com.february - february-vehicle-remote + february-vehicle-common 3.6.3 - compile - - - - com.february - february-vehicle-remote - 3.6.3 - compile - - com.february - february-common-log - 3.6.3 - + + + + + @@ -48,13 +40,6 @@ 3.6.3 - - - com.february - february-common-core - 3.6.3 - - 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 0b316ca..0fd5b9e 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,7 +1,7 @@ package com.vehicle.trajectory.controller; -import com.alibaba.nacos.api.model.v2.Result; -import com.february.common.core.domain.R; + +import com.february.common.core.domain.Result; import com.february.common.domain.Car; import com.february.common.domain.RealData; import com.vehicle.trajectory.service.TrajectoryService; @@ -27,9 +27,9 @@ public class TrajectoryController { * 实时数据 */ @GetMapping("/realDateList") - public R> realDateList() { + public Result> realDateList() { log.info("功能名称：【实时数据查看】，请求路径：【{}】，请求方式：【{}】", request.getRequestURI(), request.getMethod()); - R> result = trajectoryService.realDateList(); + Result> result = trajectoryService.realDateList(); log.info("请求结果：【{}】", result); return result; } @@ -40,9 +40,9 @@ public class TrajectoryController { * 车辆信息 */ @GetMapping("/carList") - public R> carList() { + public Result> carList() { log.info("功能名称：【查看在线车辆】，请求路径：【{}】，请求方式：【{}】", request.getRequestURI(), request.getMethod()); - R> result = trajectoryService.carList(); + Result> 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 986de3d..1fb03c8 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.core.domain.Result; import com.february.common.domain.Car; import com.february.common.domain.RealData; import java.util.List; -public interface TrajectoryService { - R> realDateList(); +public interface TrajectoryService { + Result> realDateList(); - R> carList(); + Result> 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 f2afb1e..e7ddd5d 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,36 +3,34 @@ 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.core.domain.Result; import com.february.common.domain.Car; import com.february.common.domain.RealData; import com.february.common.redis.service.RedisService; import com.vehicle.trajectory.mapper.TrajectoryMapper; import com.vehicle.trajectory.service.TrajectoryService; 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; @Service -@Configuration public class TrajectoryServiceImpl implements TrajectoryService { @Autowired private TrajectoryMapper mapper; @Override - public R> realDateList() { + public Result> realDateList() { List realData = mapper.realDateList(); - return R.ok(realData); + return Result.success(realData); } @Autowired private RedisService redisService; @Override - public R> carList() { - Boolean aBoolean = redisService.hasKey("状态为上线的车辆信息"); + public Result> carList() { + Boolean aBoolean = redisService.hasKey("状态为上线的车辆信息");//查询redis中是否有此键 if (Boolean.TRUE.equals(aBoolean)){ List list = redisService.redisTemplate.opsForList().range("状态为上线的车辆信息", 0, -1); ArrayList carArrayList = new ArrayList<>(); @@ -42,13 +40,13 @@ public class TrajectoryServiceImpl implements TrajectoryService { Car notice = JSON.parseObject(o1, Car.class); carArrayList.add(notice); } - return R.ok(carArrayList); + return Result.success(carArrayList); } } List carList = mapper.carList(); //上线车辆的信息 for (Car car : carList) { redisService.redisTemplate.opsForList().leftPush("状态为上线的车辆信息", JSONObject.toJSONString(car)); } - return R.ok(carList); + return Result.success(carList); } }