机车信息导入修改

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

@@ -154,7 +154,7 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                     lw.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
                 }
                 BaseVehicle baseVehicle1 = baseVehicleMapper.selectOne(lw);
-                if (StringUtils.isEmptySunhh(baseVehicle1)) {
+                if (ObjectUtils.isEmpty(baseVehicle1)) {
                     BeanValidators.validateWithException(validator, baseVehicle);
                     baseVehicle.setUpdateBy(userId);
                     baseVehicle.setCreateBy(userId);
@@ -164,24 +164,23 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                     int insert = baseVehicleMapper.insert(baseVehicle);
                     successNum++;
                     successMsg.append(successNum + "、机车号 " + baseVehicle.getVehicleCode() + " 导入成功");
-                } else if (updateSupport) {
-                    BeanValidators.validateWithException(validator, baseVehicle);
-                    LambdaQueryWrapper<BaseVehicle> lambdaQueryWrapper = new LambdaQueryWrapper<BaseVehicle>();
-                    if (!StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
-                        lambdaQueryWrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
-                    }
-                    BaseVehicle baseVehicle4 = baseVehicleMapper.selectOne(lambdaQueryWrapper);
-                    if (StringUtils.isEmptySunhh(baseVehicle4)) {
-                        baseVehicle.setUpdateBy(userId);
-                        baseVehicle.setUpdateTime(new Date());
-                        baseVehicle.setId(baseVehicle4.getId());
-                        baseVehicleMapper.updateById(baseVehicle);
-                        successNum++;
-                        successMsg.append(successNum + "、机车号 " + baseVehicle.getVehicleCode() + " 更新成功");
-                    } else {
-                        failureNum++;
-                        failureMsg.append(failureNum + "、机车号 " + baseVehicle.getVehicleCode() + "不存在");
-                    }
+//                } else if (updateSupport) {
+//                    BeanValidators.validateWithException(validator, baseVehicle);
+//                    LambdaQueryWrapper<BaseVehicle> lambdaQueryWrapper = new LambdaQueryWrapper<BaseVehicle>();
+//                    if (!StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
+//                        lambdaQueryWrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
+//                    }
+//                    BaseVehicle baseVehicle4 = baseVehicleMapper.selectOne(lambdaQueryWrapper);
+//                    if (StringUtils.isEmptySunhh(baseVehicle4)) {
+//                        baseVehicle.setUpdateBy(userId);
+//                        baseVehicle.setUpdateTime(new Date());
+//                        baseVehicle.setId(baseVehicle4.getId());
+//                        baseVehicleMapper.updateById(baseVehicle);
+//                        successNum++;
+//                        successMsg.append(successNum + "、机车号 " + baseVehicle.getVehicleCode() + " 更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append(failureNum + "、机车号 " + baseVehicle.getVehicleCode() + "已存在");
                 }
             } catch (Exception e) {
                 String msg = null;
@@ -189,7 +188,7 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                 if (ObjectUtils.isEmpty(baseVehicle2)) {
                     msg = "导入的文档格式不正确";
                 } else {
-                     msg = failureNum + "、机车号 " + baseVehicle2.getVehicleCode() + " 导入失败：";
+                    msg = failureNum + "、机车号 " + baseVehicle2.getVehicleCode() + " 导入失败：";
                 }
                 failureMsg.append(msg);
                 log.error(msg, e);