修改bug

business-service/src/main/java/com/ozs/service/BaseVehicleService.java

@@ -43,4 +43,6 @@ public interface BaseVehicleService extends IService<BaseVehicle> {
      * /列表，不分页
      */
     List<BaseVehicleTerminalDto> vehicleList();
+
+    AjaxResult vehicleTerminalUnmount(BaseTerminal baseTerminal);
 }

business-service/src/main/java/com/ozs/service/impl/BaseCameraManagementServiceImpl.java

@@ -90,7 +90,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     accountManagement.setCreateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
                     log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
-                    if (!ObjectUtils.isEmpty(deptId)) {
+//                    if (!ObjectUtils.isEmpty(deptId)) {
                         accountManagement.setDeptId(deptId);
                         LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
                         if (!ObjectUtils.isEmpty(accountManagement.getRailwayName())) {
@@ -126,37 +126,36 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                             failureMsg.append(msg);
                             log.error(msg);
                         }
-                    } else {
-                        failureNum++;
-                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
-                        failureMsg.append(msg);
-                        log.error(msg);
-                    }
+//                    } else {
+//                        failureNum++;
+//                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+//                        failureMsg.append(msg);
+//                        log.error(msg);
+//                    }
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
                     log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
-                    if (!ObjectUtils.isEmpty(deptId)) {
-                        accountManagement.setDeptId(deptId);
-                        baseCameraManagementMapper.update(accountManagement, lw);
-                        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-                        if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
-                            wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
-                        }
-                        BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
-                        baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                        baseDeviceDynamicManagement.setUpdateBy(userId);
-                        baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
-                        successNum++;
-                        successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
-                    } else {
-                        failureNum++;
-                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
-                        failureMsg.append(msg);
-                        log.error(msg);
+//                    if (!ObjectUtils.isEmpty(deptId)) {
+                    accountManagement.setDeptId(deptId);
+                    baseCameraManagementMapper.update(accountManagement, lw);
+                    LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+                    if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
+                        wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
                     }
-
+                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
+                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                    baseDeviceDynamicManagement.setUpdateBy(userId);
+                    baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
+                    successNum++;
+                    successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
+//                    } else {
+//                        failureNum++;
+//                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+//                        failureMsg.append(msg);
+//                        log.error(msg);
+//                    }
                 } else {
                     failureNum++;
                     failureMsg.append(failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 已存在");

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -334,4 +334,14 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         }
         return dtoList;
     }
+
+    @Override
+    public AjaxResult vehicleTerminalUnmount(BaseTerminal baseTerminal) {
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+            wrapper.eq(BaseTerminal::getVehicleCode, baseTerminal.getVehicleCode());
+        }
+        baseTerminalMapper.delete(wrapper);
+        return AjaxResult.success();
+    }
 }

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -23,7 +23,6 @@ import com.ozs.entity.vo.VehicleTreeVo;
 import com.ozs.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.BaseRailwayManagementService;
 import com.ozs.service.BaseVehicleService;
-import com.ozs.service.VehiclePositionService;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.web.common.Constant;
@@ -38,12 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -105,6 +99,22 @@ public class BaseVehicleController extends BaseController {
         return AjaxResult.success(isMount);
     }
 
+    /**
+     * 车载终端挂载 取消挂载
+     *
+     * @param baseTerminal
+     * @return
+     */
+    @ApiOperation(value = "车载终端挂载 取消挂载")
+    @PostMapping("/vehicleTerminalUnmount")
+    @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
+    public AjaxResult vehicleTerminalUnmount(@RequestBody BaseTerminal baseTerminal) {
+        if (StringUtils.isEmptySunhh(baseTerminal) || StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+            return AjaxResult.error("机车编码、终端编码不能为空！");
+        }
+        return baseVehicleService.vehicleTerminalUnmount(baseTerminal);
+    }
+
     /**
      * 车载终端挂载 保存
      *