From 954dd6d15ad6a32098f252e7db52459231566b2b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 10 九月 2025 17:28:24 +0800
Subject: [PATCH] 提交代码

---
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
index 93dbf80..b741b60 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
@@ -1,5 +1,9 @@
 package com.supersavedriving.user.modular.system.service.impl;
 
+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.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -11,12 +15,14 @@
 import com.supersavedriving.user.modular.system.util.RedisUtil;
 import com.supersavedriving.user.modular.system.util.ResultUtil;
 import com.supersavedriving.user.modular.system.util.UUIDUtil;
-import com.supersavedriving.user.modular.system.util.huawei.OBSUtil;
 import com.supersavedriving.user.modular.system.util.mongodb.model.Location;
+import com.supersavedriving.user.modular.system.util.qianyuntong.QianYunTongConfig;
 import com.supersavedriving.user.modular.system.util.weChat.WeChatUtil;
 import com.supersavedriving.user.modular.system.warpper.DriverRegisterWarpper;
 import com.supersavedriving.user.modular.system.warpper.NearbyDriverWarpper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metrics;
@@ -26,12 +32,11 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.io.File;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -39,6 +44,7 @@
 * @author pzb
 * @Date 2023/2/8 18:52
 */
+@Slf4j
 @Service
 public class DriverServiceImpl extends ServiceImpl<DriverMapper, Driver> implements IDriverService {
 
@@ -68,6 +74,12 @@
 
     @Autowired
     private ITBranchOfficeAreaService branchOfficeAreaService;
+    
+    @Value("${qyt.admin_url}")
+    private String adminUrl;
+
+    @Value("${filePath}")
+    private String filePath;
 
 
 
@@ -91,6 +103,7 @@
         // 构造query对象
         Query query = Query.query(Criteria.where("location").withinSphere(circle));
         List<Location> locations = mongoTemplate.find(query, Location.class);
+        log.info("地理空间检索结果:{}", locations);
         List<Integer> collect = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
         if(collect.size() == 0){
             return list;
@@ -102,7 +115,7 @@
         }
         List<DriverWork> driverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", collect).eq("status", 1));
         for (DriverWork driverWork : driverWorks) {
-            String value = redisUtil.getValue("DRIVER" + driverWork.getDriverId());
+            String value = redisUtil.getValue("daijia:DRIVER" + driverWork.getDriverId());
             if(ToolUtil.isEmpty(value)){
                 continue;
             }
@@ -250,7 +263,15 @@
     //生成小程序二维码
     public String wechatMiniProgramORCode(Integer driverId) throws Exception{
         InputStream release = weChatUtil.getwxacodeunlimit("pages/index/index", "driverId=" + driverId, "release");
-        String s = OBSUtil.putObjectToBucket(release, "driver_" + driverId);
-        return s;
+        String pictureName = "driver_" + driverId + ".png";
+        File file = FileUtil.writeFromStream(release, new File(filePath + pictureName));
+        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("上传图片异常");
+        }
+        return execute.body();
     }
 }

--
Gitblit v1.7.1