功能优化

rk

10 小时以前 14773a2179f505e6707aab2b5ed41dbff12241ca

功能优化

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

@@ -219,4 +219,25 @@
    }



    @LoginNoRequired
    @ApiOperation("钥匙柜心跳接口")
    @GetMapping("/heartbeat")
    public ApiResponse heartbeat(@RequestParam String code) {
        jkCabinetService.updHeartbeat(code);
        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/JkCabinetGridService.java

@@ -148,6 +148,10 @@




//    /**
//     * 同步柜格实际钥匙编号
//     * @param dto
//     */
//    void syncGridData(SyncCabinetDTO dto);

}

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

@@ -132,4 +132,5 @@

    void updateRunStatusById(Integer id);

    void updHeartbeat(String code);
}

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

@@ -1144,5 +1144,53 @@



//    @Override
//    public void syncGridData(SyncCabinetDTO dto){
//        if(Objects.isNull(dto)
//                ||StringUtils.isBlank(dto.getCode())
//                || CollectionUtils.isEmpty(dto.getGridDTOList())){
//            return;
//        }
//        List<JkCabinetGrid> jkCabinetGridList =
//                jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class, new MPJLambdaWrapper<JkCabinetGrid>()
//                        .selectAll(JkCabinetGrid.class)
//                        .selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
//                        .selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
//                        .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
//                        .leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
//                        .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
//                        .eq(JkCabinet::getCode,dto.getCode())
//                        .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
//                        .isNotNull(JkCabinetGrid::getBoardCode)
//                        .isNotNull(JkCabinetGrid::getChannelCode)
//                        .orderByAsc(JkCabinetGrid::getCode)
//                );
//        if(CollectionUtils.isEmpty(jkCabinetGridList)){
//            return;
//        }
//        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())
//                    && 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())
//                );
//            }
//        }
//    }





}

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

@@ -671,5 +671,11 @@
                .eq(JkCabinet::getId,id));
    }


    @Override
    public void updHeartbeat(String code){
        jkCabinetMapper.update(null,new UpdateWrapper<JkCabinet>()
                .lambda()
                .set(JkCabinet::getHaertTime, DateUtil.getCurrDateTime())
                .eq(JkCabinet::getCode,code));
    }
}