优化导入数据

liujun001
1 parent a529dd89
Showing 1 changed file with 11 additions and 19 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
@@ -195,22 +195,17 @@ public class KeyBoxController extends BaseController {
             scheduling.setCzCode(venueInfo.getParkCode());
             scheduling.setStartScheduleDate(DateUtil.shortDate(dto.getTime()));
             scheduling.setType(1);
+            scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(),1));
             List<LinggangScheduling> schedulings = schedulingService.listByCZ(scheduling);
             Set<String> jobCodes = null;
             Set<String> nbbms = null;
-            Set<String> nbbms1 = null;
+
             if (CollectionUtils.isNotEmpty(schedulings)) {
                 jobCodes = schedulings.stream().map(LinggangScheduling::getJobCode).collect(Collectors.toSet());
                 nbbms = schedulings.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
             }
-            scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(),1));
-            List<LinggangScheduling> schedulings1 = schedulingService.listByCZ(scheduling);
-            if (CollectionUtils.isNotEmpty(schedulings1)) {
-                nbbms1 = schedulings1.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
-            }
-
             List<NewDriver> drivers = queryDrive(jobCodes);
             if (CollectionUtils.isEmpty(drivers)) {
                 logger.info("根据DTO的数据无法查询司机信息:[{}]", dto);
@@ -220,12 +215,9 @@ public class KeyBoxController extends BaseController {
                 logger.info("根据DTO的数据无法查询车辆信息:[{}]", dto);
             }
-            List<CarInfo> carInfos1 = queryCarInfo(nbbms1);
-            if (CollectionUtils.isEmpty(carInfos)) {
-                logger.info("根据DTO的数据无法查询车辆信息(carInfos1):[{}]", dto);
-            }
-            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo, equipmentList, schedulings1, carInfos1);
+
+            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo, equipmentList);
             return ResponseResult.success(vo);
         } catch (ParseException e) {
             logger.error("钥匙柜基础信息同步异常:[{}]", dto, e);
@@ -399,7 +391,7 @@ public class KeyBoxController extends BaseController {
         List<KeyInfo> keyInfos = tempKeyInfos;
         int keyInfoSize = CollectionUtils.size(keyInfos);
-      List<TakeKeyPlanVo>  vos = schedulings.stream().map(s->{
+        List<TakeKeyPlanVo>  vos = schedulings.stream().map(s->{
             TakeKeyPlanVo vo = convert(s);
             if(keyInfoSize  > 0){
                 Optional<KeyInfo> optional = keyInfos.stream().filter(k->Objects.equals(k.getId(),s.getKeyInfoId())).findFirst();
@@ -453,7 +445,7 @@ public class KeyBoxController extends BaseController {
         if (CollectionUtils.isEmpty(locations)) {
             return ResponseResult.success();
         }
-       Date date = DateUtil.shortDate(new Date());
+        Date date = DateUtil.shortDate(new Date());
         location.setType(255);
         location.setStartScheduleDate(DateUtil.shortDate(new Date()));
         int errorCount = linggangKeyWorkLocationService.countId(location);
@@ -652,7 +644,7 @@ public class KeyBoxController extends BaseController {
     private BasicSyncVo convertBasicSyncVo(List<LinggangKeyWorkLocation> workLocations, List<LinggangScheduling> schedulings,
                                            List<KeyInfo> keyInfos, List<NewDriver> drivers, List<CarInfo> carInfos, Equipment equipment,
-                                           LinggangVenueInfo venueInfo, List<Equipment> equipmentList, List<LinggangScheduling> schedulings1, List<CarInfo> carInfos1) {
+                                           LinggangVenueInfo venueInfo, List<Equipment> equipmentList) {
         BasicSyncVo vo = new BasicSyncVo();
         vo.setDevice(equipment.getDeviceId());
@@ -721,10 +713,10 @@ public class KeyBoxController extends BaseController {
             });
         }
         vo.setDriverWork(driverWork);
-        if (CollectionUtils.isNotEmpty(schedulings1) && CollectionUtils.isNotEmpty(carInfos1)) {
-            Set<String> nbbms = schedulings1.stream().filter(s -> Objects.equals(s.getQdzcode(), venueInfo.getParkCode()) ||
+        if (CollectionUtils.isNotEmpty(schedulings) && CollectionUtils.isNotEmpty(carInfos)) {
+            Set<String> nbbms = schedulings.stream().filter(s -> Objects.equals(s.getQdzcode(), venueInfo.getParkCode()) ||
                     Objects.equals(s.getZdzcode(), venueInfo.getParkCode())).map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
-            List<String> plateNums = carInfos1.stream().filter(c -> nbbms.contains(c.getNbbm())).map(CarInfo::getPlateNum).collect(Collectors.toList());
+            List<String> plateNums = carInfos.stream().filter(c -> nbbms.contains(c.getNbbm())).map(CarInfo::getPlateNum).collect(Collectors.toList());
             vo.setYardVehicles(plateNums);
         }
@@ -763,7 +755,7 @@ public class KeyBoxController extends BaseController {
                 }
             }
             if(Objects.nonNull(keyInfos)){
-               Optional<KeyInfo> optional = keyInfos.stream().filter(k->Objects.equals(k.getKeyCode(),item.getKeyCode())).findFirst();
+                Optional<KeyInfo> optional = keyInfos.stream().filter(k->Objects.equals(k.getKeyCode(),item.getKeyCode())).findFirst();
                 if (optional.isPresent()) {
                     location.setKeyInfoId(optional.get().getId());
                 }else{