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 {