Merge remote-tracking branch 'origin/master'

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

@@ -8,6 +8,7 @@ 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
@@ -18,20 +19,19 @@ public class MarkersFenceServiceImpl extends ServiceImpl<MarkersFenceMapper, Mar
 
     @Override
     public boolean insert(Markers markers) {
+        ArrayList<MarkersFence> markersFences = new ArrayList<>();
         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/VehicleMarkersServiceImpl.java

@@ -8,6 +8,7 @@ import com.zhilian.business.service.VehicleMarkersService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -16,20 +17,19 @@ public class VehicleMarkersServiceImpl extends ServiceImpl<VehicleMarkersMapper,
     @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;
+        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/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>