diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarMiddle.java b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarMiddle.java index 6317746..5e3f390 100644 --- a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarMiddle.java +++ b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarMiddle.java @@ -42,4 +42,12 @@ public class CarMiddle { this.fenceGroupId = fenceGroupId; this.carInformationId = carInformationId; } + + public static CarMiddle carMiddleBuilder(CarMiddle carMiddle) { + return CarMiddle.builder() + .id(carMiddle.getId()) + .fenceGroupId(carMiddle.getFenceGroupId()) + .carInformationId(carMiddle.getCarInformationId()) + .build(); + } } diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupReq.java b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupResq.java similarity index 90% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupReq.java rename to cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupResq.java index 79d2873..81c5f48 100644 --- a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupReq.java +++ b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupResq.java @@ -1,14 +1,10 @@ package com.muyu.domain.resq; -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.fasterxml.jackson.annotation.JsonFormat; import com.muyu.domain.CarFenceGroup; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; @@ -27,7 +23,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Tag(name = "车辆电子围栏类") -public class CarFenceGroupReq { +public class CarFenceGroupResq { /** * 围栏主键 */ diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupsResq.java b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupsResq.java new file mode 100644 index 0000000..211b2f7 --- /dev/null +++ b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupsResq.java @@ -0,0 +1,49 @@ +package com.muyu.domain.resq; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author：yang + * @Package：com.muyu.domain.resq + * @Project：cloud-server-8 + * @name：CarFenceGroupsResq + * @Date：2024/9/25 21:08 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "车辆电子围栏类") +public class CarFenceGroupsResq { + + /** + * 围栏组ID + */ + @TableId(value = "id",type = IdType.AUTO) + private Integer id; + /** + * 优先级 + */ + private Integer priority; + /** + * 启动状态 + */ + private String status; + /** + * 围栏组类型 + */ + private String groupType; + /** + * 车辆唯一VIN + */ +// @TableName(value = "car_information_VIN") + private String carInformationLicensePlate; + /** + * 围栏经纬度 + */ + private String fenceText; +} diff --git a/cloud-modules/cloud-Vehicle-Simulation/pom.xml b/cloud-modules/cloud-Vehicle-Simulation/pom.xml new file mode 100644 index 0000000..eff5a9b --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + com.muyu + cloud-server + 3.6.3 + ../../pom.xml + + com.muyu.server + cloud-Vehicle-Simulation + + + 21 + 21 + UTF-8 + + + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + org.springframework.boot + spring-boot-starter-actuator + + + + com.mysql + mysql-connector-j + + + + com.muyu + cloud-common-datasource + + + + com.muyu + cloud-common-datascope + + + + com.muyu + cloud-common-log + + + + com.muyu + cloud-common-api-doc + + + com.muyu + cloud-electronic-common + 3.6.3 + + + com.github.pagehelper + pagehelper + 6.0.0 + + + + cloud-electronic + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/java/com/muyu/vehicle/VehicleSimulationApplication.java b/cloud-modules/cloud-Vehicle-Simulation/src/main/java/com/muyu/vehicle/VehicleSimulationApplication.java new file mode 100644 index 0000000..4c91838 --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/src/main/java/com/muyu/vehicle/VehicleSimulationApplication.java @@ -0,0 +1,20 @@ +package com.muyu.vehicle; + +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @Author：杨闪闪 + * @Package：com.muyu.server.integration + * @Project：cloud-integration + * @name：Integration + * @Date：2024/9/17 下午9:56 + */ +@EnableMyFeignClients +@SpringBootApplication +public class VehicleSimulationApplication { + public static void main(String[] args) { + SpringApplication.run(VehicleSimulationApplication.class, args); + } +} diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ + diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/banner.txt b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/bootstrap.yml b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..574393e --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/bootstrap.yml @@ -0,0 +1,47 @@ +# Tomcat +server: + port: 9111 + +# nacos线上地址 +nacos: + addr: 127.0.0.1:8848 + user-name: nacos + password: nacos + namespace: eight + +# Spring +spring: + application: + # 应用名称 + name: cloud-electronic + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + config: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/dev.xml b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..187e473 --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/prod.xml b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..9f04f11 --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/test.xml b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/test.xml new file mode 100644 index 0000000..9f04f11 --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/mapper/CarMiddleGroupMapper.xml b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/mapper/CarMiddleGroupMapper.xml new file mode 100644 index 0000000..e95c1a4 --- /dev/null +++ b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/mapper/CarMiddleGroupMapper.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceController.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceController.java index 3718837..a15dcf2 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceController.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceController.java @@ -1,16 +1,11 @@ package com.muyu.server.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFence; -import com.muyu.domain.CarFenceGroup; -import com.muyu.domain.CarInformation; -import com.muyu.domain.req.CarFenceReq; -import com.muyu.domain.req.CarGroupIdReq; -import com.muyu.domain.req.CarGroupReq; -import com.muyu.domain.req.FenceGroupReq; -import com.muyu.domain.resq.CarFenceGroupReq; +import com.muyu.domain.req.*; +import com.muyu.domain.resq.CarFenceGroupResq; +import com.muyu.domain.resq.CarFenceGroupsResq; import com.muyu.domain.resq.CarFenceResq; import com.muyu.server.service.CarFenceService; import io.swagger.v3.oas.annotations.Operation; @@ -105,10 +100,10 @@ public class CarFenceController { */ @PostMapping("/selectCarFenceGroupList") @Operation(summary = "查询数据",description = "查询数据") - public Result> selectCarFenceGroupList( + public Result> selectCarFenceGroupList( @Validated @RequestBody Integer id ){ - List list = carFenceService.selectCarFenceGroupList(id); + List list = carFenceService.selectCarFenceGroupList(id); return list.size()!=0?Result.success( list, "操作成功" ):Result.success( @@ -130,5 +125,17 @@ public class CarFenceController { null, "未绑定围栏" ); } + + /** + * 查询车辆围栏组信息 + */ + @PostMapping("/carGroupList") + @Operation(summary = "查询车辆围栏组数据",description = "查询车辆围栏组信息") + public Result> carGroupList(@RequestBody CarFenceGroupReq req){ + List connects = carFenceService.carGroupList(req); + return Result.success( + connects, "操作成功" + ); + } } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarMiddleController.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarMiddleController.java index de9d3ca..6a27f3a 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarMiddleController.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarMiddleController.java @@ -4,6 +4,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFenceGroup; import com.muyu.domain.CarMiddle; import com.muyu.domain.req.CarFenceGroupReq; +import com.muyu.domain.resq.CarFenceGroupsResq; import com.muyu.server.service.CarMiddleSerivce; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -49,15 +50,5 @@ public class CarMiddleController { ); } - /** - * 查询车辆围栏组信息 - */ - @PostMapping("/carGroupList") - @Operation(summary = "查询车辆围栏组数据",description = "查询车辆围栏组信息") - public Result> carGroupList(@RequestBody CarFenceGroupReq req){ - List connects = carMiddleSerivce.carGroupList(req); - return Result.success( - connects, "操作成功" - ); - } + } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceService.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceService.java index edd2ffc..2a3b5e6 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceService.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceService.java @@ -3,13 +3,9 @@ package com.muyu.server.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.CarFence; -import com.muyu.domain.CarFenceGroup; -import com.muyu.domain.CarInformation; -import com.muyu.domain.req.CarFenceReq; -import com.muyu.domain.req.CarGroupIdReq; -import com.muyu.domain.req.CarGroupReq; -import com.muyu.domain.req.FenceGroupReq; -import com.muyu.domain.resq.CarFenceGroupReq; +import com.muyu.domain.req.*; +import com.muyu.domain.resq.CarFenceGroupResq; +import com.muyu.domain.resq.CarFenceGroupsResq; import com.muyu.domain.resq.CarFenceResq; import java.util.List; @@ -33,7 +29,9 @@ public interface CarFenceService extends IService { Boolean addFenceGroup(FenceGroupReq req); - List selectCarFenceGroupList(Integer id); + List selectCarFenceGroupList(Integer id); Boolean carFenceGroupDel(CarGroupIdReq carGroupIdReq); + + List carGroupList(CarFenceGroupReq req); } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleSerivce.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleSerivce.java index b64b91d..7365dbd 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleSerivce.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleSerivce.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.CarFenceGroup; import com.muyu.domain.CarMiddle; import com.muyu.domain.req.CarFenceGroupReq; +import com.muyu.domain.resq.CarFenceGroupsResq; import java.util.List; @@ -15,5 +16,5 @@ import java.util.List; * @Date：2024/9/20 16:34 */ public interface CarMiddleSerivce extends IService { - List carGroupList(CarFenceGroupReq req); + } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java index 25a51d8..3b10fea 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java @@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.*; -import com.muyu.domain.req.CarFenceReq; -import com.muyu.domain.req.CarGroupIdReq; -import com.muyu.domain.req.CarGroupReq; -import com.muyu.domain.req.FenceGroupReq; -import com.muyu.domain.resq.CarFenceGroupReq; +import com.muyu.domain.req.*; +import com.muyu.domain.resq.CarFenceGroupResq; +import com.muyu.domain.resq.CarFenceGroupsResq; import com.muyu.domain.resq.CarFenceResq; import com.muyu.server.mapper.CarFenceMapper; import com.muyu.server.service.*; @@ -43,6 +41,8 @@ public class CarFenceServiceImpl private CarFenceGroupService carFenceGroupService; @Autowired private CarMiddleSerivce carMiddleSerivce; + @Autowired + private CarInformationService carInformationService; /** * 查询围栏信息 */ @@ -150,18 +150,18 @@ public class CarFenceServiceImpl } @Override - public List selectCarFenceGroupList(Integer id) { + public List selectCarFenceGroupList(Integer id) { List list = carMiddleGroupService.list( new LambdaQueryWrapper() .eq(CarMiddleGroup::getFenceGroupId,id)) .stream() .map(CarMiddleGroup::carMiddleGroupBuilder) .toList(); - List carFenceGroupReqs = new ArrayList<>(); + List carFenceGroupResqs = new ArrayList<>(); list.forEach(carMiddleGroup -> { - this.carMiddleList(carMiddleGroup,carFenceGroupReqs); + this.carMiddleList(carMiddleGroup, carFenceGroupResqs); }); - return carFenceGroupReqs; + return carFenceGroupResqs; } @Override @@ -177,7 +177,7 @@ public class CarFenceServiceImpl return carMiddleGroupService.removeBatchByIds(list); } - private void carMiddleList(CarMiddleGroup carMiddleGroup, List carFenceGroupReqs) { + private void carMiddleList(CarMiddleGroup carMiddleGroup, List carFenceGroupResqs) { Integer carFenceId = carMiddleGroup.getCarFenceId(); Integer fenceGroupId = carMiddleGroup.getFenceGroupId(); List carFenceList = this.list( @@ -193,23 +193,23 @@ public class CarFenceServiceImpl .map(CarFenceGroup::carFenceBuild) .toList(); carFenceList.forEach(carFence -> { - CarFenceGroupReq carFenceGroupReq = new CarFenceGroupReq(); - carFenceGroupReq.setId(carFence.getId()); - carFenceGroupReq.setName(carFence.getName()); - carFenceGroupReq.setClazzId(carFence.getClazzId()); - carFenceGroupReq.setTypeId(carFence.getTypeId()); - carFenceGroupReq.setFenceText(carFence.getFenceText()); - carFenceGroupReq.setFenceStart(carFence.getFenceStart()); - carFenceGroupReq.setFenceEnd(carFence.getFenceEnd()); - carFenceGroupReq.setFenceCreate(carFence.getFenceCreate()); + CarFenceGroupResq carFenceGroupResq = new CarFenceGroupResq(); + carFenceGroupResq.setId(carFence.getId()); + carFenceGroupResq.setName(carFence.getName()); + carFenceGroupResq.setClazzId(carFence.getClazzId()); + carFenceGroupResq.setTypeId(carFence.getTypeId()); + carFenceGroupResq.setFenceText(carFence.getFenceText()); + carFenceGroupResq.setFenceStart(carFence.getFenceStart()); + carFenceGroupResq.setFenceEnd(carFence.getFenceEnd()); + carFenceGroupResq.setFenceCreate(carFence.getFenceCreate()); - carFenceGroupReqs.add(carFenceGroupReq); + carFenceGroupResqs.add(carFenceGroupResq); }); carFenceGroupsList.forEach(carFenceGroup -> { - carFenceGroupReqs.forEach(carFenceGroupReq -> { - carFenceGroupReq.setPriority(carFenceGroup.getPriority()); - carFenceGroupReq.setStatus(carFenceGroup.getStatus()); - carFenceGroupReq.setGroupType(carFenceGroup.getGroupType()); + carFenceGroupResqs.forEach(carFenceGroupResq -> { + carFenceGroupResq.setPriority(carFenceGroup.getPriority()); + carFenceGroupResq.setStatus(carFenceGroup.getStatus()); + carFenceGroupResq.setGroupType(carFenceGroup.getGroupType()); }); }); } @@ -242,4 +242,60 @@ public class CarFenceServiceImpl }); }); } + @Override + public List carGroupList(CarFenceGroupReq req) { + + List fenceGroupList = new ArrayList<>(); + CarFenceGroupsResq carFenceGroupsResq = new CarFenceGroupsResq(); + + List list = carMiddleGroupService.list( + new LambdaQueryWrapper() + .eq(CarMiddleGroup::getCarFenceId, req.getId())) + .stream() + .map(CarMiddleGroup::carMiddleGroupBuilder) + .toList(); + List carFenceList = this.list() + .stream() + .map(CarFence::carFenceBuild) + .toList(); + list.forEach(carMiddleGroup -> { + List carMiddleGroupList = carMiddleSerivce.list( + new LambdaQueryWrapper() + .eq(CarMiddle::getFenceGroupId, carMiddleGroup.getFenceGroupId())) + .stream() + .map(CarMiddle::carMiddleBuilder) + .toList(); + carMiddleGroupList.forEach(carMiddle -> { + List carFenceGroupList = carFenceGroupService.list( + new LambdaQueryWrapper() + .eq(CarFenceGroup::getId, carMiddle.getFenceGroupId())) + .stream() + .map(CarFenceGroup::carFenceBuild) + .toList(); + List carInformationList = carInformationService.list( + new LambdaQueryWrapper() + .eq(CarInformation::getCarInformationId, carMiddle.getCarInformationId())) + .stream() + .map(CarInformation::carInformationBuilder) + .toList(); + carFenceList.forEach(carFence -> { + + carFenceGroupsResq.setFenceText(carFence.getFenceText()); + + }); + carFenceGroupList.forEach(carFenceGroup -> { + carFenceGroupsResq.setId(carFenceGroup.getId()); + carFenceGroupsResq.setStatus(carFenceGroup.getStatus()); + carFenceGroupsResq.setPriority(carFenceGroup.getPriority()); + carFenceGroupsResq.setGroupType(carFenceGroup.getGroupType()); + + }); + carInformationList.forEach(carInformation -> { + carFenceGroupsResq.setCarInformationLicensePlate(carInformation.getCarInformationLicensePlate()); + }); + fenceGroupList.add(carFenceGroupsResq); + }); + }); + return fenceGroupList; + } } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java index 8b04398..976532c 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java @@ -1,11 +1,18 @@ package com.muyu.server.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.CarMiddle; +import com.muyu.domain.*; +import com.muyu.domain.req.CarFenceGroupReq; +import com.muyu.domain.resq.CarFenceGroupsResq; import com.muyu.server.mapper.CarMiddleMapper; -import com.muyu.server.service.CarMiddleSerivce; +import com.muyu.server.service.*; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * @Author：yang * @Package：com.muyu.server.service.impl @@ -14,6 +21,7 @@ import org.springframework.stereotype.Service; * @Date：2024/9/20 16:34 */ @Service +@AllArgsConstructor public class CarMiddleSerivceImpl extends ServiceImpl implements CarMiddleSerivce { diff --git a/pom.xml b/pom.xml index 4aab805..7594852 100644 --- a/pom.xml +++ b/pom.xml @@ -283,6 +283,7 @@ cloud-modules cloud-common cloud-modules/cloud-electronic + cloud-modules/cloud-Vehicle-Simulation pom