From 072d5dbd7642935056857268af4ab187035d7eec Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 28 七月 2025 15:25:50 +0800 Subject: [PATCH] 添加证联集成 --- DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 94 ++++++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 38 deletions(-) diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java index c721ab2..21605f4 100644 --- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java +++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java @@ -25,6 +25,11 @@ import com.stylefeng.guns.modular.system.util.ResultUtil; import com.stylefeng.guns.modular.system.util.WeChatUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongConfig; +import com.stylefeng.guns.modular.system.util.zhenglian.CallbackUtil; +import com.stylefeng.guns.modular.system.util.zhenglian.TokenUtil; +import com.stylefeng.guns.modular.system.util.zhenglian.model.MessageBody; +import com.stylefeng.guns.modular.system.util.zhenglian.model.TokenRequest; +import com.stylefeng.guns.modular.system.util.zhenglian.model.TradeTerminalInfo; import com.stylefeng.guns.modular.system.warpper.*; import com.stylefeng.guns.modular.taxi.model.OrderTaxi; import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; @@ -128,6 +133,9 @@ @Autowired private MongoTemplate mongoTemplate; + + @Autowired + private WeChatUtil weChatUtil; /** * 获取短信验证码 @@ -1737,8 +1745,7 @@ } } - @Autowired - private WeChatUtil weChatUtil; + @ResponseBody @PostMapping("/api/driver/getDriverCode") @@ -1817,40 +1824,51 @@ } } - - -// @ResponseBody -// @RequestMapping(value = "/base/driver/uploadImg", method = RequestMethod.POST) -// @ApiOperation(value = "上传图片", tags = {"司机端-注册"}, notes = "") -// public ResultUtil uploadImg(MultipartFile file) { -// try { -// String bucketName = "grjy_test"; -// Bucket grjyTest = NCOSSUtil.getBucketInfo(bucketName); -// if (null == grjyTest) { -// //创建桶 -// Boolean bucket = NCOSSUtil.createBucket(bucketName); -// if (!bucket) { -// return ResultUtil.error("创建存储桶失败"); -// } -// //设置桶策略 -// String policyText = "{\"Version\":\"2025-06-23\",\"Statement\":[{\"Sid\":\"Stmt20250623\",\"Action\":[\"GetObject\"]" + -// ",\"Effect\":\"Allow\",\"Resource\":[\"" + bucketName + "\"/*],\"Principal\":{*}}]}"; -// Boolean bucketPolicy = NCOSSUtil.setBucketPolicy(bucketName, policyText); -// if (!bucketPolicy) { -// return ResultUtil.error("设置桶策略失败"); -// } -// } -// //上传对象 -// String key = "image/driver/" + UUID.randomUUID().toString() + ".png"; -// String object = NCOSSUtil.putObject(bucketName, key, file.getInputStream()); -// if (null == object) { -// return ResultUtil.error("上传图片失败"); -// } -// -// return ResultUtil.success("http://" + QianYunTongProperties.endPoint + "/" + key); -// } catch (Exception e) { -// e.printStackTrace(); -// return ResultUtil.runErr(); -// } -// } + @ResponseBody + @PostMapping("/api/driver/getZLToken") + @ApiOperation(value = "获取证联token(黔云通)", tags = {"司机端-首页"}, notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), + @ApiImplicitParam(value = "当前设备IP地址", name = "ip", required = true, dataType = "String"), + @ApiImplicitParam(value = "当前设备mac地址", name = "mac", required = true, dataType = "String"), + }) + public ResultUtil<String> getZLToken(String ip, String mac, HttpServletRequest request){ + try { + Integer driverId = driverService.getUserIdFormRedis(request); + if (null == driverId) { + return ResultUtil.tokenErr(); + } + Driver driver = driverService.selectById(driverId); + TokenRequest tokenRequest = new TokenRequest(); + tokenRequest.setAppUserId(driver.getEmpId().toString()); + tokenRequest.setUserName(driver.getName()); + tokenRequest.setCertNo(driver.getIdCard()); + tokenRequest.setPhone(driver.getPhone()); + TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo(); + tradeTerminalInfo.setIp(ip); + tradeTerminalInfo.setTerminal("1"); + tradeTerminalInfo.setMac(mac); + tokenRequest.setTradeTerminalInfo(tradeTerminalInfo); + String token = TokenUtil.getToken(tokenRequest); + return ResultUtil.success(token); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + + /** + * 证联通知回调 + * @param messageBody + * @param request + * @return + */ + @ResponseBody + @PostMapping("/base/driver/zlCallback") + public void zlCallback(@RequestBody MessageBody messageBody, HttpServletRequest request){ + String callback = CallbackUtil.callback(messageBody); + System.err.println("证联通知回调:" + callback); + log.info("证联通知回调:" + callback); + } } -- Gitblit v1.7.1