From e1e4e3489141049903a340a81fee2372d28e2c0b Mon Sep 17 00:00:00 2001 From: wuxiaolong <3210950394@qq.com> Date: Tue, 5 Dec 2023 16:24:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8Di?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/resp/{SelFenceResp.java => FenceRes.java} | 6 +----- .../fence/server/controller/VehicleFenceController.java | 4 ++-- .../vehicle/fence/server/mapper/VehicleFenceMapper.java | 4 ++-- .../vehicle/fence/server/service/VehicleFenceService.java | 4 ++-- .../fence/server/service/impl/VehicleFenceServiceImpl.java | 7 +++---- .../src/main/resources/mapper/fence/VehicleFenceMapper.xml | 2 +- 6 files changed, 11 insertions(+), 16 deletions(-) rename vehicle-fence-common/src/main/java/com/dragon/vehicle/history/domain/common/resp/{SelFenceResp.java => FenceRes.java} (90%) diff --git a/vehicle-fence-common/src/main/java/com/dragon/vehicle/history/domain/common/resp/SelFenceResp.java b/vehicle-fence-common/src/main/java/com/dragon/vehicle/history/domain/common/resp/FenceRes.java similarity index 90% rename from vehicle-fence-common/src/main/java/com/dragon/vehicle/history/domain/common/resp/SelFenceResp.java rename to vehicle-fence-common/src/main/java/com/dragon/vehicle/history/domain/common/resp/FenceRes.java index c29501f..9d64f51 100644 --- a/vehicle-fence-common/src/main/java/com/dragon/vehicle/history/domain/common/resp/SelFenceResp.java +++ b/vehicle-fence-common/src/main/java/com/dragon/vehicle/history/domain/common/resp/FenceRes.java @@ -14,11 +14,7 @@ import java.util.Date; @Builder @NoArgsConstructor @AllArgsConstructor -public class SelFenceResp { - /** - * 字段属性：围栏主键id - */ - private Integer fenceId; +public class FenceRes { /** * 字段属性：围栏名称 */ diff --git a/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/controller/VehicleFenceController.java b/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/controller/VehicleFenceController.java index d04dcba..979dabf 100644 --- a/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/controller/VehicleFenceController.java +++ b/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/controller/VehicleFenceController.java @@ -6,7 +6,7 @@ import com.dragon.vehicle.fence.server.mapper.VehicleFenceMapper; import com.dragon.vehicle.history.domain.common.Fence; import com.dragon.vehicle.fence.server.service.VehicleFenceService; import com.dragon.vehicle.history.domain.common.req.AddFenceReq; -import com.dragon.vehicle.history.domain.common.resp.SelFenceResp; +import com.dragon.vehicle.history.domain.common.resp.FenceRes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -74,7 +74,7 @@ public class VehicleFenceController { * @return */ @PostMapping("/queryBy/{vin}") - public Result> queryBy(@PathVariable String vin){ + public Result> queryBy(@PathVariable String vin){ return vehicleFenceService.queryBy(vin); } diff --git a/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/mapper/VehicleFenceMapper.java b/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/mapper/VehicleFenceMapper.java index 990df17..7bd3c0d 100644 --- a/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/mapper/VehicleFenceMapper.java +++ b/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/mapper/VehicleFenceMapper.java @@ -3,7 +3,7 @@ package com.dragon.vehicle.fence.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dragon.vehicle.history.domain.common.Fence; import com.dragon.vehicle.history.domain.common.FenceTag; -import com.dragon.vehicle.history.domain.common.resp.SelFenceResp; +import com.dragon.vehicle.history.domain.common.resp.FenceRes; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,5 +21,5 @@ public interface VehicleFenceMapper extends BaseMapper { List queryBy(@Param("vin") String vin); - List selectIdFence(@Param("vin") String vin); + List selectIdFence(@Param("vin") String vin); } diff --git a/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/service/VehicleFenceService.java b/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/service/VehicleFenceService.java index 4a96838..a6ec5a4 100644 --- a/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/service/VehicleFenceService.java +++ b/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/service/VehicleFenceService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.dragon.common.core.domain.Result; import com.dragon.vehicle.history.domain.common.Fence; import com.dragon.vehicle.history.domain.common.req.AddFenceReq; -import com.dragon.vehicle.history.domain.common.resp.SelFenceResp; +import com.dragon.vehicle.history.domain.common.resp.FenceRes; import java.util.List; @@ -14,5 +14,5 @@ public interface VehicleFenceService extends IService { Fence updateFence(AddFenceReq addFenceReq); - Result> queryBy(String vin); + Result> queryBy(String vin); } diff --git a/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/service/impl/VehicleFenceServiceImpl.java b/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/service/impl/VehicleFenceServiceImpl.java index 0d9ac99..e7fa29c 100644 --- a/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/service/impl/VehicleFenceServiceImpl.java +++ b/vehicle-fence-server/src/main/java/com/dragon/vehicle/fence/server/service/impl/VehicleFenceServiceImpl.java @@ -7,9 +7,8 @@ import com.dragon.system.common.domain.SysUser; import com.dragon.vehicle.fence.server.mapper.VehicleFenceMapper; import com.dragon.vehicle.history.domain.common.Fence; import com.dragon.vehicle.fence.server.service.VehicleFenceService; -import com.dragon.vehicle.history.domain.common.FenceTag; import com.dragon.vehicle.history.domain.common.req.AddFenceReq; -import com.dragon.vehicle.history.domain.common.resp.SelFenceResp; +import com.dragon.vehicle.history.domain.common.resp.FenceRes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,7 +44,7 @@ public class VehicleFenceServiceImpl extends ServiceImpl> queryBy(String vin) { + public Result> queryBy(String vin) { // //查询vin下所有的电子围栏标签表 // List fences = vehicleFenceMapper.queryBy(vin); // List fences1 = null; @@ -53,7 +52,7 @@ public class VehicleFenceServiceImpl extends ServiceImpl> result = Result.success(fences1); - List selFenceResps = vehicleFenceMapper.selectIdFence(vin); + List selFenceResps = vehicleFenceMapper.selectIdFence(vin); return Result.success(selFenceResps); } } diff --git a/vehicle-fence-server/src/main/resources/mapper/fence/VehicleFenceMapper.xml b/vehicle-fence-server/src/main/resources/mapper/fence/VehicleFenceMapper.xml index 11d4ef5..1dd46b7 100644 --- a/vehicle-fence-server/src/main/resources/mapper/fence/VehicleFenceMapper.xml +++ b/vehicle-fence-server/src/main/resources/mapper/fence/VehicleFenceMapper.xml @@ -12,7 +12,7 @@ where c.car_vin = #{vin} - select fe.* from vehicle_tag v left join car c on v.car_vin = c.car_vin left join fence_tag f on v.fence_tag_id = f.fence_tag_id LEFT JOIN fence fe on fe.fence_tag_id=f.fence_tag_id where c.car_vin=#{vin}