puzhibing
2023-05-29 d6b28b2d38ae32c1d147e263c1cb4cff6b32a503
driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -123,26 +123,26 @@
        if(null != driver && driver.getApprovalStatus() == 2){
            return ResultUtil.error("该手机账号已审核通过,请直接登录。");
        }
        String idcardFront = driverRegisterWarpper.getIdcardFront();
        MultipartFile file = MultipartFileUtil.fileToMultipartFile(new File(idcardFront));
        JSONObject certificate = OCRUtil.certificate(2, file);
        if(null == certificate){
            return ResultUtil.error("身份证识别失败");
        }
        String idcode = certificate.getString("公民身份号码");
        driver.setIdcard(idcode);
        String driverLicense = driverRegisterWarpper.getDriverLicense();
        file = MultipartFileUtil.fileToMultipartFile(new File(driverLicense));
        certificate = OCRUtil.certificate(5, file);
        if(null == certificate){
            return ResultUtil.error("驾驶证识别失败");
        }
        System.err.println("驾驶证:" + certificate.toString());
        String driverLicenseNumber = certificate.getString("驾驶证号码");
        driver.setDriverLicenseNumber(driverLicenseNumber);
        driver.setFirstCertificateTime(null);
//        String idcardFront = driverRegisterWarpper.getIdcardFront();
//        MultipartFile file = MultipartFileUtil.fileToMultipartFile(new File(idcardFront));
//        JSONObject certificate = OCRUtil.certificate(2, file);
//        if(null == certificate){
//            return ResultUtil.error("身份证识别失败");
//        }
//        String idcode = certificate.getString("公民身份号码");
//        driver.setIdcard(idcode);
//
//
//        String driverLicense = driverRegisterWarpper.getDriverLicense();
//        file = MultipartFileUtil.fileToMultipartFile(new File(driverLicense));
//        certificate = OCRUtil.certificate(5, file);
//        if(null == certificate){
//            return ResultUtil.error("驾驶证识别失败");
//        }
//        System.err.println("驾驶证:" + certificate.toString());
//        String driverLicenseNumber = certificate.getString("驾驶证号码");
//        driver.setDriverLicenseNumber(driverLicenseNumber);
//        driver.setFirstCertificateTime(null);
        //账号审核拒绝后的处理
@@ -425,7 +425,7 @@
    public ResultUtil<List<String>> queryDriverPosition(Integer uid) throws Exception {
        DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", uid).eq("status", 1));
        if(null == driverWork){
            return ResultUtil.error("请先上班");
            return ResultUtil.error("请先上班", new ArrayList<>());
        }
        String value = redisUtil.getValue("DRIVER" + uid);
        List<String> list = new ArrayList<>();