From dda9ffb76b585bb5bcf5282def424999448fa915 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 17:57:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 376 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 319 insertions(+), 57 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 12ce5f8..f459621 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
@@ -1,8 +1,14 @@
package com.stylefeng.guns.modular.api;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.config.properties.GunsProperties;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -14,11 +20,16 @@
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.model.*;
-import com.stylefeng.guns.modular.system.model.vo.CompanyVo;
+import com.stylefeng.guns.modular.system.model.vo.*;
import com.stylefeng.guns.modular.system.service.*;
-import com.stylefeng.guns.modular.system.util.ALiSendSms;
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;
@@ -26,20 +37,27 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-
-import static org.bouncycastle.cms.RecipientId.password;
/**
* 司机控制器
@@ -48,6 +66,7 @@
@CrossOrigin
@RestController
@RequestMapping("")
+@Slf4j
public class DriverController {
@Resource
@@ -67,7 +86,7 @@
@Autowired
private ICarService carService;
- @Autowired
+ @Resource
private RegionMapper regionMapper;
@Autowired
@@ -88,12 +107,35 @@
@Autowired
private GunsProperties gunsProperties;
-
@Autowired
private ICompanyService companyService;
@Autowired
private ICompanyCityService companyCityService;
+
+ @Autowired
+ private TDriverPromotionActivityService driverPromotionActivityService;
+
+ @Autowired
+ private QianYunTongConfig qianYunTongConfig;
+
+ @Value("${wx.url}")
+ private String ACCESS_TOKEN_URL;
+
+ @Value("${wx.appletsAppSecret}")
+ private String memberAppSecret;
+
+ @Value("${wx.appletsAppid}")
+ private String wxAppId;
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ @Autowired
+ private MongoTemplate mongoTemplate;
+
+ @Autowired
+ private WeChatUtil weChatUtil;
/**
* 获取短信验证码
@@ -379,6 +421,210 @@
}
+ @ResponseBody
+ @PostMapping("/api/driver/queryHomeDataFromDriver")
+ @ApiOperation(value = "获取首页统计数据(黔云通)", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<DriverIndexVo> queryHomeDataFromDriver(HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ DriverIndexVo vo = driverService.queryHomeDataFromDriver(uid);
+ return ResultUtil.success(vo);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryOrderDataFromDriver")
+ @ApiOperation(value = "获取订单统计数据(黔云通)", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "2022-02-02 - 2033-03-03", name = "time", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "pageNumber", name = "pageNumber", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "pageSize", name = "pageSize", required = true, dataType = "int")
+ })
+ public ResultUtil<DriverOrderDataVo> queryOrderDataFromDriver(String time,Integer pageNumber,Integer pageSize,HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ Page<DriverOrderDataNextVo> driverOrderDataVoPage = new Page<>(pageNumber, pageSize);
+ DriverOrderDataVo vo = driverService.queryOrderDataFromDriver(time,driverOrderDataVoPage,uid);
+ return ResultUtil.success(vo);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryOrderMoneyFromDriver")
+ @ApiOperation(value = "获取订单收入统计数据(黔云通)", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "2022-02-02 - 2033-03-03", name = "time", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "pageNumber", name = "pageNumber", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "pageSize", name = "pageSize", required = true, dataType = "int")
+ })
+ public ResultUtil<DriverOrderMoneyDataVo> queryOrderMoneyFromDriver(String time, Integer pageNumber, Integer pageSize, HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ Page<DriverOrderDataNextVo> driverOrderDataVoPage = new Page<>(pageNumber, pageSize);
+ DriverOrderMoneyDataVo vo = driverService.queryOrderMoneyFromDriver(time,driverOrderDataVoPage,uid);
+ return ResultUtil.success(vo);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ @ResponseBody
+ @PostMapping("/api/driver/queryOrderPromotionFromDriver")
+ @ApiOperation(value = "获取订单推广统计数据(黔云通)", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "2022-02-02 - 2033-03-03", name = "time", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "pageNumber", name = "pageNumber", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "pageSize", name = "pageSize", required = true, dataType = "int")
+ })
+ public ResultUtil<DriverOrderPromotionDataVo> queryOrderPromotionFromDriver(String time, Integer pageNumber, Integer pageSize, HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ Page<DriverOrderDataNextVo> driverOrderDataVoPage = new Page<>(pageNumber, pageSize);
+ DriverOrderPromotionDataVo vo = driverService.queryOrderPromotionFromDriver(time,driverOrderDataVoPage,uid);
+ return ResultUtil.success(vo);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/driver/getPromotionInfo")
+ @ApiOperation(value = "获取推广说明(黔云通)", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<String> getPromotionInfo(HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ Driver driver = driverService.selectById(uid);
+ String areaCode = driver.getAreaCode();
+ TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>()
+ .eq("districtCode", areaCode)
+ .eq("status", 2)
+ .last("LIMIT 1"));
+ if(tDriverPromotionActivity!=null){
+ return ResultUtil.success(tDriverPromotionActivity.getActivityDesc());
+ }
+ return ResultUtil.success("");
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ @ApiOperation(value = "个人的小程序码（分享码）/链接", tags = {"司机端-首页"}, notes = "")
+ @GetMapping("/api/driver/personCode")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ })
+ public ResultUtil<HashMap<String, Object>> personCode(HttpServletRequest request) {
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+ Driver driver = driverService.selectById(uid);
+ String accessToken=null;
+ Object img = redisTemplate.opsForValue().get("DRIVER_WX_IMG" + uid);
+ // 获取调用凭证accessToken
+ if(ToolUtil.isEmpty(driver.getShareLink())|| ToolUtil.isEmpty(img)){
+ accessToken = getAccessToken();
+ }
+ int index=0;
+
+ if(ToolUtil.isEmpty(img)) {
+ RestTemplate rest = new RestTemplate();
+ String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
+ Map<String, Object> param = new HashMap<>();
+ param.put("path", "pages/home/home?driverId=" + uid);
+ param.put("width", 430); //二维码尺寸
+ HttpRequest post = HttpUtil.createPost(url);
+ post.body(JSON.toJSONString(param));
+
+ byte[] result = post.execute().bodyBytes();
+ // base64
+ img = Base64.getEncoder().encodeToString(result);
+ redisTemplate.opsForValue().set("DRIVER_WX_IMG" + uid, img,30, TimeUnit.DAYS);
+ }
+
+ String urlLink = driver.getShareLink();
+ if(ToolUtil.isEmpty(urlLink)) {
+ index=1;
+ String url1 = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=" + accessToken;
+ Map<String, Object> param1 = new HashMap<>();
+ param1.put("path", "pages/home/home");
+ param1.put("query", "driverId=" + uid);
+
+ HttpRequest post = HttpUtil.createPost(url1);
+ // map转json
+ String jsonString = JSON.toJSONString(param1);
+ post.body(jsonString);
+ HttpResponse execute = post.execute();
+ String body = execute.body();
+ urlLink = JSONObject.parseObject(body).get("url_link").toString();
+ driver.setShareLink(urlLink);
+ }
+
+ if(index==1){
+ driverService.updateById(driver);
+ }
+
+ HashMap<String, Object> stringStringHashMap = new HashMap<>();
+ stringStringHashMap.put("url_link",urlLink);
+ stringStringHashMap.put("img",img);
+ return ResultUtil.success(stringStringHashMap);
+
+ } catch (Exception e) {
+ log.error("调用小程序生成微信永久小程序码URL接口异常", e);
+ }
+ return ResultUtil.error("获取二维码失败");
+ }
+
+
+
+
+ public String getAccessToken() {
+ String requestUrl = MessageFormat.format(ACCESS_TOKEN_URL,wxAppId,memberAppSecret);
+ String respBody = restTemplate.getForEntity(requestUrl, String.class).getBody();
+ JSONObject jsonObject = JSONObject.parseObject(respBody);
+ return jsonObject.getString("access_token");
+ }
+
+
/**
* 司机上下班操作
* @param type
@@ -492,6 +738,17 @@
@PostMapping("/base/savePosition")
public String savePosition(OrderPosition orderPosition){
try {
+ //将最新定位存储mongodb中
+ GeoJsonPoint point = new GeoJsonPoint(new Point(Double.parseDouble(orderPosition.getLon()),
+ Double.parseDouble(orderPosition.getLat())));
+ DriverPosition position = mongoTemplate.findOne(Query.query(Criteria.where("driverId")
+ .is(orderPosition.getDriverId())), DriverPosition.class);
+ if(null == position){
+ position = new DriverPosition();
+ }
+ position.setPoint(point);
+ mongoTemplate.save(position);
+ //处理业务上的功能
orderPositionService.saveData(orderPosition);
return JSON.toJSONString(ResultUtil.success());
}catch (Exception e){
@@ -727,17 +984,18 @@
*/
@ResponseBody
@PostMapping("/api/driver/queryPhone")
- @ApiOperation(value = "获取客服电话", tags = {"司机端-个人中心"}, notes = "车队=franchisee，分公司=branch，平台=platform")
+ @ApiOperation(value = "获取客服电话(黔云通)", tags = {"司机端-个人中心"}, notes = "车队=franchisee，分公司=branch，平台=platform")
@ApiImplicitParams({
+ @ApiImplicitParam(value = "当前行政区划代码", name = "code", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryPhone(HttpServletRequest request){
+ public ResultUtil queryPhone(String code, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Map<String, Object> map = driverService.queryPhone(uid);
+ Map<String, Object> map = driverService.queryPhone(uid, code);
return ResultUtil.success(map);
}catch (Exception e){
e.printStackTrace();
@@ -1336,9 +1594,10 @@
@ApiOperation(value = "通过区code获取服务商", tags = {"司机端-注册"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "区code", name = "areaCode", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "name", name = "name", required = false, dataType = "String"),
})
- public ResultUtil<List<CompanyVo>> getCompany(String areaCode){
+ public ResultUtil<List<CompanyVo>> getCompany(String areaCode,String name){
try {
ArrayList<CompanyVo> companyVos = new ArrayList<>();
@@ -1346,7 +1605,12 @@
if(companyCities.isEmpty()){
return ResultUtil.success(companyVos);
}
- List<Company> companies = companyService.selectList(new EntityWrapper<Company>().eq("type", 2).ne("flag", 3).in("id", companyCities.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList())));
+ Wrapper<Company> in = new EntityWrapper<Company>().eq("type", 2).ne("flag", 3).in("id", companyCities.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList()));
+
+ if(ToolUtil.isNotEmpty( name)){
+ in.like("name", name);
+ }
+ List<Company> companies = companyService.selectList(in);
for (Company company : companies) {
CompanyVo companyVo = new CompanyVo(company.getId(), company.getName());
companyVos.add(companyVo);
@@ -1481,8 +1745,7 @@
}
}
- @Autowired
- private WeChatUtil weChatUtil;
+
@ResponseBody
@PostMapping("/api/driver/getDriverCode")
@@ -1561,52 +1824,51 @@
}
}
-
@ResponseBody
- @GetMapping("/base/driver/getDriverInfo")
- public void getDriverInfo(String lsu, String ssologinid, String ticket, HttpSession session) {
+ @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 {
- String onconParam = edu.yale.its.tp.cas.client.Util.getOnconParam(session);
- onconParam = new String(Base64.getDecoder().decode(onconParam), "UTF-8");
- System.err.println("lsu: " + lsu + ",ticket: " + ticket + ",ssologinid: " + ssologinid);
- } catch (Exception e) {
+ 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();
}
}
-
-
-// @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();
-// }
-// }
+
+
+ /**
+ * 证联通知回调
+ * @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