功能优化

rk

15 小时以前 926aac10d3306a78aaf19ced841633edb0e4a2b5

功能优化

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java

@@ -229,14 +229,14 @@
    }


//    @LoginNoRequired
//    @ApiOperation("同步柜格实际钥匙数据")
//    @PostMapping("/syncGridData")
//    public ApiResponse syncGridData(@RequestBody SyncCabinetDTO dto) {
//        jkCabinetGridService.syncGridData(dto);
//        this.saveInterfaceLog(JSONObject.toJSONString(dto), null,"syncGridData","同步柜格实际钥匙数据");
//        return ApiResponse.success("操作成功");
//    }
    @LoginNoRequired
    @ApiOperation("同步柜格实际钥匙数据")
    @PostMapping("/syncGridData")
    public ApiResponse syncGridData(@RequestBody SyncCabinetDTO dto) {
        jkCabinetGridService.syncGridData(dto);
        this.saveInterfaceLog(JSONObject.toJSONString(dto), null,"syncGridData","同步柜格实际钥匙数据");
        return ApiResponse.success("操作成功");
    }




 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java

@@ -1182,21 +1182,41 @@
        List<SyncGridDTO> gridDTOList = dto.getGridDTOList();
        for (JkCabinetGrid jkCabinetGrid:jkCabinetGridList) {
            List<SyncGridDTO> gridSyncList = gridDTOList.stream().filter(i->StringUtils.isNotBlank(i.getBoardCode())&&
                    StringUtils.isNotBlank(i.getChannelCode())&&StringUtils.isNotBlank(i.getActualLable())&&i.getBoardCode().equals(jkCabinetGrid.getBoardCode())
                    StringUtils.isNotBlank(i.getChannelCode())&&i.getBoardCode().equals(jkCabinetGrid.getBoardCode())
                    && i.getChannelCode().equals(jkCabinetGrid.getChannelCode())).collect(Collectors.toList());
            if(CollectionUtils.isEmpty(gridSyncList)){
                continue;
            }
            SyncGridDTO syncGridDTO = gridSyncList.get(Constants.ZERO);
            if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
                    || (!jkCabinetGrid.getKeyCode().equals(syncGridDTO.getActualLable())
                    && !jkCabinetGrid.getActualLable().equals(syncGridDTO.getActualLable()))){
                //更新数据 标记对应code
                jkCabinetGridMapper.update(null,new UpdateWrapper<JkCabinetGrid>().lambda()
                        .set(JkCabinetGrid::getActualLable,syncGridDTO.getActualLable())
                        .eq(JkCabinetGrid::getId,jkCabinetGrid.getId())
            //为空的情况 或 钥匙与柜格钥匙不一致 标记钥匙不在位
            if(StringUtils.isBlank(syncGridDTO.getActualLable())
                || !jkCabinetGrid.getKeyCode().equals(syncGridDTO.getActualLable())
            ){
                if(Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
                    jkKeysMapper.update(null,new UpdateWrapper<JkKeys>().lambda()
                            .set(JkKeys::getStatus,Constants.TWO)
                            .eq(JkKeys::getId,jkCabinetGrid.getKeyId())
                );
                    log.error("钥匙柜信息推送实际钥匙变化："+jkCabinetGrid.getKeyCode());
            }
            }else{
                if(!Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
                    jkKeysMapper.update(null,new UpdateWrapper<JkKeys>().lambda()
                            .set(JkKeys::getStatus,Constants.ONE)
                            .eq(JkKeys::getId,jkCabinetGrid.getKeyId())
                    );
                    log.error("钥匙柜信息推送实际钥匙变化："+jkCabinetGrid.getKeyCode());
                }
            }
//            if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
//                    || (!jkCabinetGrid.getKeyCode().equals(syncGridDTO.getActualLable())
//                    && !jkCabinetGrid.getActualLable().equals(syncGridDTO.getActualLable()))){
//                //更新数据 标记对应code
//                jkCabinetGridMapper.update(null,new UpdateWrapper<JkCabinetGrid>().lambda()
//                        .set(JkCabinetGrid::getActualLable,syncGridDTO.getActualLable())
//                        .eq(JkCabinetGrid::getId,jkCabinetGrid.getId())
//                );
//            }
        }
    }