设备和场地

liujun001
1 parent ec4fb43c
Showing 2 changed files with 28 additions and 21 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
@@ -209,7 +209,7 @@ public class KeyBoxController extends BaseController {
     @PostMapping(value = "/Driver/SkipOperation")
     @ApiOperation(value = "19.人员跳过钥匙柜操作")
-    public ResponseResult<SkipOperationVo> skipOperation(@Valid SkipOperationDTO dto, BindingResult bindingResult) {
+    public ResponseResult<SkipOperationVo> skipOperation(@Valid @RequestBody SkipOperationDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -225,11 +225,16 @@ public class KeyBoxController extends BaseController {
     @PostMapping(value = "Driver/TakeKey")
     @ApiOperation(value = "20.人员领取钥匙")
-    public ResponseResult<TakeKeyVo> takeKey(@Valid TakeKeyDTO dto, BindingResult bindingResult) {
+    public ResponseResult<TakeKeyVo> takeKey(@Valid @RequestBody TakeKeyDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
-        List<LinggangKeyWorkLocation> locations = convert(dto);
+
+        LinggangKeyWorkLocation entity = new LinggangKeyWorkLocation();
+        entity.setDevice(dto.getDevice());
+        List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
+
+        List<LinggangKeyWorkLocation> locations = convert(dto,schedulings);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -245,7 +250,11 @@ public class KeyBoxController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
-        List<LinggangKeyWorkLocation> locations = convert(dto);
+        LinggangKeyWorkLocation entity = new LinggangKeyWorkLocation();
+        entity.setDevice(dto.getDevice());
+        List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
+
+        List<LinggangKeyWorkLocation> locations = convert(dto,schedulings);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -545,7 +554,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto,List<LinggangKeyWorkLocation> schedulings) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -553,12 +562,19 @@ public class KeyBoxController extends BaseController {
         return dto.getKeyItem().stream().map(item -> {
             LinggangKeyWorkLocation location = new LinggangKeyWorkLocation();
             location.setDevice(item.getDevice());
-            location.setEventType(item.getState());
+            location.setEventType(dto.getOpeType());
             location.setKey(item.getKey());
-            location.setScheduleDate(dto.getTime());
+            location.setScheduleDate(DateUtil.shortDate(dto.getTime()));
+            location.setType(item.getState());
+            if(CollectionUtils.isNotEmpty(schedulings)){
+               Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s->Objects.equals(item.getKey(),s.getCabinetNo())).findFirst();
+               if(opt.isPresent()){
+                   location.setKeyInfoId(opt.get().getKeyInfoId());
+               }
+            }
             return location;
-        }).collect(Collectors.toList());
+        }).filter(obj->Objects.nonNull(obj.getKeyInfoId())).collect(Collectors.toList());
     }
     private TakeKeyVo convertTakeKeyVo(TakeKeyDTO dto, ResponseResult<Boolean> result) {
@@ -281,8 +281,8 @@ 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());
-        wrapper.eq(LinggangKeyWorkLocation::getId, location.getId()).ne(LinggangKeyWorkLocation::getEventType, location.getEventType());
+        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);
     }
@@ -365,22 +365,13 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     }
     private ResponseResult<List<LinggangKeyWorkLocation>> checkTaskKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum) {
-        Set<String> keyCodes = locations.stream().map(LinggangKeyWorkLocation::getKey).collect(Collectors.toSet());
-        List<KeyInfo> keyInfos = keyInfoService.list(keyCodes);
+        Set<Integer> keyCodes = locations.stream().map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
+        List<KeyInfo> keyInfos = keyInfoService.listByIds(keyCodes);
         if (CollectionUtils.isEmpty(keyInfos)) {
             log.info("无法找到钥匙信息:[{}]", locations);
             return ResponseResult.error404("无法找到钥匙信息");
         }
-        locations = locations.stream().map(lo -> {
-            Optional<KeyInfo> optional = keyInfos.stream().filter(k -> Objects.equals(k.getKeyCode(), lo.getKey())).findFirst();
-            if (optional.isPresent()) {
-                lo.setKeyInfoId(optional.get().getId());
-            }
-
-            return lo;
-        }).collect(Collectors.toList());
-
         StringBuilder resultStr = new StringBuilder();
         List<LinggangKeyWorkLocation> source = locations.stream().filter(l -> Objects.nonNull(l.getKeyInfoId())).collect(Collectors.toList());
         List<LinggangKeyWorkLocation> target = locations.stream().filter(l -> Objects.isNull(l.getKeyInfoId())).collect(Collectors.toList());