From 31155a12a6cb3118f4ee8fd994ddaa5ea93fc4bd Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Mon, 8 Apr 2024 17:23:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 + zhilian-common/pom.xml | 1 + .../zhilian-common-business/pom.xml | 28 ++++ .../com/zhilian/business/domain/Fence.java | 6 +- .../com/zhilian/business/domain/Markers.java | 35 +++++ .../com/zhilian/business/domain/Vehicle.java | 71 ++++++++++ .../zhilian/business/domain/VehicleType.java | 29 ++++ .../business/domain/middle/MarkersFence.java | 34 +++++ .../domain/middle/VehicleMarkers.java | 38 ++++++ .../zhilian/business/domain/vo}/FenceVo.java | 9 +- .../zhilian/business/domain/vo/MarkersVo.java | 8 ++ .../zhilian/business/domain/vo/VehicleVo.java | 37 ++++++ .../business/remote/RemoteFenceService.java | 7 + .../factory/RemoteFenceFallbackFactory.java | 8 ++ .../zhilian/common/core/domain/Result.java | 1 + zhilian-modules/zhilian-business/pom.xml | 6 + .../business/controller/FenceController.java | 40 +++--- .../controller/MarkersController.java | 72 ++++++++++ .../controller/MarkersFenceController.java | 24 ++++ .../controller/VehicleController.java | 124 ++++++++++++++++++ .../controller/VehicleMarkersController.java | 24 ++++ .../controller/VehicleTypeController.java | 25 ++++ .../business/domain/request/BreakReq.java | 4 + .../business/domain/request/FenceRequest.java | 31 ----- .../zhilian/business/mapper/FenceMapper.java | 2 +- .../business/mapper/MarkersFenceMapper.java | 11 ++ .../business/mapper/MarkersMapper.java | 12 ++ .../business/mapper/VehicleMapper.java | 12 ++ .../business/mapper/VehicleMarkersMapper.java | 12 ++ .../business/mapper/VehicleTypeMapper.java | 12 ++ .../business/service/FenceService.java | 10 +- .../business/service/MarkersFenceService.java | 8 ++ .../business/service/MarkersService.java | 13 ++ .../service/VehicleMarkersService.java | 14 ++ .../business/service/VehicleService.java | 12 ++ .../business/service/VehicleTypeService.java | 13 ++ .../service/impl/FenceServiceImpl.java | 40 +++--- .../service/impl/MarkersFenceServiceImpl.java | 16 +++ .../service/impl/MarkersServiceImpl.java | 43 ++++++ .../impl/VehicleMarkersServiceImpl.java | 36 +++++ .../service/impl/VehicleServiceImpl.java | 63 +++++++++ .../service/impl/VehicleTypeServiceImpl.java | 26 ++++ .../src/main/resources/mapper/FenceMapper.xml | 52 -------- .../main/resources/mapper/VehicleMapper.xml | 7 + .../resources/mapper/VehicleMarkersMapper.xml | 7 + .../resolver/ZhiLianResolverApplication.java | 18 --- 46 files changed, 951 insertions(+), 155 deletions(-) create mode 100644 zhilian-common/zhilian-common-business/pom.xml rename {zhilian-modules/zhilian-business => zhilian-common/zhilian-common-business}/src/main/java/com/zhilian/business/domain/Fence.java (94%) create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java rename {zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain => zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo}/FenceVo.java (78%) create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java create mode 100644 zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java delete mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java create mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml create mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml delete mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java diff --git a/pom.xml b/pom.xml index 3b995f9..0eef05b 100644 --- a/pom.xml +++ b/pom.xml @@ -250,6 +250,11 @@ ${mqttv3.version} + + com.zhilian + zhilian-common-business + ${zhilian.version} + diff --git a/zhilian-common/pom.xml b/zhilian-common/pom.xml index 40dfb0d..c126378 100644 --- a/zhilian-common/pom.xml +++ b/zhilian-common/pom.xml @@ -19,6 +19,7 @@ zhilian-common-datasource zhilian-common-system zhilian-common-resolver + zhilian-common-business zhilian-common diff --git a/zhilian-common/zhilian-common-business/pom.xml b/zhilian-common/zhilian-common-business/pom.xml new file mode 100644 index 0000000..b6a2f04 --- /dev/null +++ b/zhilian-common/zhilian-common-business/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + com.zhilian + zhilian-common + 3.6.3 + + + zhilian-common-business + + + 17 + 17 + UTF-8 + + + + + + com.zhilian + zhilian-common-core + + + + diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java similarity index 94% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java index d2ca129..e012a8d 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Fence.java @@ -12,6 +12,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import java.util.List; + @Data @SuperBuilder @NoArgsConstructor @@ -50,6 +52,6 @@ public class Fence extends BaseEntity { @Excel(name = "电子围栏经纬度信息") @TableField("fence_message") private String fenceMessage; - - + @TableField(exist = false) + List markersList; } 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/business/domain/Markers.java new file mode 100644 index 0000000..b89c946 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Markers.java @@ -0,0 +1,35 @@ +package com.zhilian.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +@Data +@ToString +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@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; + + + @TableField(exist = false) + List fenceIds; + +} 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/business/domain/Vehicle.java new file mode 100644 index 0000000..f422402 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/Vehicle.java @@ -0,0 +1,71 @@ +package com.zhilian.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * 车辆信息对象 business_vehicle + */ +@Data +@ToString +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("business_vehicle") +public class Vehicle extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 车辆ID + */ + @Excel(name = "车辆ID",cellType = Excel.ColumnType.NUMERIC) + @TableId(value = "vehicle_id",type = IdType.AUTO) + private Long vehicleId; + /** + * 车辆VIN + */ + @TableField("vehicle_vin") + private String vehicleVIN; + /** + * 车辆类型编号 + */ + private Long vehicleTypeId; + + + @TableField(exist = false) + private Long vehicleTypeName; + + /** + * 电机厂商 + */ + private String vehicleMotor; + /** + * 电池厂商 + */ + private String vehicleBattery; + /** + * 电机ID + */ + private String motorId; + /** + * 电池ID + */ + private String batteryId; + + /** + * 车辆状态 + */ + private Long vehicleState; + + @TableField(exist = false) + private List markersIds; +} 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/business/domain/VehicleType.java new file mode 100644 index 0000000..2d4ef73 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/VehicleType.java @@ -0,0 +1,29 @@ +package com.zhilian.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zhilian.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ToString +@TableName(value = "business_vehicle_type") +public class VehicleType { + + @TableId(value = "vehicle_type_id", type = IdType.AUTO) + @Excel(name = "车型ID") + private Long vehicleTypeId; + + @Excel(name = "车型名称") + @TableField(value = "vehicle_type_name") + private String vehicleTypeName; +} 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/business/domain/middle/MarkersFence.java new file mode 100644 index 0000000..d4a732e --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/MarkersFence.java @@ -0,0 +1,34 @@ +package com.zhilian.business.domain.middle; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +@TableName("business_markers_fence") +public class MarkersFence { + /** + * 车辆标识编号 + */ + @TableId(value = "markers_id",type = IdType.INPUT) + private Long markerId; + @TableField(value = "fence_id",insertStrategy = FieldStrategy.IGNORED) + private Long fenceId; + + public Long getMarkerId() { + return markerId; + } + + public void setMarkerId(Long markerId) { + this.markerId = markerId; + } + + public Long getFenceId() { + return fenceId; + } + + public void setFenceId(Long fenceId) { + this.fenceId = fenceId; + } +} 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/business/domain/middle/VehicleMarkers.java new file mode 100644 index 0000000..ca25e31 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/middle/VehicleMarkers.java @@ -0,0 +1,38 @@ +package com.zhilian.business.domain.middle; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +@TableName("business_vehicle_markers") +public class VehicleMarkers { + /** + * 车辆编号 + */ + @TableId(value = "vehicle_id",type = IdType.INPUT) + private Long vehicleId; + /** + * 车辆标识编号 + */ + @TableField(value = "markers_id",insertStrategy = FieldStrategy.IGNORED) + private Long markersId; + + public Long getVehicleId() { + return vehicleId; + } + + public void setVehicleId(Long vehicleId) { + this.vehicleId = vehicleId; + } + + public Long getMarkersId() { + return markersId; + } + + public void setMarkersId(Long markersId) { + this.markersId = markersId; + } + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java similarity index 78% rename from zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java rename to zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java index eeb2fe3..6881bc3 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/FenceVo.java @@ -1,4 +1,4 @@ -package com.zhilian.business.domain; +package com.zhilian.business.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; @@ -33,11 +33,4 @@ public class FenceVo { private Long fenceState; - /** - * 分页查询 - */ - private Integer pageNum=1; - private Integer pageSize=5; - - } 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/business/domain/vo/MarkersVo.java new file mode 100644 index 0000000..b58a1d7 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/MarkersVo.java @@ -0,0 +1,8 @@ +package com.zhilian.business.domain.vo; + +import lombok.Data; + +@Data +public class MarkersVo { + +} 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/business/domain/vo/VehicleVo.java new file mode 100644 index 0000000..0d351f9 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/vo/VehicleVo.java @@ -0,0 +1,37 @@ +package com.zhilian.business.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.zhilian.common.core.annotation.Excel; +import lombok.Data; + +@Data +public class VehicleVo { + /** + * 车辆VIN + */ + private String vehicleVIN; + /** + * 车辆类型编号 + */ + private Long vehicleTypeId; + /** + * 电子围栏编号 + */ + private Long fenceId; + /** + * 电机厂商 + */ + private String motorBusiness; + /** + * 电池厂商 + */ + private String batteryBusiness; + /** + * 电机ID + */ + private String motorID; + /** + * 电池ID + */ + private String batteryID; +} 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 new file mode 100644 index 0000000..9fd5a94 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteFenceService.java @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..3ba9998 --- /dev/null +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteFenceFallbackFactory.java @@ -0,0 +1,8 @@ +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-core/src/main/java/com/zhilian/common/core/domain/Result.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java index 84155de..261a564 100644 --- a/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.List; /** * 响应信息主体 diff --git a/zhilian-modules/zhilian-business/pom.xml b/zhilian-modules/zhilian-business/pom.xml index d009576..413480b 100644 --- a/zhilian-modules/zhilian-business/pom.xml +++ b/zhilian-modules/zhilian-business/pom.xml @@ -73,6 +73,12 @@ zhilian-common-log + + + com.zhilian + zhilian-common-business + + com.zhilian 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 c7225df..1aedb8d 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 @@ -1,16 +1,17 @@ package com.zhilian.business.controller; -import com.github.pagehelper.PageInfo; import com.zhilian.common.core.domain.Result; import com.zhilian.common.core.web.controller.BaseController; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.FenceVo; import com.zhilian.business.service.FenceService; +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.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Date; +import java.util.List; + /** * @ClassName FenceController * @Description 电子围栏控制层 @@ -27,8 +28,10 @@ public class FenceController extends BaseController { * TODO: 围栏管理 */ @PostMapping("/list") - public Result> fenceList(@RequestBody FenceVo fenceVo) { - return success(fenceService.fenceList(fenceVo)); + public Result> fenceList(@RequestBody Fence fence) { + startPage(); + List result = fenceService.fenceList(fence); + return getDataTable(result); } /** @@ -38,24 +41,27 @@ public class FenceController extends BaseController { */ @PostMapping("/fenceAdd") public Result fenceAdd(@RequestBody Fence fence) { - boolean i = fenceService.save(fence); - return toAjax(i); + fence.setUpdateBy(SecurityUtils.getUsername()); + fence.setUpdateTime(new Date()); + return toAjax(fenceService.save(fence)); } -// @PostMapping("insertFence") -// public Result insertFence(@RequestBody Fence fence) { -// Result result = fenceService.insertFence(fence); -// return Result.success(); -// } /** * 修改电子围栏 */ - // @RequiresPermissions("system:config:fenceAdd") @PostMapping("/fenceUpdate") public Result fenceUpdate(@RequestBody Fence fence) { - boolean i = fenceService.updateById(fence); - return toAjax(i); + fence.setUpdateBy(SecurityUtils.getUsername()); + fence.setUpdateTime(new Date()); + return toAjax(fenceService.updateById(fence)); + } + + @PostMapping("/fenceUpdateMap") + public Result fenceUpdateMap(@RequestBody Fence fence) { + fence.setUpdateBy(SecurityUtils.getUsername()); + fence.setUpdateTime(new Date()); + return toAjax(fenceService.updateById(fence)); } /** @@ -65,8 +71,8 @@ public class FenceController extends BaseController { */ @PostMapping("/fenceDelete/{fenceId}") public Result fenceDelete(@PathVariable String fenceId) { - boolean i = fenceService.removeById(fenceId); - return toAjax(i); + return toAjax(fenceService.removeById(fenceId)); } + } 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 new file mode 100644 index 0000000..9221418 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java @@ -0,0 +1,72 @@ +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.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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/markers") +public class MarkersController extends BaseController { + @Autowired + private MarkersService markersService; + @Autowired + private MarkersFenceService markersFenceService; + + /** + * 车辆标识列表 + * @param markers + * @return + */ + @PostMapping("list") + public Result> list(@RequestBody Markers markers) { + startPage(); + List result = markersService.selectMarkersList(markers); + return getDataTable(result); + } + + @GetMapping("markersVehicle") + public Result> markersVehicle() { + List listMarkers = markersService.listMarkers(); + return Result.success(listMarkers); + } + + @PostMapping("insert") + public Result insert(@RequestBody Markers markers){ + return toAjax(markersService.save(markers)); + } + + @PostMapping("update") + public Result update(@RequestBody Markers markers) { + return toAjax(markersService.updateById(markers)); + } + + @PostMapping("delete/{markersId}") + public Result delete(@PathVariable Long markersId) { + markersFenceList(markersId).forEach(markersFence -> { + markersFenceService.removeById(markersId); + }); + return toAjax(markersService.removeById(markersId)); + } + + @PostMapping("insertMarkersFence") + public Result insertMarkersFenceMarkers(@RequestBody MarkersFence markersFence){ + return toAjax(markersFenceService.save(markersFence)); + } + + @PostMapping("markersFenceList/{markersId}") + public List markersFenceList(@PathVariable Long markersId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MarkersFence::getMarkerId, markersId); + return markersFenceService.list(queryWrapper); + } + +} 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 new file mode 100644 index 0000000..0db23e4 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java @@ -0,0 +1,24 @@ +package com.zhilian.business.controller; + +import com.zhilian.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; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/markersFence") +public class MarkersFenceController extends BaseController { + @Autowired + private MarkersFenceService markersFenceService; + + @PostMapping("/list") + public Result> markersFenceList() { + return Result.success(markersFenceService.list()); + } +} 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 new file mode 100644 index 0000000..d6a153b --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java @@ -0,0 +1,124 @@ +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.business.service.MarkersService; +import com.zhilian.business.service.VehicleMarkersService; +import com.zhilian.business.service.VehicleService; +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 +@RequestMapping("/vehicle") +public class VehicleController extends BaseController { + @Autowired + private VehicleService vehicleService; + + @Autowired + private VehicleMarkersService vehicleMarkersService; + + + @Autowired + private MarkersService markersService; + + + /** + * 查询车辆列表 + * @param vehicle + * @return + */ + @PostMapping("/list") + public Result> list(@RequestBody Vehicle vehicle) { + startPage(); + List list = vehicleService.selectVehicleList(vehicle); + return getDataTable(list); + } + + /** + * 新增车辆 + * @param vehicle + * @return + */ + @PostMapping("/vehicleInsert") + public Result vehicleInsert(@RequestBody Vehicle vehicle){ + vehicle.setCreateBy(SecurityUtils.getUsername()); + vehicle.setCreateTime(new Date()); + return toAjax(vehicleService.save(vehicle)); + } + + /** + * 修改车辆 + * @param vehicle + * @return + */ + @PostMapping("/vehicleUpdate") + public Result vehicleUpdate(@RequestBody Vehicle vehicle){ + vehicle.setUpdateBy(SecurityUtils.getUsername()); + vehicle.setUpdateTime(new Date()); + + //删除中间表全部关联数据 + vehicleMarkersService.removeAllVehicle(vehicle); + + //修改原表数据 + boolean update =vehicleService.updateById(vehicle); + + //重新添加中间表数据 + vehicleMarkersService.insert(vehicle); + return toAjax(update); + } + + /** + * 根据车辆ID查询车辆与围栏中间表 + * @param vehicleId + * @return + */ + @PostMapping("/getVehicleMarkers/{vehicleId}") + public List getVehicleMarkers(@PathVariable Long vehicleId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + 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 + * @return + */ + @PostMapping("/vehicleDelete/{vehicleId}") + public Result vehicleDelete(@PathVariable Long vehicleId){ + getVehicleMarkers(vehicleId).forEach(vehicleMarkers -> { + vehicleMarkersService.removeById(vehicleId); + }); + return toAjax(vehicleService.removeById(vehicleId)); + } + + /** + * 车辆绑定围栏 + * @param vehicle + * @return + */ + @PostMapping("/vehicleInsertMarkers") + public Result vehicleInsertMarkers(@RequestBody Vehicle vehicle){ + boolean insert = vehicleMarkersService.insert(vehicle); + return toAjax(insert); + } +} 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 new file mode 100644 index 0000000..56837a7 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java @@ -0,0 +1,24 @@ +package com.zhilian.business.controller; + +import com.zhilian.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; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/vehicleMarkers") +public class VehicleMarkersController extends BaseController { + @Autowired + private VehicleMarkersService vehicleMarkersService; + + @PostMapping("/list") + public Result> vehicleMarkersList() { + return Result.success(vehicleMarkersService.list()); + } +} 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 new file mode 100644 index 0000000..29b9036 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java @@ -0,0 +1,25 @@ +package com.zhilian.business.controller; + +import com.zhilian.business.domain.VehicleType; +import com.zhilian.business.service.VehicleTypeService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("vehicleType") +public class VehicleTypeController extends BaseController { + @Autowired + private VehicleTypeService vehicleTypeService; + + @GetMapping("list") + public Result> list(){ + List list = vehicleTypeService.listVehicleType(); + return Result.success(list); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java index ad62483..a0ec734 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/BreakReq.java @@ -17,8 +17,12 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class BreakReq { + /** 故障id */ private Integer breakId; + /** 故障码 */ private String breakCode; + /** 车辆VIN */ private String breakVin; + /** 故障类型 */ private String breakType; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java deleted file mode 100644 index 2898904..0000000 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zhilian.business.domain.request; - -import com.zhilian.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class FenceRequest extends BaseEntity { - private static final long serialVersionUID = 1L; - /** - * 电子围栏名称 - */ - private String fenceName; - /** - * 电子围栏类型编号 - */ - private Long fenceTypeId; - /** - * 电子围栏状态 - */ - private Long fenceState; - - -} 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 9b4c3c8..acd8e76 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 @@ -2,7 +2,7 @@ package com.zhilian.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.FenceVo; +import com.zhilian.business.domain.vo.FenceVo; 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/MarkersFenceMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java new file mode 100644 index 0000000..c5c26d8 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java @@ -0,0 +1,11 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.middle.MarkersFence; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface MarkersFenceMapper extends BaseMapper { +} 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 new file mode 100644 index 0000000..f766a24 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java @@ -0,0 +1,12 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.Markers; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface MarkersMapper extends BaseMapper { +} + 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 new file mode 100644 index 0000000..b917deb --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java @@ -0,0 +1,12 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.Vehicle; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface VehicleMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..a03d94b --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java @@ -0,0 +1,12 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.middle.VehicleMarkers; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface VehicleMarkersMapper extends BaseMapper { + +} 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 new file mode 100644 index 0000000..4948148 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java @@ -0,0 +1,12 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.VehicleType; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +@Mapper +@Component +public interface VehicleTypeMapper extends BaseMapper { + +} 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 9a39ef7..4592c86 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,14 +1,10 @@ package com.zhilian.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.FenceVo; -import com.zhilian.common.core.domain.Result; + +import java.util.List; public interface FenceService extends IService { - PageInfo fenceList(FenceVo fenceVo); - - -// Result insertFence(Fence fence); + List fenceList(Fence fence); } 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 new file mode 100644 index 0000000..0af642c --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java @@ -0,0 +1,8 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.middle.MarkersFence; + +public interface MarkersFenceService extends IService { +// List selectFenceByIdAndMarkersBuyId(List list, List list1, List list2,MarkersFence markersFence); +} 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 new file mode 100644 index 0000000..832269e --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java @@ -0,0 +1,13 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.Markers; + +import java.util.List; + +public interface MarkersService extends IService { + List selectMarkersList(Markers markers); + + List listMarkers(); + +} 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 new file mode 100644 index 0000000..a18835c --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java @@ -0,0 +1,14 @@ +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 org.springframework.stereotype.Service; + +@Service +public interface VehicleMarkersService extends IService { + + boolean insert(Vehicle vehicle); + + void removeAllVehicle(Vehicle vehicle); +} 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 new file mode 100644 index 0000000..31a70d4 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java @@ -0,0 +1,12 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.Vehicle; + +import java.util.List; + +public interface VehicleService extends IService { + + List selectVehicleList(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 new file mode 100644 index 0000000..3bff3b5 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java @@ -0,0 +1,13 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhilian.business.domain.VehicleType; + +import java.util.List; + +public interface VehicleTypeService extends IService { + + List listVehicleType(); + + +} 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 6d979b9..1e3f369 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 @@ -1,38 +1,40 @@ package com.zhilian.business.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.FenceVo; import com.zhilian.business.mapper.FenceMapper; import com.zhilian.business.service.FenceService; -import com.zhilian.common.core.domain.Result; -import org.springframework.beans.factory.annotation.Autowired; +import com.zhilian.common.core.utils.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @Service public class FenceServiceImpl extends ServiceImpl implements FenceService { - @Autowired - private FenceMapper fenceMapper; @Override - public PageInfo fenceList(FenceVo fenceVo) { + public List fenceList(Fence fence) { + if (fence.getFenceName() == null && fence.getFenceTypeId() == null && fence.getFenceState() == null) { + return this.list(); + } - PageHelper.startPage(fenceVo.getPageNum(),fenceVo.getPageSize()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - List list=fenceMapper.fenceList(fenceVo); + // 模糊条件 - 电子围栏名称 + if (StringUtils.isNotEmpty(fence.getFenceName())) { + queryWrapper.like(Fence::getFenceName, fence.getFenceName()); + } - PageInfo info = new PageInfo(list); + // 精确查询 - 查询类型 + if (fence.getFenceTypeId() != null) { + queryWrapper.eq(Fence::getFenceTypeId, fence.getFenceTypeId()); + } - return info; + // 模糊查询 - 状态 + if (fence.getFenceState() != null) { + queryWrapper.eq(Fence::getFenceState, fence.getFenceState()); + } + + return this.list(queryWrapper); } - -// @Override -// public Result insertFence(Fence fence) { -// boolean save = this.save(fence); -// return Result.success(save); -// } - } 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 new file mode 100644 index 0000000..ad47575 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java @@ -0,0 +1,16 @@ +package com.zhilian.business.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhilian.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; + +@Service +public class MarkersFenceServiceImpl extends ServiceImpl implements MarkersFenceService { + @Autowired + private MarkersFenceMapper markersFenceMapper; + + +} 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 new file mode 100644 index 0000000..27855e6 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java @@ -0,0 +1,43 @@ +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.business.mapper.MarkersMapper; +import com.zhilian.business.service.MarkersService; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MarkersServiceImpl extends ServiceImpl implements MarkersService { + @Autowired + RedisService service; + @Override + public List selectMarkersList(Markers markers) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //模糊查询 查询标识名称 + queryWrapper.like(StringUtils.isNotEmpty(markers.getMarkersName()), Markers::getMarkersName, markers.getMarkersName()); + + return this.list(queryWrapper); + } + + + /** + * 查询全部标识信息 + * @return + */ + @Override + public List listMarkers() { + if(service.hasKey("markers")){ + List markers = service.getCacheList("markers"); + return markers; + } + List list = this.list(); + service.setCacheList("markers",list); + return list; + } +} 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 new file mode 100644 index 0000000..2bda78e --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java @@ -0,0 +1,36 @@ +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.business.mapper.VehicleMarkersMapper; +import com.zhilian.business.service.VehicleMarkersService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class VehicleMarkersServiceImpl extends ServiceImpl implements VehicleMarkersService { + + @Transactional(rollbackFor=Exception.class) + @Override + public boolean insert(Vehicle vehicle) { + vehicle.getMarkersIds().forEach(markerId -> { + VehicleMarkers vehicleMarkers = new VehicleMarkers(); + vehicleMarkers.setVehicleId(vehicle.getVehicleId()); + vehicleMarkers.setMarkersId(markerId); + this.save(vehicleMarkers); + }); + return true; + } + + @Override + public void removeAllVehicle(Vehicle vehicle) { + List list = this.list(new LambdaQueryWrapper().eq(VehicleMarkers::getVehicleId, vehicle.getVehicleId())); + list.forEach(item -> { + this.removeById(item.getVehicleId()); + }); + } +} 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 new file mode 100644 index 0000000..dc50464 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java @@ -0,0 +1,63 @@ +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.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 { + + + @Override + public List selectVehicleList(Vehicle vehicle) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //模糊条件 查询VIN + if (StringUtils.isNotEmpty(vehicle.getVehicleVIN())) { + queryWrapper.like(Vehicle::getVehicleVIN, vehicle.getVehicleVIN()); + } + // 精确查询 - 查询类型 + if (vehicle.getVehicleTypeId() != null) { + queryWrapper.eq(Vehicle::getVehicleTypeId, vehicle.getVehicleTypeId()); + } + //模糊查询 车辆电机厂商 + if (StringUtils.isNotEmpty(vehicle.getMotorId())) { + queryWrapper.like(Vehicle::getMotorId, vehicle.getMotorId()); + } + //模糊查询 车辆电池厂商 + if (StringUtils.isNotEmpty(vehicle.getBatteryId())) { + queryWrapper.like(Vehicle::getBatteryId, vehicle.getBatteryId()); + } + //模糊查询 车辆电机ID + if (StringUtils.isNotEmpty(vehicle.getVehicleMotor())) { + queryWrapper.like(Vehicle::getVehicleMotor, vehicle.getVehicleMotor()); + } + //模糊查询 车辆电池ID + if (StringUtils.isNotEmpty(vehicle.getVehicleBattery())) { + queryWrapper.like(Vehicle::getVehicleBattery, vehicle.getVehicleBattery()); + } + //精确查询 车辆状态 + if (vehicle.getVehicleState() != null) { + queryWrapper.eq(Vehicle::getVehicleState, vehicle.getVehicleState()); + } + +// queryWrapper.like(StringUtils.isNotEmpty(vehicle.getVehicleVIN()), Vehicle::getVehicleVIN, vehicle.getVehicleVIN()) +// .eq(vehicle.getVehicleTypeId() != null, Vehicle::getVehicleTypeId, vehicle.getVehicleTypeId()) +// .like(StringUtils.isNotEmpty(vehicle.getMotorID()), Vehicle::getMotorID, vehicle.getMotorID()) +// .like(StringUtils.isNotEmpty(vehicle.getBatteryID()), Vehicle::getBatteryID, vehicle.getBatteryID()) +// .like(StringUtils.isNotEmpty(vehicle.getMotorBusiness()), Vehicle::getMotorBusiness, vehicle.getMotorBusiness()) +// .like(StringUtils.isNotEmpty(vehicle.getBatteryBusiness()), Vehicle::getBatteryBusiness, vehicle.getBatteryBusiness()) +// .eq(vehicle.getVehicleState() != null, Vehicle::getVehicleState, vehicle.getVehicleState()); + return this.list(queryWrapper); + } + +} 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 new file mode 100644 index 0000000..271ab88 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java @@ -0,0 +1,26 @@ +package com.zhilian.business.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhilian.business.domain.VehicleType; +import com.zhilian.business.mapper.VehicleTypeMapper; +import com.zhilian.business.service.VehicleTypeService; +import com.zhilian.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +public class VehicleTypeServiceImpl extends ServiceImpl implements VehicleTypeService { + @Autowired + private RedisService redisService; + @Override + public List listVehicleType() { + if(redisService.hasKey("vehicleType")){ + List vehicleType = redisService.getCacheList("vehicleType"); + return vehicleType; + } + List list = this.list(); + redisService.setCacheList("vehicleType",list); + return this.list(); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml index 7ae037c..6acc1c7 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml @@ -3,57 +3,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml new file mode 100644 index 0000000..3addf96 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml new file mode 100644 index 0000000..536f8f4 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java deleted file mode 100644 index de0dc3d..0000000 --- a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zhilian.resolver; -import com.zhilian.common.security.annotation.EnableMyFeignClients; -import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.scheduling.annotation.EnableScheduling; - -@EnableCustomSwagger2 -@EnableScheduling -@EnableMyFeignClients -@MapperScan({"com.zhilian.resolver.mapper", "com.zhilian.resolver.resolverReport"}) -@SpringBootApplication -public class ZhiLianResolverApplication { - public static void main(String[] args) { - SpringApplication.run(ZhiLianResolverApplication.class, args); - } -}