From e4bfdc56c8d74be938b8375e6cc53fc58f2bd595 Mon Sep 17 00:00:00 2001 From: Su ZeJing <3039179835@qq.com> Date: Mon, 8 Apr 2024 15:25:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E4=B8=8E=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/remote/RemoteFenceService.java | 7 --- .../factory/RemoteFenceFallbackFactory.java | 8 --- .../{ => common}/business/domain/Fence.java | 2 +- .../{ => common}/business/domain/Markers.java | 2 +- .../{ => common}/business/domain/Vehicle.java | 2 +- .../business/domain/VehicleType.java | 2 +- .../business/domain/middle/MarkersFence.java | 2 +- .../domain/middle/VehicleMarkers.java | 2 +- .../business/domain/vo/FenceVo.java | 7 +-- .../business/domain/vo/MarkersVo.java | 2 +- .../business/domain/vo/VehicleVo.java | 4 +- .../business/remote/RemoteVehicleService.java | 32 ++++++++++++ .../factory/RemoteVehicleFallbackFactory.java | 31 +++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../core/constant/ServiceNameConstants.java | 4 ++ .../business/controller/FenceController.java | 2 +- .../controller/MarkersController.java | 52 +++++++++++++++++-- .../controller/MarkersFenceController.java | 2 +- .../controller/VehicleController.java | 42 ++++++++++----- .../controller/VehicleMarkersController.java | 2 +- .../controller/VehicleTypeController.java | 2 +- .../zhilian/business/mapper/FenceMapper.java | 6 +-- .../business/mapper/MarkersFenceMapper.java | 2 +- .../business/mapper/MarkersMapper.java | 2 +- .../business/mapper/VehicleMapper.java | 2 +- .../business/mapper/VehicleMarkersMapper.java | 2 +- .../business/mapper/VehicleTypeMapper.java | 2 +- .../business/service/FenceService.java | 2 +- .../business/service/MarkersFenceService.java | 7 ++- .../business/service/MarkersService.java | 2 +- .../service/VehicleMarkersService.java | 4 +- .../business/service/VehicleService.java | 5 +- .../business/service/VehicleTypeService.java | 2 +- .../service/impl/FenceServiceImpl.java | 2 +- .../service/impl/MarkersFenceServiceImpl.java | 24 ++++++++- .../service/impl/MarkersServiceImpl.java | 2 +- .../impl/VehicleMarkersServiceImpl.java | 4 +- .../service/impl/VehicleServiceImpl.java | 24 +++++++-- .../service/impl/VehicleTypeServiceImpl.java | 2 +- ...JobMapper.xml => RemoteVehicleService.xml} | 0 40 files changed, 224 insertions(+), 82 deletions(-) delete mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java delete mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/Fence.java (97%) rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/Markers.java (95%) rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/Vehicle.java (97%) rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/VehicleType.java (94%) rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/middle/MarkersFence.java (93%) rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/middle/VehicleMarkers.java (93%) rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/vo/FenceVo.java (70%) rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/vo/MarkersVo.java (54%) rename zhilian-common/zhilian-common-business/src/main/java/com/zhilian/{ => common}/business/domain/vo/VehicleVo.java (78%) create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/RemoteVehicleService.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/factory/RemoteVehicleFallbackFactory.java create mode 100644 zhilian-common/zhilian-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename zhilian-modules/zhilian-job/src/main/resources/mapper/job/{SysJobMapper.xml => RemoteVehicleService.xml} (100%) diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java deleted file mode 100644 index 9fd5a94..0000000 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zhilian.business.remote; - -import org.springframework.stereotype.Component; - -@Component -public interface RemoteFenceService { -} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java deleted file mode 100644 index 3ba9998..0000000 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zhilian.business.remote.factory; - -import com.zhilian.common.core.constant.ServiceNameConstants; -import org.springframework.cloud.openfeign.FeignClient; - -//@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) -public class RemoteFenceFallbackFactory { -} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Fence.java similarity index 97% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Fence.java index e012a8d..7206093 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Fence.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain; +package com.zhilian.common.business.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Markers.java similarity index 95% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Markers.java index b89c946..4675d8c 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Markers.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain; +package com.zhilian.common.business.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Vehicle.java similarity index 97% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Vehicle.java index f422402..1ef861d 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Vehicle.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain; +package com.zhilian.common.business.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/VehicleType.java similarity index 94% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/VehicleType.java index 2d4ef73..8320b44 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/VehicleType.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain; +package com.zhilian.common.business.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/MarkersFence.java similarity index 93% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/MarkersFence.java index d4a732e..5e37edd 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/MarkersFence.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain.middle; +package com.zhilian.common.business.domain.middle; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/VehicleMarkers.java similarity index 93% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/VehicleMarkers.java index ca25e31..1c1b9b0 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/VehicleMarkers.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain.middle; +package com.zhilian.common.business.domain.middle; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/FenceVo.java similarity index 70% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/FenceVo.java index 6881bc3..b31bc20 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/FenceVo.java @@ -1,15 +1,10 @@ -package com.zhilian.business.domain.vo; +package com.zhilian.common.business.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; -/** - * @ClassName FenceResp //类名称 - * @Author: yannan //作者 - * @CreateDate: 2024/3/26 20:03 //创建时间 - */ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/MarkersVo.java similarity index 54% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/MarkersVo.java index b58a1d7..a46fc8f 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/MarkersVo.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain.vo; +package com.zhilian.common.business.domain.vo; import lombok.Data; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/VehicleVo.java similarity index 78% rename from zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/VehicleVo.java index 0d351f9..2f8f4a1 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/VehicleVo.java @@ -1,7 +1,5 @@ -package com.zhilian.business.domain.vo; +package com.zhilian.common.business.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.zhilian.common.core.annotation.Excel; import lombok.Data; @Data diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/RemoteVehicleService.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/RemoteVehicleService.java new file mode 100644 index 0000000..8010c89 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/RemoteVehicleService.java @@ -0,0 +1,32 @@ +package com.zhilian.common.business.remote; + +import com.zhilian.common.business.domain.Vehicle; +import com.zhilian.common.business.remote.factory.RemoteVehicleFallbackFactory; +import com.zhilian.common.core.constant.ServiceNameConstants; +import com.zhilian.common.core.domain.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(contextId = "remoteVehicleService", value = ServiceNameConstants.VIEHICLE_SERVICE, fallbackFactory = RemoteVehicleFallbackFactory.class) +public interface RemoteVehicleService { +// @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) +// public Result upload (@RequestPart(value = "file") MultipartFile file); + + /** + * 根据VIN获取车辆信息 + * @param vehicleVIN + * @return + */ + @PostMapping("/vehicle/getMarkersByVIN/{vehicleVIN}") + public Result getVehicleByVIN(@PathVariable("vehicleVIN") String vehicleVIN); + + /** + * 更新车辆状态 + * @param vehicle + * @return + */ + @PostMapping("/vehicle/updateState") + public Result updateState(@RequestBody Vehicle vehicle); +} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/factory/RemoteVehicleFallbackFactory.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/factory/RemoteVehicleFallbackFactory.java new file mode 100644 index 0000000..b30cc6a --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/factory/RemoteVehicleFallbackFactory.java @@ -0,0 +1,31 @@ +package com.zhilian.common.business.remote.factory; + + +import com.zhilian.common.business.domain.Vehicle; +import com.zhilian.common.business.remote.RemoteVehicleService; +import com.zhilian.common.core.domain.Result; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +@Component +public class RemoteVehicleFallbackFactory implements FallbackFactory { + + private static final Logger log = LoggerFactory.getLogger(RemoteVehicleFallbackFactory.class); + @Override + public RemoteVehicleService create(Throwable throwable) { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteVehicleService() { + @Override + public Result getVehicleByVIN(String vehicleVIN) { + return Result.error("获取车辆信息失败:" + throwable.getMessage()); + } + + @Override + public Result updateState(Vehicle vehicle) { + return Result.error("更新车辆状态失败:" + throwable.getMessage()); + } + }; + } +} diff --git a/zhilian-common/zhilian-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..bf96861 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.zhilian.common.business.remote.factory.RemoteVehicleFallbackFactory diff --git a/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ServiceNameConstants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ServiceNameConstants.java index 953610f..977886c 100644 --- a/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ServiceNameConstants.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ServiceNameConstants.java @@ -20,4 +20,8 @@ public class ServiceNameConstants { * 文件服务的serviceid */ public static final String FILE_SERVICE = "zhilian-file"; + /** + * 车辆服务的serviceid + */ + public static final String VIEHICLE_SERVICE = "zhilian-vehicle"; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java index 1aedb8d..59a1f8a 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java @@ -2,7 +2,7 @@ package com.zhilian.business.controller; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; -import com.zhilian.business.domain.Fence; +import com.zhilian.common.business.domain.Fence; import com.zhilian.business.service.FenceService; import com.zhilian.common.core.web.page.TableDataInfo; import com.zhilian.common.security.utils.SecurityUtils; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java index 9221418..9fb4ab7 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java @@ -1,16 +1,18 @@ package com.zhilian.business.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.zhilian.business.domain.Markers; -import com.zhilian.business.domain.middle.MarkersFence; +import com.zhilian.common.business.domain.Markers; +import com.zhilian.common.business.domain.middle.MarkersFence; import com.zhilian.business.service.MarkersFenceService; import com.zhilian.business.service.MarkersService; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; @RestController @@ -33,22 +35,51 @@ public class MarkersController extends BaseController { return getDataTable(result); } + /** + * 车辆标识全部数据 + * @return + */ @GetMapping("markersVehicle") public Result> markersVehicle() { List listMarkers = markersService.listMarkers(); return Result.success(listMarkers); } + /** + * 新增车辆标识 + * @param markers + * @return + */ @PostMapping("insert") public Result insert(@RequestBody Markers markers){ return toAjax(markersService.save(markers)); } + /** + * 修改车辆标识 + * @param markers + * @return + */ @PostMapping("update") public Result update(@RequestBody Markers markers) { - return toAjax(markersService.updateById(markers)); + markers.setUpdateBy(SecurityUtils.getUsername()); + markers.setUpdateTime(new Date()); + markersFenceService.removeAllFence(markers); + + //修改原表数据 + boolean update =markersService.updateById(markers); + + //重新添加中间表数据 + markersFenceService.insert(markers); + + return toAjax(update); } + /** + * 删除车辆标识 + * @param markersId + * @return + */ @PostMapping("delete/{markersId}") public Result delete(@PathVariable Long markersId) { markersFenceList(markersId).forEach(markersFence -> { @@ -57,11 +88,22 @@ public class MarkersController extends BaseController { return toAjax(markersService.removeById(markersId)); } + /** + * 绑定电子围栏 + * @param markers + * @return + */ @PostMapping("insertMarkersFence") - public Result insertMarkersFenceMarkers(@RequestBody MarkersFence markersFence){ - return toAjax(markersFenceService.save(markersFence)); + public Result insertMarkersFenceMarkers(@RequestBody Markers markers){ + boolean insert = markersFenceService.insert(markers); + return toAjax(insert); } + /** + * 查询标识与电子围栏中间表信息 + * @param markersId + * @return + */ @PostMapping("markersFenceList/{markersId}") public List markersFenceList(@PathVariable Long markersId){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java index 0db23e4..3c508cf 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java @@ -1,6 +1,6 @@ package com.zhilian.business.controller; -import com.zhilian.business.domain.middle.MarkersFence; +import com.zhilian.common.business.domain.middle.MarkersFence; import com.zhilian.business.service.MarkersFenceService; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java index d6a153b..e61af0a 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java @@ -1,12 +1,12 @@ package com.zhilian.business.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.zhilian.business.domain.Markers; -import com.zhilian.business.domain.Vehicle; -import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.common.business.domain.Vehicle; +import com.zhilian.common.business.domain.middle.VehicleMarkers; import com.zhilian.business.service.MarkersService; import com.zhilian.business.service.VehicleMarkersService; import com.zhilian.business.service.VehicleService; +import com.zhilian.business.service.VehicleTypeService; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; import com.zhilian.common.core.web.page.TableDataInfo; @@ -26,6 +26,9 @@ public class VehicleController extends BaseController { @Autowired private VehicleMarkersService vehicleMarkersService; + @Autowired + private VehicleTypeService vehicleTypeService; + @Autowired private MarkersService markersService; @@ -87,17 +90,6 @@ public class VehicleController extends BaseController { queryWrapper.eq(VehicleMarkers::getVehicleId, vehicleId); return vehicleMarkersService.list(queryWrapper); } - -// @PostMapping("/getMarkers/{vehicleId}") -// public List getMarkers(@PathVariable Long vehicleId){ -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// queryWrapper.eq(VehicleMarkers::getVehicleId, vehicleId); -// List list = vehicleMarkersService.list(queryWrapper); -// list.forEach(vehicleMarkers -> { -// Markers markers = markersService.getById(vehicleMarkers.getMarkersId()); -// }); -// return null; -// } /** * 删除车辆 * @param vehicleId @@ -121,4 +113,26 @@ public class VehicleController extends BaseController { boolean insert = vehicleMarkersService.insert(vehicle); return toAjax(insert); } + + /** + * 根据VIN查询车辆信息 + * @param vehicleVIN + * @return + */ + @PostMapping("/getMarkersByVIN/{vehicleVIN}") + public Result getVehicleByVIN(@PathVariable("vehicleVIN") String vehicleVIN) { + Vehicle vehicle = vehicleService.getVehicleByVIN(vehicleVIN); +// vehicleMarkersService.getById(vehicle.getVehicleId()); + return Result.success(vehicle); + } + + /** + * 根据车辆VIN修改车辆状态 + * @param vehicle + * @return + */ + @PostMapping("/updateState") + public Result updateState(@RequestBody Vehicle vehicle) { + return toAjax(vehicleService.updateState(vehicle)); + } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java index 56837a7..40ad26b 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java @@ -1,6 +1,6 @@ package com.zhilian.business.controller; -import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.common.business.domain.middle.VehicleMarkers; import com.zhilian.business.service.VehicleMarkersService; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java index 29b9036..07f93a3 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java @@ -1,6 +1,6 @@ package com.zhilian.business.controller; -import com.zhilian.business.domain.VehicleType; +import com.zhilian.common.business.domain.VehicleType; import com.zhilian.business.service.VehicleTypeService; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java index acd8e76..71df519 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java @@ -1,15 +1,13 @@ package com.zhilian.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.vo.FenceVo; +import com.zhilian.common.business.domain.Fence; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; -import java.util.List; @Mapper @Component public interface FenceMapper extends BaseMapper { - List fenceList(FenceVo fenceVo); + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java index c5c26d8..cbdbed3 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java @@ -1,7 +1,7 @@ package com.zhilian.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhilian.business.domain.middle.MarkersFence; +import com.zhilian.common.business.domain.middle.MarkersFence; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java index f766a24..a896bee 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java @@ -1,7 +1,7 @@ package com.zhilian.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhilian.business.domain.Markers; +import com.zhilian.common.business.domain.Markers; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java index b917deb..19ed94b 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java @@ -1,7 +1,7 @@ package com.zhilian.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhilian.business.domain.Vehicle; +import com.zhilian.common.business.domain.Vehicle; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java index a03d94b..59d6844 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java @@ -1,7 +1,7 @@ package com.zhilian.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.common.business.domain.middle.VehicleMarkers; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java index 4948148..5993548 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java @@ -1,7 +1,7 @@ package com.zhilian.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhilian.business.domain.VehicleType; +import com.zhilian.common.business.domain.VehicleType; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java index 4592c86..3edc886 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java @@ -1,7 +1,7 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhilian.business.domain.Fence; +import com.zhilian.common.business.domain.Fence; import java.util.List; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java index 0af642c..3355d8d 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java @@ -1,8 +1,11 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhilian.business.domain.middle.MarkersFence; +import com.zhilian.common.business.domain.Markers; +import com.zhilian.common.business.domain.middle.MarkersFence; public interface MarkersFenceService extends IService { -// List selectFenceByIdAndMarkersBuyId(List list, List list1, List list2,MarkersFence markersFence); + boolean insert(Markers markers); + + void removeAllFence(Markers markers); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java index 832269e..29e8299 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java @@ -1,7 +1,7 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhilian.business.domain.Markers; +import com.zhilian.common.business.domain.Markers; import java.util.List; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java index a18835c..4ce6a98 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java @@ -1,8 +1,8 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhilian.business.domain.Vehicle; -import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.common.business.domain.Vehicle; +import com.zhilian.common.business.domain.middle.VehicleMarkers; import org.springframework.stereotype.Service; @Service diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java index 31a70d4..4bceb3a 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java @@ -1,7 +1,7 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhilian.business.domain.Vehicle; +import com.zhilian.common.business.domain.Vehicle; import java.util.List; @@ -9,4 +9,7 @@ public interface VehicleService extends IService { List selectVehicleList(Vehicle vehicle); + Vehicle getVehicleByVIN(String vehicleVIN); + + boolean updateState(Vehicle vehicle); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java index 3bff3b5..2f7c8da 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java @@ -1,7 +1,7 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhilian.business.domain.VehicleType; +import com.zhilian.common.business.domain.VehicleType; import java.util.List; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java index 1e3f369..4e74f33 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java @@ -2,7 +2,7 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhilian.business.domain.Fence; +import com.zhilian.common.business.domain.Fence; import com.zhilian.business.mapper.FenceMapper; import com.zhilian.business.service.FenceService; import com.zhilian.common.core.utils.StringUtils; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java index ad47575..5346718 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java @@ -1,16 +1,38 @@ package com.zhilian.business.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhilian.business.domain.middle.MarkersFence; +import com.zhilian.common.business.domain.Markers; +import com.zhilian.common.business.domain.middle.MarkersFence; import com.zhilian.business.mapper.MarkersFenceMapper; import com.zhilian.business.service.MarkersFenceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class MarkersFenceServiceImpl extends ServiceImpl implements MarkersFenceService { @Autowired private MarkersFenceMapper markersFenceMapper; + @Override + public boolean insert(Markers markers) { + markers.getFenceIds().forEach(fenceId -> { + MarkersFence markersFence = new MarkersFence(); + markersFence.setMarkerId(markers.getMarkersId()); + markersFence.setFenceId(fenceId); + markersFenceMapper.insert(markersFence); + }); + return true; + } + + @Override + public void removeAllFence(Markers markers) { + List list = this.list(new LambdaQueryWrapper().eq(MarkersFence::getMarkerId, markers.getMarkersId())); + list.forEach(item -> { + this.removeById(item.getMarkerId()); + }); + } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java index 27855e6..4e29ac6 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java @@ -2,7 +2,7 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhilian.business.domain.Markers; +import com.zhilian.common.business.domain.Markers; import com.zhilian.business.mapper.MarkersMapper; import com.zhilian.business.service.MarkersService; import com.zhilian.common.core.utils.StringUtils; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java index 2bda78e..35ab99a 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java @@ -2,8 +2,8 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhilian.business.domain.Vehicle; -import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.common.business.domain.Vehicle; +import com.zhilian.common.business.domain.middle.VehicleMarkers; import com.zhilian.business.mapper.VehicleMarkersMapper; import com.zhilian.business.service.VehicleMarkersService; import org.springframework.stereotype.Service; diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java index dc50464..eb00613 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java @@ -2,21 +2,19 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhilian.business.domain.Vehicle; -import com.zhilian.business.domain.middle.VehicleMarkers; +import com.zhilian.common.business.domain.Vehicle; import com.zhilian.business.mapper.VehicleMapper; -import com.zhilian.business.mapper.VehicleMarkersMapper; import com.zhilian.business.service.VehicleService; import com.zhilian.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service public class VehicleServiceImpl extends ServiceImpl implements VehicleService { - + @Autowired + private VehicleMapper vehicleMapper; @Override public List selectVehicleList(Vehicle vehicle) { @@ -60,4 +58,20 @@ public class VehicleServiceImpl extends ServiceImpl impl return this.list(queryWrapper); } + @Override + public Vehicle getVehicleByVIN(String vehicleVIN) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Vehicle::getVehicleVIN, vehicleVIN); + return vehicleMapper.selectOne(queryWrapper); + } + + @Override + public boolean updateState(Vehicle vehicle) { + int update = vehicleMapper.update(vehicle, new LambdaQueryWrapper().eq(Vehicle::getVehicleVIN, vehicle.getVehicleVIN())); + if(update==0){ + return false; + } + return true; + } + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java index 271ab88..adb98c8 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java @@ -1,7 +1,7 @@ package com.zhilian.business.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhilian.business.domain.VehicleType; +import com.zhilian.common.business.domain.VehicleType; import com.zhilian.business.mapper.VehicleTypeMapper; import com.zhilian.business.service.VehicleTypeService; import com.zhilian.common.redis.service.RedisService; diff --git a/zhilian-modules/zhilian-job/src/main/resources/mapper/job/SysJobMapper.xml b/zhilian-modules/zhilian-job/src/main/resources/mapper/job/RemoteVehicleService.xml similarity index 100% rename from zhilian-modules/zhilian-job/src/main/resources/mapper/job/SysJobMapper.xml rename to zhilian-modules/zhilian-job/src/main/resources/mapper/job/RemoteVehicleService.xml From 82cad8d974419f712d52993569ef036f263b9672 Mon Sep 17 00:00:00 2001 From: Su ZeJing <3039179835@qq.com> Date: Mon, 8 Apr 2024 15:38:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhilian/common/business/domain/Fence.java | 7 ++++++- .../zhilian/common/business/domain/Markers.java | 15 ++++++++++++--- .../zhilian/common/business/domain/Vehicle.java | 5 ++++- .../common/business/domain/VehicleType.java | 7 ++++++- .../business/domain/middle/MarkersFence.java | 10 +++++++++- .../business/domain/middle/VehicleMarkers.java | 7 ++++++- .../common/business/domain/vo/FenceVo.java | 7 ++++++- .../common/business/domain/vo/MarkersVo.java | 8 -------- .../common/business/domain/vo/VehicleVo.java | 7 ++++++- .../business/ZhilianBusinessApplication.java | 1 + .../business/controller/FenceController.java | 13 +++++++++++-- .../business/controller/MarkersController.java | 7 ++++++- .../controller/MarkersFenceController.java | 7 ++++++- 13 files changed, 79 insertions(+), 22 deletions(-) delete mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/MarkersVo.java diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Fence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Fence.java index 7206093..705b5f4 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Fence.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Fence.java @@ -13,7 +13,12 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.util.List; - +/** + * @ClassName Fence + * @Description 电子围栏实体类 + * @Author ZeJinG.Su + * @Date 15:28 2024/4/8 + */ @Data @SuperBuilder @NoArgsConstructor diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Markers.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Markers.java index 4675d8c..f6c4471 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Markers.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Markers.java @@ -10,7 +10,12 @@ import lombok.*; import lombok.experimental.SuperBuilder; import java.util.List; - +/** + * @ClassName Markers + * @Description 车辆标识实体类 + * @Author ZeJinG.Su + * @Date 15:29 2024/4/8 + */ @Data @ToString @SuperBuilder @@ -20,12 +25,16 @@ import java.util.List; @TableName("business_markers") public class Markers extends BaseEntity { + /** + * 车辆标识编号 + */ @TableId(value = "markers_id", type = IdType.AUTO) - @Excel(name = "标识编号") private Long markersId; + /** + * 车辆标识名称 + */ @TableField("markers_name") - @Excel(name = "标识名称") private String markersName; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Vehicle.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Vehicle.java index 1ef861d..f1b5178 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Vehicle.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Vehicle.java @@ -12,7 +12,10 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** - * 车辆信息对象 business_vehicle + * @ClassName Vehicle + * @Description 车辆信息实体类 + * @Author ZeJinG.Su + * @Date 15:27 2024/4/8 */ @Data @ToString diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/VehicleType.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/VehicleType.java index 8320b44..34a8fde 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/VehicleType.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/VehicleType.java @@ -10,7 +10,12 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.SuperBuilder; - +/** + * @ClassName VehicleType + * @Description 车辆类型实体类 + * @Author ZeJinG.Su + * @Date 15:30 2024/4/8 + */ @Data @SuperBuilder @NoArgsConstructor diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/MarkersFence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/MarkersFence.java index 5e37edd..1361aae 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/MarkersFence.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/MarkersFence.java @@ -3,7 +3,12 @@ package com.zhilian.common.business.domain.middle; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.ToString; - +/** + * @ClassName MarkersFence + * @Description 车辆标识与电子围栏中间表 + * @Author ZeJinG.Su + * @Date 15:30 2024/4/8 + */ @Data @ToString @TableName("business_markers_fence") @@ -13,6 +18,9 @@ public class MarkersFence { */ @TableId(value = "markers_id",type = IdType.INPUT) private Long markerId; + /** + * 电子围栏编号 + */ @TableField(value = "fence_id",insertStrategy = FieldStrategy.IGNORED) private Long fenceId; diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/VehicleMarkers.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/VehicleMarkers.java index 1c1b9b0..44ad6d3 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/VehicleMarkers.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/VehicleMarkers.java @@ -3,7 +3,12 @@ package com.zhilian.common.business.domain.middle; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.ToString; - +/** + * @ClassName VehicleMarkers + * @Description 车辆管理与车辆标识 中间表 + * @Author ZeJinG.Su + * @Date 15:27 2024/4/8 + */ @Data @ToString @TableName("business_vehicle_markers") diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/FenceVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/FenceVo.java index b31bc20..7c30a75 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/FenceVo.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/FenceVo.java @@ -4,7 +4,12 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; - +/** + * @ClassName FenceVo + * @Description 电子围栏查询信息实体类 + * @Author ZeJinG.Su + * @Date 15:27 2024/4/8 + */ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/MarkersVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/MarkersVo.java deleted file mode 100644 index a46fc8f..0000000 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/MarkersVo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zhilian.common.business.domain.vo; - -import lombok.Data; - -@Data -public class MarkersVo { - -} diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/VehicleVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/VehicleVo.java index 2f8f4a1..3b9c83a 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/VehicleVo.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/VehicleVo.java @@ -1,7 +1,12 @@ package com.zhilian.common.business.domain.vo; import lombok.Data; - +/** + * @ClassName VehicleVo + * @Description 车辆管理查询信息实体类 + * @Author ZeJinG.Su + * @Date 15:28 2024/4/8 + */ @Data public class VehicleVo { /** diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/ZhilianBusinessApplication.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/ZhilianBusinessApplication.java index 178dc7d..cf49a36 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/ZhilianBusinessApplication.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/ZhilianBusinessApplication.java @@ -9,6 +9,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * @BelongsProject: smart-cloud-server * @BelongsPackage: com.zhilian.business + * @Description 启动类 * @Author: LiYuan * @CreateTime: 2024-03-31 10:13 * @Description: TODO diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java index 59a1f8a..be2e502 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java @@ -25,7 +25,9 @@ public class FenceController extends BaseController { private FenceService fenceService; /** - * TODO: 围栏管理 + * 电子围栏列表 + * @param fence + * @return */ @PostMapping("/list") public Result> fenceList(@RequestBody Fence fence) { @@ -48,7 +50,9 @@ public class FenceController extends BaseController { /** - * 修改电子围栏 + * 修改围栏信息 + * @param fence + * @return */ @PostMapping("/fenceUpdate") public Result fenceUpdate(@RequestBody Fence fence) { @@ -57,6 +61,11 @@ public class FenceController extends BaseController { return toAjax(fenceService.updateById(fence)); } + /** + * 修改电子围栏地图 + * @param fence + * @return + */ @PostMapping("/fenceUpdateMap") public Result fenceUpdateMap(@RequestBody Fence fence) { fence.setUpdateBy(SecurityUtils.getUsername()); diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java index 9fb4ab7..a6a58da 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java @@ -14,7 +14,12 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; - +/** + * @ClassName MarkersController + * @Description 车辆标识控制层 + * @Author ZeJinG.Su + * @Date 15:31 2024/4/8 + */ @RestController @RequestMapping("/markers") public class MarkersController extends BaseController { diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java index 3c508cf..75d6b2f 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java @@ -10,7 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; - +/** + * @ClassName MarkersFenceController + * @Description 标识与围栏中间表控制层 + * @Author ZeJinG.Su + * @Date 15:31 2024/4/8 + */ @RestController @RequestMapping("/markersFence") public class MarkersFenceController extends BaseController { From 4664426562f4be5ac3a60f4c1261c2a4fce4119e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=89=E5=AE=89=E5=90=9B?= <2746727141@qq.com> Date: Mon, 8 Apr 2024 15:50:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?commit=20=E5=90=88=E5=B9=B6=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhilian-modules/zhilian-online/pom.xml | 6 + .../zhilian/online/config/MqttxConfig.java | 110 +++++++++++------- 2 files changed, 77 insertions(+), 39 deletions(-) diff --git a/zhilian-modules/zhilian-online/pom.xml b/zhilian-modules/zhilian-online/pom.xml index 55aab47..95c6683 100644 --- a/zhilian-modules/zhilian-online/pom.xml +++ b/zhilian-modules/zhilian-online/pom.xml @@ -98,6 +98,12 @@ spring-kafka + + + com.zhilian + zhilian-common-business + + diff --git a/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/config/MqttxConfig.java b/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/config/MqttxConfig.java index 4fb748f..4581512 100644 --- a/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/config/MqttxConfig.java +++ b/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/config/MqttxConfig.java @@ -14,9 +14,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; +import java.util.List; import java.util.Properties; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * @BelongsProject: smart-cloud-server @@ -74,7 +77,7 @@ public class MqttxConfig { /** * kafka订阅topic */ - private String topicName = "test-topic"; + private String topicName = "vehicle-topic"; /** * kafka服务 @@ -85,35 +88,15 @@ public class MqttxConfig { /** * 线程池 */ - private ExecutorService executorService = Executors.newFixedThreadPool(3); + private ExecutorService executorService = Executors.newSingleThreadExecutor(); /** * kafka服务 */ private KafkaProducer kafkaProducer; - /** - * @return - * @Description: 初始化kafka服务 - */ - @PostConstruct - public KafkaProducer initKafkaProducer() { - Properties properties = new Properties(); - properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrap_servers); - properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()); - properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()); - return new KafkaProducer<>(properties); - } - /** - * @param msg - * @Description: 发送消息 - */ - private void sendMsg(String msg) { - kafkaProducer.send(new ProducerRecord<>(topicName, msg)); - log.info("Kafka在topic:{}中发送消息{}", topicName, msg); - } @PostConstruct public void initMqtt() { @@ -128,7 +111,7 @@ public class MqttxConfig { mqttConnectOptions.setPassword(password.toCharArray()); //链接超时 - mqttConnectOptions.setConnectionTimeout(60); + mqttConnectOptions.setConnectionTimeout(10); //心跳检测 mqttConnectOptions.setKeepAliveInterval(60); mqttClient.connect(mqttConnectOptions); @@ -143,10 +126,10 @@ public class MqttxConfig { while (mqttClient.isConnected()) { try { //每次重连间隔60秒 - Thread.sleep(1000 * 60); + Thread.sleep(1000 * 5); mqttClient.connect(); } catch (Exception e) { - throw new RuntimeException(e); + log.error("重连失败：" + e.getMessage()); } } } @@ -157,21 +140,9 @@ public class MqttxConfig { //将接受到的车辆报文存储到kafka中 executorService.execute(() -> { - //解析得出原始报文String - String sourceMsg = new String(mqttMessage.getPayload()); - //对原始报文进行解析 - String parseMsg = MessageResolver.parseMsg(sourceMsg); - - //截取原始报文获得车辆VIN码 - String vin = parseMsg.substring(0, 17); - - log.info("当前车辆VIN码:{}",vin); - - //调取接口,查询是否是我们的车 - - - + executorTask(mqttMessage); }); +// executorTask(mqttMessage); } @@ -191,4 +162,65 @@ public class MqttxConfig { } + + + + public void executorTask(MqttMessage mqttMessage){ + //解析得出原始报文String + String sourceMsg = new String(mqttMessage.getPayload()); + //对原始报文进行解析 + String parseMsg = MessageResolver.parseMsg(sourceMsg); + + //截取原始报文获得车辆VIN码 + String vin = parseMsg.substring(0, 17); + + log.info("当前车辆VIN码:{}",vin); + + + //查询该vin码是否为我们的车 + List cacheList = redisService.getCacheList("our-car"); + List carList = cacheList.stream().map(item -> { + return String.valueOf(item); + }).collect(Collectors.toList()); + if (carList.contains(vin)){ + //将车辆vin码存入redis中,用于判断车辆是否处于上线状态 + redisService.setCacheObject("online-vehicle",vin,60L, TimeUnit.SECONDS); + + //发送rabbitMQ信息修改车辆上线状态 + + String string = mqttMessage.toString(); + //将车辆报文发送到kafka + sendMsg(new String(mqttMessage.getPayload())); + + + }else { + //不是我们的车 + log.info("车辆{}不是我们的车",vin); + } + } + + /** + * @return + * @Description: 初始化kafka服务 + */ + @PostConstruct + public KafkaProducer initKafkaProducer() { + Properties properties = new Properties(); + properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrap_servers); + properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer"); + properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer"); + this.kafkaProducer = new KafkaProducer<>(properties); + return new KafkaProducer<>(properties); + } + + /** + * @param msg + * @Description: 发送消息 + */ + private void sendMsg(String msg) { + kafkaProducer.send(new ProducerRecord<>(topicName, msg)); + log.info("Kafka在topic:{}中发送消息{}", topicName, msg); + } + + }