功能优化

rk

2026-06-09 c467370d8741bc05ca7c22d4253c58ac0a979ef5

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

@@ -57,6 +57,9 @@
    private JkKeysMapper jkKeysMapper;

    @Autowired
    private CarsMapper carsMapper;

    @Autowired
    private SystemUserMapper systemUserMapper;

    @Autowired
@@ -1220,11 +1223,19 @@
                    );
                    log.error("钥匙柜信息推送实际钥匙变化："+jkCabinetGrid.getKeyCode());
                    JkCabinetLog cabinetLog = new JkCabinetLog();
                    cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
                    JkKeys jkKeys = jkKeysMapper.selectById(jkCabinetGrid.getKeyId());
                    if(Objects.nonNull(jkKeys)){
                        cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkKeys.getCode());
                        Cars cars = carsMapper.selectById(jkCabinetGrid.getCarId());
                        if(Objects.nonNull(cars)){
                            cabinetLog.setMemberId(cars.getMemberId());
                        }
                    }
                    cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
                    cabinetLog.setGridId(jkCabinetGrid.getId());
                    cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
                    cabinetLog.setCarId(jkCabinetGrid.getCarId());
                    cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
                    cabinetLog.setType(Constants.ONE);
                    cabinetLog.setStatus(Constants.ZERO);
                    cabinetLog.setAuthType(3);
@@ -1243,11 +1254,19 @@
                    );
                    log.error("钥匙柜信息推送实际钥匙变化："+jkCabinetGrid.getKeyCode());
                    JkCabinetLog cabinetLog = new JkCabinetLog();
                    cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
                    JkKeys jkKeys = jkKeysMapper.selectById(jkCabinetGrid.getKeyId());
                    if(Objects.nonNull(jkKeys)){
                        cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkKeys.getCode());
                        Cars cars = carsMapper.selectById(jkCabinetGrid.getCarId());
                        if(Objects.nonNull(cars)){
                            cabinetLog.setMemberId(cars.getMemberId());
                        }
                    }
                    cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
                    cabinetLog.setGridId(jkCabinetGrid.getId());
                    cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
                    cabinetLog.setCarId(jkCabinetGrid.getCarId());
                    cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
                    cabinetLog.setType(Constants.ONE);
                    cabinetLog.setStatus(Constants.ZERO);
                    cabinetLog.setAuthType(3);
@@ -1257,6 +1276,14 @@
                    cabinetLog.setIsdeleted(Constants.ZERO);
                    cabinetLog.setCreateDate(new Date());
                    jkCabinetLogMapper.insert(cabinetLog);

                    jkCabinetLogMapper.update(null,new UpdateWrapper<JkCabinetLog>().lambda()
                            .set(JkCabinetLog::getCloseLogId,cabinetLog.getId())
                            .eq(JkCabinetLog::getKeyId,cabinetLog.getKeyId())
                            .eq(JkCabinetLog::getType,Constants.ONE)
                            .eq(JkCabinetLog::getKeyStatus,Constants.TWO)
                            .isNull(JkCabinetLog::getCloseLogId));

                }
            }
//            if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())