修改BUG

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Fence.java

@@ -1,64 +0,0 @@
-package com.zhilian.common.business.domain;
-
-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.zhilian.common.core.annotation.Excel;
-import com.zhilian.common.core.web.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-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
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@TableName("business_fence")
-public class Fence extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-    /**
-     * 电子围栏编号
-     */
-    @Excel(name = "参数主键", cellType = Excel.ColumnType.NUMERIC)
-    @TableId(value = "fence_id", type = IdType.AUTO)
-    private Long fenceId;
-    /**
-     * 电子围栏名称
-     */
-    @Excel(name = "电子围栏名称")
-    @TableField("fence_name")
-    private String fenceName;
-    /**
-     * 电子围栏类型编号
-     */
-    @Excel(name = "电子围栏类型编号")
-    @TableField("fence_type_id")
-    private Long fenceTypeId;
-    /**
-     * 电子围栏状态
-     */
-    @Excel(name = "电子围栏状态")
-    @TableField("fence_state")
-    private Long fenceState;
-    /**
-     * 电子围栏经纬度信息
-     */
-    @Excel(name = "电子围栏经纬度信息")
-    @TableField("fence_message")
-    private String fenceMessage;
-    @TableField(exist = false)
-    List<Markers> markersList;
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Markers.java

@@ -1,44 +0,0 @@
-package com.zhilian.common.business.domain;
-
-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.zhilian.common.core.annotation.Excel;
-import com.zhilian.common.core.web.domain.BaseEntity;
-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
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@TableName("business_markers")
-public class Markers extends BaseEntity {
-
-    /**
-     * 车辆标识编号
-     */
-    @TableId(value = "markers_id", type = IdType.AUTO)
-    private Long markersId;
-
-    /**
-     * 车辆标识名称
-     */
-    @TableField("markers_name")
-    private String markersName;
-
-
-    @TableField(exist = false)
-    List<Long> fenceIds;
-
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/Vehicle.java

@@ -1,74 +0,0 @@
-package com.zhilian.common.business.domain;
-
-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.zhilian.common.core.annotation.Excel;
-import com.zhilian.common.core.web.domain.BaseEntity;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
-import java.util.List;
-
-/**
-  * @ClassName Vehicle
-  * @Description 车辆信息实体类
-  * @Author ZeJinG.Su
-  * @Date  15:27 2024/4/8
- */
-@Data
-@ToString
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@TableName("business_vehicle")
-public class Vehicle extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 车辆ID
-     */
-    @Excel(name = "车辆ID",cellType = Excel.ColumnType.NUMERIC)
-    @TableId(value = "vehicle_id",type = IdType.AUTO)
-    private Long vehicleId;
-    /**
-     * 车辆VIN
-      */
-    @TableField("vehicle_vin")
-    private String vehicleVIN;
-    /**
-     * 车辆类型编号
-     */
-    private Long vehicleTypeId;
-
-
-    @TableField(exist = false)
-    private Long vehicleTypeName;
-
-    /**
-     * 电机厂商
-     */
-    private String vehicleMotor;
-    /**
-     * 电池厂商
-     */
-    private String vehicleBattery;
-    /**
-     * 电机ID
-     */
-    private String motorId;
-    /**
-     * 电池ID
-     */
-    private String batteryId;
-
-    /**
-     * 车辆状态
-     */
-    private Long vehicleState;
-
-    @TableField(exist = false)
-    private List<Long> markersIds;
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/VehicleType.java

@@ -1,34 +0,0 @@
-package com.zhilian.common.business.domain;
-
-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.zhilian.common.core.annotation.Excel;
-import lombok.AllArgsConstructor;
-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
-@AllArgsConstructor
-@ToString
-@TableName(value = "business_vehicle_type")
-public class VehicleType {
-
-    @TableId(value = "vehicle_type_id", type = IdType.AUTO)
-    @Excel(name = "车型ID")
-    private Long vehicleTypeId;
-
-    @Excel(name = "车型名称")
-    @TableField(value = "vehicle_type_name")
-    private String vehicleTypeName;
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/MarkersFence.java

@@ -1,42 +0,0 @@
-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")
-public class MarkersFence {
-    /**
-     * 车辆标识编号
-     */
-    @TableId(value = "markers_id",type = IdType.INPUT)
-    private Long markerId;
-    /**
-     * 电子围栏编号
-     */
-    @TableField(value = "fence_id",insertStrategy = FieldStrategy.IGNORED)
-    private Long fenceId;
-
-    public Long getMarkerId() {
-        return markerId;
-    }
-
-    public void setMarkerId(Long markerId) {
-        this.markerId = markerId;
-    }
-
-    public Long getFenceId() {
-        return fenceId;
-    }
-
-    public void setFenceId(Long fenceId) {
-        this.fenceId = fenceId;
-    }
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/middle/VehicleMarkers.java

@@ -1,43 +0,0 @@
-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")
-public class VehicleMarkers {
-    /**
-     * 车辆编号
-     */
-    @TableId(value = "vehicle_id",type = IdType.INPUT)
-    private Long vehicleId;
-    /**
-     * 车辆标识编号
-     */
-    @TableField(value = "markers_id",insertStrategy = FieldStrategy.IGNORED)
-    private Long markersId;
-
-    public Long getVehicleId() {
-        return vehicleId;
-    }
-
-    public void setVehicleId(Long vehicleId) {
-        this.vehicleId = vehicleId;
-    }
-
-    public Long getMarkersId() {
-        return markersId;
-    }
-
-    public void setMarkersId(Long markersId) {
-        this.markersId = markersId;
-    }
-
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/FenceVo.java

@@ -1,37 +0,0 @@
-
-package com.zhilian.common.business.domain.vo;
-
-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
-@ToString
-public class FenceVo {
-
-
-    /**
-     * 围栏名称
-     */
-    private String fenceName;
-
-    /**
-     * 围栏类型
-     */
-    private Long fenceTypeId;
-
-    /**
-     * 围栏状态
-     */
-    private Long fenceState;
-
-
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/domain/vo/VehicleVo.java

@@ -1,40 +0,0 @@
-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 {
-    /**
-     * 车辆VIN
-     */
-    private String vehicleVIN;
-    /**
-     * 车辆类型编号
-     */
-    private Long vehicleTypeId;
-    /**
-     * 电子围栏编号
-     */
-    private Long fenceId;
-    /**
-     * 电机厂商
-     */
-    private String motorBusiness;
-    /**
-     * 电池厂商
-     */
-    private String batteryBusiness;
-    /**
-     * 电机ID
-     */
-    private String motorID;
-    /**
-     * 电池ID
-     */
-    private String batteryID;
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/RemoteVehicleService.java

@@ -1,32 +0,0 @@
-package com.zhilian.common.business.remote;
-
-import com.zhilian.common.business.domain.Vehicle;
-import com.zhilian.common.business.remote.factory.RemoteVehicleFallbackFactory;
-import com.zhilian.common.core.constant.ServiceNameConstants;
-import com.zhilian.common.core.domain.Result;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@FeignClient(contextId = "remoteVehicleService", value = ServiceNameConstants.VIEHICLE_SERVICE, fallbackFactory = RemoteVehicleFallbackFactory.class)
-public interface RemoteVehicleService {
-//    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-//    public Result<SysFile> upload (@RequestPart(value = "file") MultipartFile file);
-
-    /**
-     * 根据VIN获取车辆信息
-     * @param vehicleVIN
-     * @return
-     */
-    @PostMapping("/vehicle/getMarkersByVIN/{vehicleVIN}")
-    public Result<Vehicle> getVehicleByVIN(@PathVariable("vehicleVIN") String vehicleVIN);
-
-    /**
-     * 更新车辆状态
-     * @param vehicle
-     * @return
-     */
-    @PostMapping("/vehicle/updateState")
-    public Result updateState(@RequestBody Vehicle vehicle);
-}

zhilian-common/zhilian-common-business/src/main/java/com/zhilian/common/business/remote/factory/RemoteVehicleFallbackFactory.java

@@ -1,31 +0,0 @@
-package com.zhilian.common.business.remote.factory;
-
-
-import com.zhilian.common.business.domain.Vehicle;
-import com.zhilian.common.business.remote.RemoteVehicleService;
-import com.zhilian.common.core.domain.Result;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RemoteVehicleFallbackFactory implements FallbackFactory<RemoteVehicleService> {
-
-    private static final Logger log = LoggerFactory.getLogger(RemoteVehicleFallbackFactory.class);
-    @Override
-    public RemoteVehicleService create(Throwable throwable) {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteVehicleService() {
-            @Override
-            public Result<Vehicle> getVehicleByVIN(String vehicleVIN) {
-                return Result.error("获取车辆信息失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public Result updateState(Vehicle vehicle) {
-                return Result.error("更新车辆状态失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/ZhiLianBusinessApplication.java

@@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * @BelongsProject: smart-cloud-server
- * @BelongsPackage: com.zhilian.business
+ * @BelongsPackage: com.zhiLian.business
  * @Description 启动类
  * @Author: LiYuan
  * @CreateTime: 2024-03-31  10:13
@@ -19,8 +19,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableCustomSwagger2
 @EnableMyFeignClients
 @SpringBootApplication
-public class ZhilianBusinessApplication {
+public class ZhiLianBusinessApplication {
     public static void main(String[] args) {
-        SpringApplication.run(ZhilianBusinessApplication.class);
+        SpringApplication.run(ZhiLianBusinessApplication.class);
     }
 }

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BusinessBreakController.java

@@ -32,8 +32,7 @@ import com.zhilian.common.core.web.page.*;
  */
 @RestController
 @RequestMapping("/break")
-public class BusinessBreakController extends BaseController
+public class BusinessBreakController extends BaseController{
-{
     @Autowired
     private IBusinessBreakService businessBreakService;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java

@@ -1,8 +1,8 @@
 package com.zhilian.business.controller;
 
+import com.zhilian.business.domain.Fence;
 import com.zhilian.common.core.domain.Result;
 import com.zhilian.common.core.web.controller.BaseController;
-import com.zhilian.common.business.domain.Fence;
 import com.zhilian.business.service.FenceService;
 import com.zhilian.common.core.web.page.TableDataInfo;
 import com.zhilian.common.security.utils.SecurityUtils;

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersController.java

@@ -1,8 +1,8 @@
 package com.zhilian.business.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhilian.common.business.domain.Markers;
+import com.zhilian.business.domain.Markers;
-import com.zhilian.common.business.domain.middle.MarkersFence;
+import com.zhilian.business.domain.middle.MarkersFence;
 import com.zhilian.business.service.MarkersFenceService;
 import com.zhilian.business.service.MarkersService;
 import com.zhilian.common.core.domain.Result;

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/MarkersFenceController.java

@@ -1,6 +1,6 @@
 package com.zhilian.business.controller;
 
-import com.zhilian.common.business.domain.middle.MarkersFence;
+import com.zhilian.business.domain.middle.MarkersFence;
 import com.zhilian.business.service.MarkersFenceService;
 import com.zhilian.common.core.domain.Result;
 import com.zhilian.common.core.web.controller.BaseController;

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleController.java

@@ -1,8 +1,8 @@
 package com.zhilian.business.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhilian.common.business.domain.Vehicle;
+import com.zhilian.business.domain.Vehicle;
-import com.zhilian.common.business.domain.middle.VehicleMarkers;
+import com.zhilian.business.domain.middle.VehicleMarkers;
 import com.zhilian.business.service.MarkersService;
 import com.zhilian.business.service.VehicleMarkersService;
 import com.zhilian.business.service.VehicleService;
@@ -76,6 +76,9 @@ public class VehicleController extends BaseController {
 
         //重新添加中间表数据
         vehicleMarkersService.insert(vehicle);
+
+        //判断添加完成后的标识与围栏是否绑定事件 如果没有绑定全部删除围栏事件 然后进行给予绑定
+        vehicleService.selectRedisData(vehicle);
         return toAjax(update);
     }
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleMarkersController.java

@@ -1,6 +1,5 @@
 package com.zhilian.business.controller;
 
-import com.zhilian.common.business.domain.middle.VehicleMarkers;
 import com.zhilian.business.service.VehicleMarkersService;
 import com.zhilian.common.core.domain.Result;
 import com.zhilian.common.core.web.controller.BaseController;

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/VehicleTypeController.java

@@ -1,6 +1,5 @@
 package com.zhilian.business.controller;
 
-import com.zhilian.common.business.domain.VehicleType;
 import com.zhilian.business.service.VehicleTypeService;
 import com.zhilian.common.core.domain.Result;
 import com.zhilian.common.core.web.controller.BaseController;

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhilian.common.business.domain.Fence;
+import com.zhilian.business.domain.Fence;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersFenceMapper.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhilian.common.business.domain.middle.MarkersFence;
+import com.zhilian.business.domain.middle.MarkersFence;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/MarkersMapper.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhilian.common.business.domain.Markers;
+import com.zhilian.business.domain.Markers;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMapper.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhilian.common.business.domain.Vehicle;
+import com.zhilian.business.domain.Vehicle;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleMarkersMapper.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhilian.common.business.domain.middle.VehicleMarkers;
+import com.zhilian.business.domain.middle.VehicleMarkers;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/VehicleTypeMapper.java

@@ -1,7 +1,8 @@
 package com.zhilian.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhilian.common.business.domain.VehicleType;
+
+import com.zhilian.business.domain.VehicleType;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhilian.common.business.domain.Fence;
+import com.zhilian.business.domain.Fence;
 
 import java.util.List;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersFenceService.java

@@ -1,8 +1,8 @@
 package com.zhilian.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhilian.common.business.domain.Markers;
+import com.zhilian.business.domain.Markers;
-import com.zhilian.common.business.domain.middle.MarkersFence;
+import com.zhilian.business.domain.middle.MarkersFence;
 
 public interface MarkersFenceService extends IService<MarkersFence> {
     boolean insert(Markers markers);

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/MarkersService.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhilian.common.business.domain.Markers;
+import com.zhilian.business.domain.Markers;
 
 import java.util.List;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleMarkersService.java

@@ -1,8 +1,9 @@
 package com.zhilian.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhilian.common.business.domain.Vehicle;
+
-import com.zhilian.common.business.domain.middle.VehicleMarkers;
+import com.zhilian.business.domain.Vehicle;
+import com.zhilian.business.domain.middle.VehicleMarkers;
 import org.springframework.stereotype.Service;
 
 @Service

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleService.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhilian.common.business.domain.Vehicle;
+import com.zhilian.business.domain.Vehicle;
 
 import java.util.List;
 
@@ -12,4 +12,6 @@ public interface VehicleService extends IService<Vehicle> {
     Vehicle getVehicleByVIN(String vehicleVIN);
 
     boolean updateState(Vehicle vehicle);
+
+    void selectRedisData(Vehicle vehicle);
 }

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/VehicleTypeService.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhilian.common.business.domain.VehicleType;
+import com.zhilian.business.domain.VehicleType;
 
 import java.util.List;
 

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhilian.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhilian.common.business.domain.Fence;
+import com.zhilian.business.domain.Fence;
 import com.zhilian.business.mapper.FenceMapper;
 import com.zhilian.business.service.FenceService;
 import com.zhilian.common.core.utils.StringUtils;

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java

@@ -2,37 +2,34 @@ package com.zhilian.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhilian.common.business.domain.Markers;
+import com.zhilian.business.domain.Markers;
-import com.zhilian.common.business.domain.middle.MarkersFence;
+import com.zhilian.business.domain.middle.MarkersFence;
+import com.zhilian.business.service.FenceService;
 import com.zhilian.business.mapper.MarkersFenceMapper;
 import com.zhilian.business.service.MarkersFenceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class MarkersFenceServiceImpl extends ServiceImpl<MarkersFenceMapper, MarkersFence> implements MarkersFenceService  {
-    @Autowired
-    private MarkersFenceMapper markersFenceMapper;
 
-
+    @Override    public boolean insert(Markers markers) {
-    @Override
+        ArrayList<MarkersFence> markersFences = new ArrayList<>();
-    public boolean insert(Markers markers) {
         markers.getFenceIds().forEach(fenceId -> {
             MarkersFence markersFence = new MarkersFence();
             markersFence.setMarkerId(markers.getMarkersId());
             markersFence.setFenceId(fenceId);
-            markersFenceMapper.insert(markersFence);
+            markersFences.add(markersFence);
         });
-        return true;
+        return this.saveBatch(markersFences);
     }
 
     @Override
     public void removeAllFence(Markers markers) {
         List<MarkersFence> list = this.list(new LambdaQueryWrapper<MarkersFence>().eq(MarkersFence::getMarkerId, markers.getMarkersId()));
-        list.forEach(item -> {
+        this.removeBatchByIds(list);
-            this.removeById(item.getMarkerId());
-        });
     }
 }

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhilian.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhilian.common.business.domain.Markers;
+import com.zhilian.business.domain.Markers;
 import com.zhilian.business.mapper.MarkersMapper;
 import com.zhilian.business.service.MarkersService;
 import com.zhilian.common.core.utils.StringUtils;

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java

@@ -2,35 +2,80 @@ package com.zhilian.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhilian.common.business.domain.Vehicle;
+import com.zhilian.business.domain.Vehicle;
-import com.zhilian.common.business.domain.middle.VehicleMarkers;
+import com.zhilian.business.domain.middle.VehicleMarkers;
-import com.zhilian.business.mapper.VehicleMarkersMapper;
+import com.zhilian.business.mapper.*;
 import com.zhilian.business.service.VehicleMarkersService;
+import com.zhilian.common.redis.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class VehicleMarkersServiceImpl extends ServiceImpl<VehicleMarkersMapper, VehicleMarkers> implements VehicleMarkersService {
+//    @Autowired
+//    private VehicleMapper vehicleMapper;
+//
+//    @Autowired
+//    private VehicleMarkersMapper vehicleMarkersMapper;
+//
+//    @Autowired
+//    private RedisService redisService;
+
+    @Autowired
+    private MarkersMapper markersMapper;
+
+    @Autowired
+    private MarkersFenceMapper markersFenceMapper;
+
+    @Autowired
+    private FenceMapper fenceMapper;
 
     @Transactional(rollbackFor=Exception.class)
     @Override
     public boolean insert(Vehicle vehicle) {
+        ArrayList<VehicleMarkers> list = new ArrayList<>();
         vehicle.getMarkersIds().forEach(markerId -> {
             VehicleMarkers vehicleMarkers = new VehicleMarkers();
             vehicleMarkers.setVehicleId(vehicle.getVehicleId());
             vehicleMarkers.setMarkersId(markerId);
-            this.save(vehicleMarkers);
+            list.add(vehicleMarkers);
         });
-        return true;
+
+//        String vehicleVIN = vehicle.getVehicleVIN();
+//        //标识
+//        List<Markers> markers = markersMapper.selectBatchIds(vehicle.getMarkersIds());
+//        //中间表
+//        List<MarkersFence> markersFences = markersFenceMapper.selectBatchIds(markers);
+//        //围栏
+//        List<Long> fenceIds = markersFences.stream().map(MarkersFence::getFenceId).collect(Collectors.toList());
+//        List<Fence> fences = fenceMapper.selectBatchIds(fenceIds);
+//
+//        System.out.println("**********************"+fences);
+//        List<MarkersFence> markersFences = markersFenceMapper.selectList(new LambdaQueryWrapper<MarkersFence>().in(MarkersFence::getMarkersId, vehicle.getMarkersIds()));
+//        List<Fence> fences = fenceMapper.selectBatchIds(markersFences.stream().map(MarkersFence::getFenceId).distinct().toArray(Long[]::new));
+//        markersFences.forEach(markersFence -> {
+//            markersFence.setFence(fences.stream().filter(fence -> fence.getFenceId().equals(markersFence.getFenceId())).findFirst().get());
+//        });
+//
+//        redisService.set(vehicle.getVehicleId(), markersFences);
+
+
+
+
+
+
+
+        return this.saveBatch(list);
     }
 
     @Override
     public void removeAllVehicle(Vehicle vehicle) {
         List<VehicleMarkers> list = this.list(new LambdaQueryWrapper<VehicleMarkers>().eq(VehicleMarkers::getVehicleId, vehicle.getVehicleId()));
-        list.forEach(item -> {
+        this.removeByIds(list);
-            this.removeById(item.getVehicleId());
-        });
     }
 }

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleServiceImpl.java

@@ -2,13 +2,15 @@ package com.zhilian.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhilian.common.business.domain.Vehicle;
+import com.zhilian.business.domain.Vehicle;
-import com.zhilian.business.mapper.VehicleMapper;
+import com.zhilian.business.mapper.*;
 import com.zhilian.business.service.VehicleService;
 import com.zhilian.common.core.utils.StringUtils;
+import com.zhilian.common.redis.service.RedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -16,6 +18,21 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
     @Autowired
     private VehicleMapper vehicleMapper;
 
+    @Autowired
+    private VehicleMarkersMapper vehicleMarkersMapper;
+
+    @Autowired
+    private RedisService redisService;
+
+    @Autowired
+    private MarkersMapper markersMapper;
+
+    @Autowired
+    private MarkersFenceMapper markersFenceMapper;
+
+    @Autowired
+    private FenceMapper fenceMapper;
+
     @Override
     public List<Vehicle> selectVehicleList(Vehicle vehicle) {
         LambdaQueryWrapper<Vehicle> queryWrapper = new LambdaQueryWrapper<>();
@@ -74,4 +91,11 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
         return true;
     }
 
+    @Override
+    public void selectRedisData(Vehicle vehicle) {
+
+
+
+    }
+
 }

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleTypeServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhilian.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhilian.common.business.domain.VehicleType;
+import com.zhilian.business.domain.VehicleType;
 import com.zhilian.business.mapper.VehicleTypeMapper;
 import com.zhilian.business.service.VehicleTypeService;
 import com.zhilian.common.redis.service.RedisService;

zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhilian.business.mapper.FenceMapper">
-
-</mapper>

zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhilian.business.mapper.VehicleMapper">
-
-</mapper>

zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhilian.business.mapper.VehicleMarkersMapper">
-
-</mapper>