From 00db7bbc1c49a28584a9afe343b1dc609e61f581 Mon Sep 17 00:00:00 2001 From: tangwenkang <2720983602@qq.com> Date: Fri, 24 Nov 2023 08:35:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=B5=E5=AD=90=E5=9B=B4?= =?UTF-8?q?=E6=A0=8F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/history/common/domain/Fence.java | 20 ++++++++----------- .../history/common/domain/req/ReqCar.java | 4 ++++ vehicle-history-server/pom.xml | 4 ---- .../server/controller/CarController.java | 10 ++++++++++ .../history/server/service/CarService.java | 7 +++++++ .../server/service/impl/CarServiceImpl.java | 13 ++++++++++++ 6 files changed, 42 insertions(+), 16 deletions(-) diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Fence.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Fence.java index 3d06e35..e24389f 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Fence.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/Fence.java @@ -35,37 +35,33 @@ public class Fence { */ private String fenceData; /** - * 围栏状态 + * 围栏状态 0--未开启 1--已开启 */ private Integer status; /** - * 告警类型 + * 告警类型 0--驶入警告 1--驶出警告 */ private String alarmType; /** - * 租户号 + * 围栏标签id */ - private String tenantId; - /** - * 乐观锁 - */ - private Integer revision; + private Integer fenceTagId; /** * 创建人 */ - private String createBy; + private String createdBy; /** * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private Date createdTime; /** * 更新人 */ - private String updateBy; + private String updatedBy; /** * 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + private Date updatedTime; } diff --git a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/ReqCar.java b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/ReqCar.java index f820e85..7074388 100644 --- a/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/ReqCar.java +++ b/vehicle-history-common/src/main/java/com/dragon/vehicle/history/common/domain/req/ReqCar.java @@ -47,6 +47,10 @@ public class ReqCar { * 电子围栏 */ private String fenceName; + /** + * 电子围栏ID + */ + private Integer fenceId; /** * 车辆状态 1-在线 0-离线 */ diff --git a/vehicle-history-server/pom.xml b/vehicle-history-server/pom.xml index 5f882a4..d253291 100644 --- a/vehicle-history-server/pom.xml +++ b/vehicle-history-server/pom.xml @@ -95,10 +95,6 @@ mybatis-plus-join 1.2.4 - - com.dragon - dragon-common-security - diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/CarController.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/CarController.java index 5290f32..b2a6473 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/CarController.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/CarController.java @@ -3,6 +3,7 @@ package com.dragon.vehicle.history.server.controller; import com.dragon.common.core.domain.Result; import com.dragon.vehicle.history.common.domain.Car; import com.dragon.vehicle.history.common.domain.CarType; +import com.dragon.vehicle.history.common.domain.Fence; import com.dragon.vehicle.history.common.domain.req.ReqCar; import com.dragon.vehicle.history.common.domain.res.ResCar; import com.dragon.vehicle.history.server.service.CarService; @@ -69,4 +70,13 @@ public class CarController { public Result insertCar(@RequestBody Car car){ return carService.insertCar(car); } + + /** + * 查询电子围栏列表 + * @return + */ + @GetMapping("/listFence") + public Result> listFence(){ + return carService.listFence(); + } } diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/CarService.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/CarService.java index 898a25a..7be4ac0 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/CarService.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/CarService.java @@ -4,6 +4,7 @@ package com.dragon.vehicle.history.server.service; import com.dragon.common.core.domain.Result; import com.dragon.vehicle.history.common.domain.Car; import com.dragon.vehicle.history.common.domain.CarType; +import com.dragon.vehicle.history.common.domain.Fence; import com.dragon.vehicle.history.common.domain.req.ReqCar; import com.dragon.vehicle.history.common.domain.res.ResCar; @@ -46,4 +47,10 @@ public interface CarService { * @return */ Result insertCar(Car car); + + /** + * 查询电子围栏列表 + * @return + */ + Result> listFence(); } diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java index 612aaf1..b24cfec 100644 --- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java +++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java @@ -11,6 +11,7 @@ import com.dragon.vehicle.history.common.domain.req.ReqCar; import com.dragon.vehicle.history.common.domain.res.ResCar; import com.dragon.vehicle.history.server.mapper.CarMapper; import com.dragon.vehicle.history.server.mapper.CarTypeMapper; +import com.dragon.vehicle.history.server.mapper.FenceMapper; import com.dragon.vehicle.history.server.service.CarService; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.log4j.Log4j2; @@ -31,6 +32,8 @@ public class CarServiceImpl implements CarService { private CarMapper carMapper; @Autowired private CarTypeMapper carTypeMapper; + @Autowired + private FenceMapper fenceMapper; /** * 车辆信息列表 @@ -112,4 +115,14 @@ public class CarServiceImpl implements CarService { carMapper.insert(inserCar); return Result.success("添加成功！"); } + + /** + * 查询电子围栏列表 + * @return + */ + @Override + public Result> listFence() { + List fences = fenceMapper.selectList(new MPJLambdaWrapper().select(Fence::getFenceId,Fence::getFenceName)); + return Result.success(fences); + } }