diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/ElectronicFenceCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/ElectronicFenceCacheService.java index 3d895aa..ef472f8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/ElectronicFenceCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/ElectronicFenceCacheService.java @@ -9,7 +9,7 @@ import com.muyu.enterprise.domain.dateBase.ElectronicFence; * @ClassName ElectronicFenceCacheService * @Description ElectronicFenceCacheService:类的描述 * @Date 2024/10/3 15:22 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ public class ElectronicFenceCacheService extends CacheAbsBasic { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dateBase/CarGroupCentre.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dateBase/CarGroupCentre.java new file mode 100644 index 0000000..0af58d3 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dateBase/CarGroupCentre.java @@ -0,0 +1,41 @@ +package com.muyu.enterprise.domain.dateBase; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.*; + + + +/** + * 围栏组_车辆_中间表 + * @ClassName CarGroupCentre + * @PATH com.muyu.enterprise.domain:类的路径 + * @Date 2024/10/10 19:27 + * @author MingWei.Zong(微醺) + */ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Tag(name = "车辆表") +@Builder +@TableName(value = "car_manage",autoResultMap = true) +public class CarGroupCentre { + /** + * 围栏组_车辆_中间表ID + */ + @TableId(value = "car_group_id",type = IdType.AUTO) + private Integer carGroupId; + /** + * 围栏组表id + */ + private Integer electronicFenceId; + /** + * 车辆id + */ + private Integer carId; + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarTemplateVO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarTemplateVO.java index 6853cbf..18f1e24 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarTemplateVO.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarTemplateVO.java @@ -1,23 +1,22 @@ package com.muyu.enterprise.domain.vo; -/** - * 控制层 - * 业务实现层 - * @ClassName CarTemplateVO - * @PATH com.muyu.enterprise.domain.vo:类的路径 - * @Date 2024/10/9 20:42 - * @author MingWei.Zong(微醺) - */ + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; + +/** + * 自定义报文模块表 + * @ClassName CarTemplateVO + * @PATH com.muyu.enterprise.domain.vo:类的路径 + * @Date 2024/10/9 20:42 + * @author MingWei.Zong(微醺) + */ @Data @NoArgsConstructor @AllArgsConstructor -@Builder -@TableName(value = "car_template",autoResultMap = true) public class CarTemplateVO { /** * 报文模版表 @@ -58,4 +57,6 @@ public class CarTemplateVO { * 报文标签 */ private String messageLabel; + + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java index 57352ac..eeff164 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java @@ -12,17 +12,20 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; - +/** + * 自定义车辆表--实体类 + * @ClassName CarVO + * @Description 自定义车辆表 + * @author MingWei.Zong(微醺) + * @Date 2024/9/28 16:52 + */ @Data @NoArgsConstructor @AllArgsConstructor -@Builder -@TableName(value = "t_car",autoResultMap = true) public class CarVO { /** * 车辆表 */ - @TableId(value = "car_id",type = IdType.AUTO) private Integer carId; /** * 车架号 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/ElectronicFenceVO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/ElectronicFenceVO.java new file mode 100644 index 0000000..601d380 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/ElectronicFenceVO.java @@ -0,0 +1,53 @@ +package com.muyu.enterprise.domain.vo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.enterprise.domain.resp.ElectronicFenceResp; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; + +import java.util.List; + + +/** + * 自定义电子围栏表 + * @ClassName ElectronicFenceVO + * @PATH com.muyu.enterprise.domain.vo:类的路径 + * @Date 2024/10/10 19:59 + * @author MingWei.Zong(微醺) + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ElectronicFenceVO { + /** + * 围栏组id + */ + private Long groupId; + /** + * 围栏组优先级 + */ + private Integer priority; + /** + * 围栏组名称 + */ + private String groupName; + /** + * 围栏组类型 + */ + private String groupType; + + /** + * 启用状态 + */ + private String status; + + + /** + * 绑定的电子围栏 + */ + List electronicFenceRespList; + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/WarnVo.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/WarnVo.java index c2cab1f..dfb5c2e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/WarnVo.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/WarnVo.java @@ -1,23 +1,26 @@ package com.muyu.enterprise.domain.vo; -/** - * 控制层 - * 业务实现层 - * @ClassName WarnVo - * @PATH com.muyu.enterprise.domain.vo:类的路径 - * @Date 2024/10/8 14:05 - * @author MingWei.Zong(微醺) - */ + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.muyu.common.core.annotation.Excel; import com.muyu.enterprise.domain.WarnRule; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; import java.util.List; - +/** + * 自定义预警策略表 + * @ClassName WarnVo + * @PATH com.muyu.enterprise.domain.vo:类的路径 + * @Date 2024/10/8 14:05 + * @author MingWei.Zong(微醺) + */ @Data +@NoArgsConstructor +@AllArgsConstructor public class WarnVo { /** 策略id */ private Long id; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java index 8702bc4..f99a828 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java @@ -49,6 +49,7 @@ public class CarTypeController { CarType carType = carTypeService.findById(catTypeId); return Result.success(carType); } + /** * 通过报文模版id查询车辆类型表 * @param templateId