钥匙柜开门添加 指纹方式

rk

5 小时以前 76407ef42394ff1046c508a106c0b51812df2a0f

钥匙柜开门添加 指纹方式

 server/system_gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: system_gateway
  # 安全配置

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetLog.java

@@ -54,7 +54,7 @@
    private Integer gridId;

    @ApiModelProperty(value = "验证方式 0刷脸 1刷卡", example = "1")
    @ExcelColumn(name="校验方式",index = 2,width = 10,valueMapping = "0=人脸;1=刷卡;2=管理授权;")
    @ExcelColumn(name="校验方式",index = 2,width = 10,valueMapping = "0=人脸;1=刷卡;2=管理授权;3=指纹开锁;")
    private Integer authType;

    @ApiModelProperty(value = "车辆编码（关联cars)", example = "1")

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

@@ -693,6 +693,7 @@
            carUseBook.setEditDate(new Date());
            carUseBook.setJdyNo(no);
            carUseBook.setJdyId(id);
            carUseBook.setKeyStatus(Constants.ZERO);
        }else{
            carUseBook.setEditDate(new Date());
        }
@@ -711,7 +712,6 @@
        carUseBook.setContent(StringUtils.isBlank(reason)?null:reason);
        carUseBook.setAddr(StringUtils.isBlank(addr)?null:addr);
        carUseBook.setStatus(Constants.TWO);
        carUseBook.setKeyStatus(Constants.ZERO);
        JSONObject driverJSON = dataJSON.getJSONObject("driver");
        if(Objects.nonNull(driverJSON)){
            String driverName = driverJSON.getString("name");

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

@@ -691,7 +691,11 @@
                                .eq(JkKeys::getRoleType,Constants.ONE)
//                                .eq(Cars::getMemberId,dto.getMemberId())
                                .isNotNull(JkCabinetGrid::getKeyId)
                                .apply(" t2.code in ( select c.car_code from car_use_book c   where c.isdeleted = 0   and NOW() > DATE_SUB(c.START_TIME, INTERVAL "+earlyConfig+" MINUTE) and now() < c.end_time  and c.DRIVER_ID = "+dto.getMemberId()+" ) ")
                                .apply(" ( t2.code in ( select c.car_code from car_use_book c   where c.isdeleted = 0   and NOW() > DATE_SUB(c.START_TIME, INTERVAL "+earlyConfig+" MINUTE) and now() < c.end_time  " +
                                        " and   c.DRIVER_ID = "+dto.getMemberId()+"   )" +
                                        " or t2.code in ( select c.car_code from car_use_book c inner join  cars c1 on c.CAR_ID = c1.ID  where c1.MEMBER_ID = 6611 AND NOW() > DATE_SUB( c.START_TIME, INTERVAL 30 MINUTE ) AND now() < c.end_time )" +
                                        " )" +
                                        " ")
                );

                for (JkCabinetGrid jkCabinetGrid:jkCabinetGridList) {

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

@@ -545,11 +545,7 @@
                    .eq(CarUseBook::getIsdeleted,Constants.ZERO)
                            .isNotNull(CarUseBook::getDriverId)
                            .apply(" car_id in ( SELECT k.CAR_ID FROM  jk_cabinet_grid j inner join jk_keys k on j.KEY_ID = k.ID where j.isdeleted = 0 and k.isdeleted = 0  ) ")
                    .apply(" (" +
                            "( NOW() > DATE_SUB(START_TIME, INTERVAL "+earlyConfig+" MINUTE) and now() < end_time and KEY_STATUS = 0  ) " +
                            "or" +
                            "  KEY_STATUS = 1 " +
                            ") ")
                    .apply("  NOW() > DATE_SUB(START_TIME, INTERVAL "+earlyConfig+" MINUTE) and now() < end_time    ")
            );
            if(CollectionUtils.isNotEmpty(carUseBookList)){
                driverList.addAll(memberMapper.selectList(new QueryWrapper<Member>().lambda()