黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
Pu Zhibing
4 天以前 8675ddc7e76f418ee47adc50ee7bac35171a9620 
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java


@@ -1,7 +1,9 @@


package com.stylefeng.guns.modular.api;




import cn.hutool.core.io.FileUtil;


import com.alibaba.fastjson.JSON;


import com.baomidou.mybatisplus.mapper.EntityWrapper;


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;


@@ -12,7 +14,10 @@


import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;


import com.stylefeng.guns.modular.system.model.*;


import com.stylefeng.guns.modular.system.service.*;


import com.stylefeng.guns.modular.system.util.*;


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.SMSUtil;


import com.stylefeng.guns.modular.system.warpper.*;


import com.stylefeng.guns.modular.taxi.model.OrderTaxi;


import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;


@@ -21,6 +26,7 @@


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.web.bind.annotation.*;




import javax.servlet.http.HttpServletRequest;


@@ -41,7 +47,7 @@


public class DriverController {




    @Autowired


    private RedisUtil redisUtil;


    private RedisTemplate redisTemplate;


    @Autowired


    private IDriverService driverService;




@@ -75,10 +81,13 @@


    @Autowired


    private IOrderLogisticsService orderLogisticsService;




    @Autowired


    private GunsProperties gunsProperties;






    /**


     * 获取短信验证码


     *


     * @param phone


     * @return


     */


@@ -104,6 +113,7 @@




    /**


     * 验证短信验证码


     *


     * @param phone


     * @param code


     * @return


@@ -220,6 +230,7 @@




    /**


     * 司机注册审核后的短信


     *


     * @param uid


     * @param type


     * @return


@@ -250,7 +261,8 @@


                    templateCode = "SMS_229613326";//司机注册失败


                    break;


            }


            String s = aLiSendSms.sendSms(driver.getPhone(), templateCode, "{}");


//            String s = aLiSendSms.sendSms(driver.getPhone(), templateCode, "{}");


            SMSUtil.sendVerifyCode(driver.getPhone());


            return ResultUtil.success();


        }catch (Exception e){


            e.printStackTrace();


@@ -1402,6 +1414,7 @@




    @Autowired


    private WeChatUtil weChatUtil;


    


    @ResponseBody


    @PostMapping("/api/driver/getDriverCode")


    @ApiOperation(value = "获取司机端的二维码", tags = {"司机端-个人中心"}, notes = "")


@@ -1422,9 +1435,14 @@


                    //HttpURLConnection httpURLConnection = weChatUtil.getwxacodeunlimit(appletPath, "d=" + driverId + "&k=" + 0, "release",driverId);


                    InputStream inputStream = weChatUtil.getwxacodeunlimit(appletPath, "driverId=" + driverId , "release");


                    if(inputStream!=null){


                        fileName = OssUploadUtil.ossUploadByStream(driverId,inputStream);


                        System.out.println(fileName);


                        driver.setQrCode(fileName);


                        // 上传文件目录


                        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);


                        driverService.updateById(driver);


                    }


                }


@@ -1459,13 +1477,13 @@


            driver.setAuthState(3);


            driverService.updateById(driver);


            //开始验证当前账号是否在别处登录


            String value = redisUtil.getValue("DRIVER_" + driverId);


            String value = (String) redisTemplate.opsForValue().get("DRIVER_" + driverId);


            if (ToolUtil.isNotEmpty(value)) {//将另外设备上的强迫下线


                //开始清除redis中无效的数据


                String key = redisUtil.getValue("DRIVER_" + driver.getPhone());


                redisUtil.remove(key);//删除个人信息数据


                redisUtil.remove("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存


                redisUtil.remove("DRIVER_" + driverId);//清除存储的token


                String key = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone());


                redisTemplate.delete(key);//删除个人信息数据


                redisTemplate.delete("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存


                redisTemplate.delete("DRIVER_" + driverId);//清除存储的token


            }


            return ResultUtil.success();


        } catch (Exception e) {