diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleTypeCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleTypeCacheService.java index 8bdaeb4..e85e6ab 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleTypeCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleTypeCacheService.java @@ -4,7 +4,7 @@ import com.muyu.common.cache.CacheAbsBacis; import com.muyu.domain.VehicleType; /** - * 故障缓存服务 + * 车辆类型 */ public class VehicleTypeCacheService extends CacheAbsBacis { @Override diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1121aa6..faeca69 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -4,3 +4,4 @@ com.muyu.enterprise.cache.FenceCahceService com.muyu.enterprise.cache.WarnRuleCacheService com.muyu.enterprise.cache.WarnStrategyCacheService com.muyu.enterprise.cache.MessageTemplateCacheService +com.muyu.enterprise.cache.VehicleTypeCacheService diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/BoundFenceGroupReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/BoundFenceGroupReq.java new file mode 100644 index 0000000..72bed5e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/BoundFenceGroupReq.java @@ -0,0 +1,30 @@ +package com.muyu.domain.req; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 绑定围栏组请求参数 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Tag(name = "绑定围栏组参数") +public class BoundFenceGroupReq { + + /** + * 车辆Id + */ + private Long vehicleId; + + /** + * 围栏组Ids + */ + private List fenceGroupIds; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java index d872f71..70e093f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java @@ -155,5 +155,4 @@ public class ElectController extends BaseController { return Result.success(fences); } - } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java index c38fc4f..7639027 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java @@ -2,6 +2,7 @@ package com.muyu.enterprise.controller; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.enterprise.cache.VehicleCacheService; import com.muyu.enterprise.service.VehicleService; import com.muyu.common.core.domain.Result; @@ -144,9 +145,10 @@ public class VehicleController extends BaseController { */ @GetMapping("/addBoundFenceGroup") @Operation(description = "车辆绑定围栏组") - public Result boundFenceGroup( - @Validated @RequestBody BoundMiddle boundMiddle){ - return null; + public Result boundFenceGroup( + @Validated @RequestBody BoundFenceGroupReq boundFenceGroupReq){ + vehicleService.boundFenceGroup(boundFenceGroupReq); + return Result.success("绑定成功"); } /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/ElectMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/ElectMapper.java index 518253d..3c8ecf2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/ElectMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/ElectMapper.java @@ -30,11 +30,6 @@ public interface ElectMapper extends MPJBaseMapper { @Select("select * from fence where fence_id=#{fenceId}") List mapShow(@Param("fenceId") Long fenceId); -// /** -// * 根据id查询车辆 -// */ -// Fence boundFence(@Param("fenceId") Long fenceId); - /** * 查询电子围栏(终版) */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FencegroupMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FencegroupMapper.java index a074b79..5810355 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FencegroupMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FencegroupMapper.java @@ -28,7 +28,16 @@ public interface FencegroupMapper extends MPJBaseMapper { @Select("SELECT g.fence_group_id,g.group_type,g.priority,g.`status`,f.fence_id, group_CONCAT( f.fence_name ) AS fence_name FROM fence_group g LEFT JOIN middle m ON m.fence_group_id = g.fence_group_id LEFT JOIN fence f ON m.fence_id = f.fence_id GROUP BY g.fence_group_id") List showGroupList(FenceGroupReq req); - @Insert("INSERT INTO `vehicle-basic`.`middle` (`fence_id`, `fence_group_id`) VALUES (#{id},#{fenceGroupId}) ") +// @Insert("INSERT INTO `vehicle-basic`.`middle` (`fence_id`, `fence_group_id`) VALUES (#{id},#{fenceGroupId}) ") +// @Insert({ "" }) + @Insert({ + "" + }) void addMiddle(@Param("fenceIds") Integer[] fenceIds,@Param("fenceGroupId") Long fenceGroupId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/VehicleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/VehicleMapper.java index 8884b33..9b0765e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/VehicleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/VehicleMapper.java @@ -2,8 +2,10 @@ package com.muyu.enterprise.mapper; import com.github.yulichang.base.MPJBaseMapper; import com.muyu.domain.Vehicle; +import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.domain.req.VehicleManageReq; import com.muyu.domain.resp.VehicleManageResp; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -28,11 +30,6 @@ public interface VehicleMapper extends MPJBaseMapper { */ List findAll(VehicleManageReq vehicleManageReq); - /** - * 车辆绑定围栏组 - */ - void bindFenceGroup(@Param("fenceGroupIds") Integer[] fenceGroupIds, @Param("vehicleId") Long vehicleId); - /** * 根据车辆vin查询模版id * @param vehicleVin @@ -41,4 +38,19 @@ public interface VehicleMapper extends MPJBaseMapper { @Select("SELECT t.message_template_id FROM vehicle v LEFT JOIN vehicle_type t ON v.vehicle_type_id = t.vehicle_type_id WHERE v.vehicle_vin = #{vehicleVin}") Long findByVehicleVin(String vehicleVin); + /** + * 车辆绑定围栏组 + * @param boundFenceGroupReq + */ +// @Insert("INSERT INTO `vehicle-basic`.`bound_middle` (`fence_group_id`,`vehicle_id`) VALUES (#{id},#{vehicleId}) ") + @Insert({ + "" + }) + void boundFenceGroup(BoundFenceGroupReq boundFenceGroupReq); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/VehicleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/VehicleService.java index d07fae9..07c4f05 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/VehicleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/VehicleService.java @@ -2,6 +2,7 @@ package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.Vehicle; +import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.domain.req.VehicleManageReq; import com.muyu.domain.resp.VehicleManageResp; import org.apache.ibatis.annotations.Param; @@ -36,6 +37,5 @@ public interface VehicleService extends IService { /** * 绑定围栏组 */ - void bindFenceGroup(@Param("fenceGroupIds") Integer[] fenceGroupIds, @Param("vehicleId") Long vehicleId); - + void boundFenceGroup(BoundFenceGroupReq boundFenceGroupReq); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/ElectServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/ElectServiceImpl.java index 1902ec0..139fd39 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/ElectServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/ElectServiceImpl.java @@ -48,7 +48,7 @@ public class ElectServiceImpl String decode = fenceCahceService.decode(String.valueOf(list)); //将获取到的数据存到Redis - fenceCahceService.put(String.valueOf(decode),d); +// fenceCahceService.put(String.valueOf(decode),d); return list; } // diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java index ad25c1b..37bd6f2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java @@ -5,6 +5,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.Vehicle; import com.muyu.domain.VehicleType; +import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.domain.req.VehicleManageReq; import com.muyu.domain.resp.VehicleManageResp; import com.muyu.enterprise.mapper.VehicleMapper; @@ -70,8 +71,10 @@ public class VehicleServiceImpl } @Override - public void bindFenceGroup(Integer[] fenceGroupIds, Long vehicleId) { - vehicleMapper.bindFenceGroup(fenceGroupIds, vehicleId); + public void boundFenceGroup(BoundFenceGroupReq boundFenceGroupReq) { + + vehicleMapper.boundFenceGroup(boundFenceGroupReq); } + }