Merge remote-tracking branch 'origin/master'

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

@@ -25,4 +25,6 @@ public class BreakLog {
     private String breakDate;
     /** 是否报警 */
     private String breakState;
+    /** 逻辑删除 */
+    private Integer breakDel;
 }

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

@@ -3,7 +3,9 @@ package com.zhilian.business.controller;
 import com.zhilian.business.domain.BreakLog;
 import com.zhilian.business.service.BreakLogService;
 import com.zhilian.common.core.domain.Result;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -60,4 +62,13 @@ public class BreakLogController {
         return success;
     }
 
+    @PostMapping("logDel/{breakLogId}")
+    public Result logDel(@PathVariable Integer breakLogId){
+        int del = breakLogService.logDel(breakLogId);
+        Result<Integer> success = Result.success(del);
+        return success;
+    }
+
+
+
 }

zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java

@@ -25,6 +25,8 @@ public class BreakLog {
     private String breakTime;
     /** 开始报警时间 */
     private String breakDate;
-    /** 是否报警 */
+    /** 故障状态 */
     private String breakState;
+    /** 逻辑删除 */
+    private Integer breakDel;
 }

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

@@ -18,4 +18,6 @@ public interface BreakLogMapper {
     int logAdd(BreakLog breakLog);
 
     int updLog(BreakLog breakLog);
+
+    int logDel(Integer breakLogId);
 }

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

@@ -16,4 +16,6 @@ public interface BreakLogService {
     int logAdd(BreakLog breakLog);
 
     int updLog(BreakLog breakLog);
+
+    int logDel(Integer breakLogId);
 }

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

@@ -74,4 +74,9 @@ public class BreakLogServiceImpl implements BreakLogService {
     public int updLog(BreakLog breakLog) {
         return breakLogMapper.updLog(breakLog);
     }
+
+    @Override
+    public int logDel(Integer breakLogId) {
+        return breakLogMapper.logDel(breakLogId);
+    }
 }

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/BreakLogMapper.xml

@@ -6,18 +6,23 @@
     <insert id="logAdd">
 
         INSERT INTO `zhilian-business`.`business_break_log`
-        ( `break_code`, `break_vin`, `break_time`, `break_type`, `break_date`, `break_state`)
+        ( `break_code`, `break_vin`, `break_time`, `break_type`, `break_date`, `break_state`,`break_del`)
         VALUES
-            (#{breakCode}, #{breakVin}, NOW(), #{breakType}, NOW(), #{breakState});
+            (#{breakCode}, #{breakVin},#{breakTime}, #{breakType},DATE_ADD(NOW(),INTERVAL 8 HOUR), #{breakState},0);
     </insert>
     <update id="updLog">
         UPDATE `zhilian-business`.`business_break_log`
-        SET `break_code` = #{breakCode}, `break_vin` = #{breakVin}, `break_time` = NOW(), `break_type` = #{breakType}, `break_date` = NOW(), `break_state` = #{breakState}
+        SET `break_code` = #{breakCode}, `break_vin` = #{breakVin}, `break_time` = NOW(), `break_type` = #{breakType}, `break_date` = NOW(), `break_state` = #{breakState}, `break_del` = #{breakDel}
         WHERE `break_log_id` = #{breakLogId};
 
     </update>
+    <update id="logDel">
+        UPDATE `zhilian-business`.`business_break_log`
+        SET break_del = 1
+        WHERE break_log_id = #{breakLogId}
+    </update>
 
     <select id="breakLog" resultType="com.zhilian.business.domain.BreakLog">
-        select * from business_break_log
+        select * from business_break_log where break_del = 0
     </select>
 </mapper>

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>