diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceGroupReq.java b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceGroupReq.java new file mode 100644 index 0000000..a6dc5f8 --- /dev/null +++ b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceGroupReq.java @@ -0,0 +1,28 @@ +package com.muyu.domain.req; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author:yang + * @Package:com.muyu.domain.req + * @Project:cloud-server-8 + * @name:CarFenceGroupReq + * @Date:2024/9/24 14:36 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "车辆电子围栏组响应参数") +public class CarFenceGroupReq { + /** + * 车辆ID + */ + private Integer carId; + /** + * 围栏组ID + */ + private Integer id; +} diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceReq.java b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceReq.java index d871b51..41e5aac 100644 --- a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceReq.java +++ b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceReq.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@Tag(name = "车辆电子围栏响应参数") +@Tag(name = "电子围栏响应参数") public class CarFenceReq { /** diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarGroupIdReq.java b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarGroupIdReq.java new file mode 100644 index 0000000..1af3913 --- /dev/null +++ b/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarGroupIdReq.java @@ -0,0 +1,28 @@ +package com.muyu.domain.req; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author:yang + * @Package:com.muyu.domain.req + * @Project:cloud-server-8 + * @name:CarFenceGroupDel + * @Date:2024/9/24 11:49 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "围栏组电子围栏响应参数") +public class CarGroupIdReq { + /** + * 围栏组Id + */ + private Integer ids; + /** + * 围栏ID + */ + private Integer id; +} 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 74a9c42..3718837 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 @@ -7,6 +7,7 @@ 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; @@ -17,10 +18,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -117,5 +115,20 @@ public class CarFenceController { null, "未绑定围栏" ); } + /** + * 查询中间围栏 + */ + @DeleteMapping("/carFenceGroupDel") + @Operation(summary = "解除绑定围栏",description = "查询围栏数据") + public Result carFenceGroupDel( + @Validated @RequestBody CarGroupIdReq carGroupIdReq + ){ + Boolean list = carFenceService.carFenceGroupDel(carGroupIdReq); + return list?Result.success( + null, "操作成功" + ):Result.success( + null, "未绑定围栏" + ); + } } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceGroupController.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceGroupController.java index ce119fc..faed306 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceGroupController.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceGroupController.java @@ -3,6 +3,7 @@ package com.muyu.server.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFenceGroup; +import com.muyu.domain.req.CarFenceGroupReq; import com.muyu.domain.req.CarFenceReq; import com.muyu.domain.resq.CarFenceResq; import com.muyu.server.service.CarFenceGroupService; @@ -43,4 +44,5 @@ public class CarFenceGroupController { 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 f8dec20..de9d3ca 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 @@ -1,7 +1,9 @@ package com.muyu.server.controller; 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.server.service.CarMiddleSerivce; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -13,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @Author:yang * @Package:com.muyu.server.controller @@ -44,4 +48,16 @@ public class CarMiddleController { null, "操作失败" ); } + + /** + * 查询车辆围栏组信息 + */ + @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 29981b2..edd2ffc 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 @@ -6,6 +6,7 @@ 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; @@ -33,4 +34,6 @@ public interface CarFenceService extends IService { Boolean addFenceGroup(FenceGroupReq req); List selectCarFenceGroupList(Integer id); + + Boolean carFenceGroupDel(CarGroupIdReq carGroupIdReq); } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleGroupService.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleGroupService.java index cb2dbca..9810217 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleGroupService.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleGroupService.java @@ -3,6 +3,7 @@ package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.CarFenceGroup; import com.muyu.domain.CarMiddleGroup; +import com.muyu.domain.req.CarFenceGroupReq; import java.util.List; @@ -18,4 +19,5 @@ public interface CarMiddleGroupService extends IService { 查询中间 */ List selectCarFence(); + } 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 abb2db3..b64b91d 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 @@ -1,7 +1,11 @@ package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.CarFenceGroup; import com.muyu.domain.CarMiddle; +import com.muyu.domain.req.CarFenceGroupReq; + +import java.util.List; /** * @Author:yang @@ -11,4 +15,5 @@ import com.muyu.domain.CarMiddle; * @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 98d47db..25a51d8 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 @@ -6,6 +6,7 @@ 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; @@ -163,6 +164,19 @@ public class CarFenceServiceImpl return carFenceGroupReqs; } + @Override + public Boolean carFenceGroupDel(CarGroupIdReq carGroupIdReq) { + + List list = carMiddleGroupService.list( + new LambdaQueryWrapper() + .eq(CarMiddleGroup::getCarFenceId, carGroupIdReq.getId()) + .eq(CarMiddleGroup::getFenceGroupId, carGroupIdReq.getIds())) + .stream() + .map(CarMiddleGroup::carMiddleGroupBuilder) + .toList(); + return carMiddleGroupService.removeBatchByIds(list); + } + private void carMiddleList(CarMiddleGroup carMiddleGroup, List carFenceGroupReqs) { Integer carFenceId = carMiddleGroup.getCarFenceId(); Integer fenceGroupId = carMiddleGroup.getFenceGroupId(); diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java index 32d4eb5..ceaa905 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java +++ b/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.CarFenceGroup; import com.muyu.domain.CarFenceType; import com.muyu.domain.CarMiddleGroup; +import com.muyu.domain.req.CarFenceGroupReq; import com.muyu.server.mapper.CarFenceTypeMapper; import com.muyu.server.mapper.CarMiddleGroupMapper; import com.muyu.server.service.CarFenceGroupService;