From 1c40baaf9ca0183945b9881d11ceed5aeebc8290 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:44 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 219 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 129 insertions(+), 90 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 aae9336..0e9dffc 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
@@ -9,7 +9,6 @@
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;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
@@ -24,8 +23,11 @@
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.WeChatUtil;
-import com.stylefeng.guns.modular.system.util.qianyuntong.NCOSSUtil;
-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;
@@ -36,25 +38,20 @@
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.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.*;
-import org.springframework.util.Base64Utils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
+import java.io.File;
import java.io.InputStream;
-import java.io.OutputStream;
import java.math.BigDecimal;
-import java.security.SecureRandom;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -88,7 +85,7 @@
@Autowired
private ICarService carService;
- @Autowired
+ @Resource
private RegionMapper regionMapper;
@Autowired
@@ -105,10 +102,6 @@
@Autowired
private IOrderLogisticsService orderLogisticsService;
-
- @Autowired
- private GunsProperties gunsProperties;
-
@Autowired
private ICompanyService companyService;
@@ -118,10 +111,30 @@
@Autowired
private TDriverPromotionActivityService driverPromotionActivityService;
-
-
+
+ @Value("${wx.url}")
+ private String ACCESS_TOKEN_URL;
+
+ @Value("${wx.appletsAppSecret}")
+ private String memberAppSecret;
+
+ @Value("${wx.appletsAppid}")
+ private String wxAppId;
+
@Autowired
- private QianYunTongConfig qianYunTongConfig;
+ private RestTemplate restTemplate;
+
+ @Autowired
+ private MongoTemplate mongoTemplate;
+
+ @Autowired
+ private WeChatUtil weChatUtil;
+
+ @Value("${filePath}")
+ private String filePath;
+
+ @Value("${qyt.admin_url}")
+ private String adminUrl;
/**
* 获取短信验证码
@@ -516,9 +529,11 @@
return ResultUtil.tokenErr();
}
Driver driver = driverService.selectById(uid);
- String areaCode = driver.getAreaCode();
+ String areaCode = driver.getPlaceOfEmployment();
TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>()
.eq("districtCode", areaCode)
+ .eq("state", 1)
+ .eq("remove", 0)
.eq("status", 2)
.last("LIMIT 1"));
if(tDriverPromotionActivity!=null){
@@ -551,13 +566,16 @@
accessToken = getAccessToken();
}
int index=0;
-
- if(ToolUtil.isEmpty(img)) {
+ String urlLink = driver.getShareLink();
+ if(ToolUtil.isEmpty(img) || ToolUtil.isEmpty(urlLink)) {
RestTemplate rest = new RestTemplate();
- String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
+// String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
+ String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
Map<String, Object> param = new HashMap<>();
- param.put("path", "pages/home/home?driverId=" + uid);
+ param.put("page", "pages/home/home");
param.put("width", 430); //二维码尺寸
+ param.put("scene", "driverId=" + uid);
+ param.put("env_version", "release"); //正式版为 "release"，体验版为 "trial"，开发版为 "develop"。默认是正式版。
HttpRequest post = HttpUtil.createPost(url);
post.body(JSON.toJSONString(param));
@@ -567,7 +585,6 @@
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;
@@ -600,17 +617,7 @@
return ResultUtil.error("获取二维码失败");
}
- @Value("${wx.url}")
- private String ACCESS_TOKEN_URL;
-
- @Value("${wx.appletsAppSecret}")
- private String memberAppSecret;
-
- @Value("${wx.appletsAppid}")
- private String wxAppId;
-
- @Autowired
- private RestTemplate restTemplate;
+
public String getAccessToken() {
@@ -734,6 +741,18 @@
@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.setDriverId(orderPosition.getDriverId());
+ position.setPoint(point);
+ mongoTemplate.save(position);
+ //处理业务上的功能
orderPositionService.saveData(orderPosition);
return JSON.toJSONString(ResultUtil.success());
}catch (Exception e){
@@ -1590,7 +1609,7 @@
if(companyCities.isEmpty()){
return ResultUtil.success(companyVos);
}
- Wrapper<Company> in = new EntityWrapper<Company>().ne("type", 1).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);
@@ -1730,8 +1749,7 @@
}
}
- @Autowired
- private WeChatUtil weChatUtil;
+
@ResponseBody
@PostMapping("/api/driver/getDriverCode")
@@ -1753,15 +1771,17 @@
//HttpURLConnection httpURLConnection = weChatUtil.getwxacodeunlimit(appletPath, "d=" + driverId + "&k=" + 0, "release",driverId);
InputStream inputStream = weChatUtil.getwxacodeunlimit(appletPath, "driverId=" + driverId, "release");
if (inputStream != null) {
- // 上传文件目录
- fileName = UUID.randomUUID().toString() + ".png";
- String fileSavePath = gunsProperties.getFileUploadPath() + "img\\";
- FileUtil.writeFromStream(inputStream, fileName);
- String pictureName = gunsProperties.getPictureServerAddress() + "img/" + fileName;
-// fileName = OssUploadUtil.ossUploadByStream(driverId, inputStream);
- System.out.println(pictureName);
- driver.setQrCode(pictureName);
+ File file = FileUtil.writeFromStream(inputStream, new File(filePath + "/" + UUID.randomUUID().toString() + ".png"));
+ HttpRequest post = HttpUtil.createPost(adminUrl + "/upload/image");
+ post.form("file", file);
+ HttpResponse execute = post.execute();
+ int status = execute.getStatus();
+ if(200 != status){
+ throw new RuntimeException("上传图片异常");
+ }
+ driver.setQrCode(execute.body());
driverService.updateById(driver);
+ fileName = driver.getQrCode();
}
}
return ResultUtil.success(fileName);
@@ -1795,13 +1815,13 @@
driver.setAuthState(3);
driverService.updateById(driver);
//开始验证当前账号是否在别处登录
- String value = (String) redisTemplate.opsForValue().get("DRIVER_" + driverId);
+ String value = (String) redisTemplate.opsForValue().get("dache:DRIVER_" + driverId);
if (ToolUtil.isNotEmpty(value)) {//将另外设备上的强迫下线
//开始清除redis中无效的数据
- String key = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone());
+ String key = (String) redisTemplate.opsForValue().get("dache:DRIVER_" + driver.getPhone());
redisTemplate.delete(key);//删除个人信息数据
- redisTemplate.delete("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
- redisTemplate.delete("DRIVER_" + driverId);//清除存储的token
+ redisTemplate.delete("dache:DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
+ redisTemplate.delete("dache:DRIVER_" + driverId);//清除存储的token
}
return ResultUtil.success();
} catch (Exception e) {
@@ -1810,40 +1830,59 @@
}
}
-
-
-// @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"),
+ @ApiImplicitParam(value = "01 证联收银台支付\n" +
+ "\t 04 HOME 页\n" +
+ "\t 06 申请免密签约\n" +
+ "\t 07 商户收银台支付\n" +
+ "\t 08 开户（绑卡）\n" +
+ "\t 09 开通支付账户\n" +
+ "\t 10 打开付款码", name = "type", required = true, dataType = "String"),
+ })
+ public ResultUtil<String> getZLToken(String ip, String mac, String type, 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);
+ tokenRequest.setType(type);
+ 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