设备和场地

liujun001
1 parent c469c2f0
Showing 4 changed files with 78 additions and 7 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/service/driver/NewDriverService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/driver/NewDriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
@@ -234,7 +234,9 @@ public class KeyBoxController extends BaseController {
         entity.setDevice(dto.getDevice());
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings);
+        NewDriver driver = newDriverService.getOne(dto.getDriverCode());
+
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings,driver);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -254,7 +256,9 @@ public class KeyBoxController extends BaseController {
         entity.setDevice(dto.getDevice());
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
-        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings);
+        NewDriver driver = newDriverService.getOne(dto.getDriverCode());
+
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings,driver);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -554,7 +558,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings,NewDriver driver) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -573,6 +577,9 @@ public class KeyBoxController extends BaseController {
                 }
             }
+            location.setCreateBy(Convert.toLong(driver.getId()));
+            location.setCreateTime(new Date());
+
             return location;
         }).filter(obj -> Objects.nonNull(obj.getKeyInfoId())).collect(Collectors.toList());
     }
@@ -48,6 +48,8 @@ public interface NewDriverService extends IService&lt;NewDriver&gt; {
      */
     NewDriver getOne(NewDriver entity);
+    NewDriver getOne(String jobCode);
+
     Integer countId(NewDriver entity);
     /**
@@ -139,6 +139,13 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     }
     @Override
+    public NewDriver getOne(String jobCode) {
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(NewDriver::getJobCode,jobCode);
+        return getOne(wrapper);
+    }
+
+    @Override
     public Integer countId(NewDriver entity) {
         LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(NewDriver::getJobCode);
 package com.ruoyi.service.impl.key.location;
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +14,7 @@ import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.caiinfo.CarInfo;
+import com.ruoyi.domain.equipment.heartbeat.LingangEquipmentHeartbeat;
 import com.ruoyi.domain.key.info.KeyInfo;
 import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
@@ -19,6 +23,7 @@ import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.mapper.key.location.LinggangKeyWorkLocationMapper;
 import com.ruoyi.service.carinfo.CarInfoService;
+import com.ruoyi.service.equipment.heartbeat.LingangEquipmentHeartbeatService;
 import com.ruoyi.service.key.info.KeyInfoService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
@@ -57,6 +62,8 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     private IEquipmentService equipmentService;
     @Autowired
     private CarInfoService carInfoService;
+    @Autowired
+    private LingangEquipmentHeartbeatService equipmentHeartbeatService;
     private static final String TAKE_KEY_MSG = "设备号:{0},钥匙编号:{1},在{2}的状态已经是:{3},无需在操作";
     private static final String TAKE_KEY_SUCESS = "设备号:{0},钥匙编号:{1},在{2}的状已经更新成功";
@@ -104,7 +111,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     @Override
     public List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
-        switchTime(entity,wrapper);
+        switchTime(entity, wrapper);
         return list(wrapper);
     }
@@ -187,7 +194,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     public Integer countId(LinggangKeyWorkLocation entity) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(LinggangKeyWorkLocation::getId);
-        switchTime(entity,wrapper);
+        switchTime(entity, wrapper);
         return count(wrapper);
     }
@@ -284,7 +291,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     public boolean update(LinggangKeyWorkLocation location) {
         LambdaUpdateWrapper<LinggangKeyWorkLocation> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.set(LinggangKeyWorkLocation::getEventType, location.getEventType()).set(LinggangKeyWorkLocation::getUpdateTime, new Date()).set(LinggangKeyWorkLocation::getType,location.getType());
+        wrapper.set(LinggangKeyWorkLocation::getEventType, location.getEventType()).set(LinggangKeyWorkLocation::getUpdateTime, new Date()).set(LinggangKeyWorkLocation::getType, location.getType());
         wrapper.eq(LinggangKeyWorkLocation::getId, location.getId()).ne(LinggangKeyWorkLocation::getType, location.getType());
         return update(wrapper);
@@ -586,7 +593,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                     continue;
                 }
                 if (Objects.isNull(equipment.getLatticeNumberSet())) {
-                    equipment.setLatticeNumberSet(new HashSet<>(equipment.getLatticeNumber()));
+                    equipment.setLatticeNumberSet(combationLattice(equipment));
                 }
                 number = RandomUtils.nextInt(1, equipment.getLatticeNumber());
@@ -644,6 +651,54 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return schedulings;
     }
+    private Set<Integer> combationLattice(Equipment equipment) {
+        if (Objects.isNull(equipment)) {
+            return null;
+        }
+        if (CollectionUtils.isNotEmpty(equipment.getLatticeNumberSet())) {
+            return equipment.getLatticeNumberSet();
+        }
+
+        Set<Integer> latticeNumber = new HashSet<>();
+
+        LingangEquipmentHeartbeat heartbeat = new LingangEquipmentHeartbeat();
+        heartbeat.setDevice(equipment.getDeviceId());
+        IPage<LingangEquipmentHeartbeat> heartbeatIPage = equipmentHeartbeatService.pageList(new Page<>(1, 1), heartbeat, new OrderEntity());
+        if (Objects.nonNull(heartbeatIPage) && CollectionUtils.isNotEmpty(heartbeatIPage.getRecords())) {
+            heartbeatIPage.getRecords().stream().forEach(hb -> {
+                if (StringUtils.isNotEmpty(hb.getExkeys())) {
+                    JSONArray jsonArray = JSONArray.parseArray(hb.getExkeys());
+                    if (CollectionUtils.isNotEmpty(jsonArray)) {
+                        jsonArray.stream().forEach(object -> {
+                            if (object instanceof JSONObject) {
+                                JSONObject jo = (JSONObject) object;
+                                Object value = jo.get("key");
+                                if (Objects.nonNull(value)) {
+                                    latticeNumber.add(Convert.toInt(value));
+                                }
+                            }
+                        });
+                    }
+
+                }
+            });
+        }
+
+        LinggangKeyWorkLocation location = new LinggangKeyWorkLocation();
+        location.setDevice(equipment.getDeviceId());
+        location.setType(2);
+
+
+        List<LinggangKeyWorkLocation> locations = list(location);
+        if (CollectionUtils.isNotEmpty(locations)) {
+            locations.stream().forEach(l -> {
+                latticeNumber.add(Convert.toInt(l.getCabinetNo()));
+            });
+        }
+
+        return latticeNumber;
+    }
+
     private List<LinggangVenueInfo> queryVenueInfo(List<LinggangScheduling> schedulings) {
         Set<String> zdzCode = schedulings.stream().map(LinggangScheduling::getZdzcode).collect(Collectors.toSet());
         List<LinggangVenueInfo> venueInfos = venueInfoService.listOfCodes(zdzCode);