黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liujie
3 天以前 3003ef3b80f346a73f3c154c04e7d5d1f0e3b5eb 
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java


@@ -24,8 +24,12 @@


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 +40,19 @@


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.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 +86,7 @@


    @Autowired


    private ICarService carService;


    


    @Autowired


    @Resource


    private RegionMapper regionMapper;


    


    @Autowired


@@ -109,7 +107,6 @@


    @Autowired


    private GunsProperties gunsProperties;






    @Autowired


    private ICompanyService companyService;




@@ -119,9 +116,26 @@


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


    


    /**


     * 获取短信验证码


@@ -600,17 +614,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 +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){


@@ -1590,7 +1605,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 +1745,7 @@


        }


    }




    @Autowired


    private WeChatUtil weChatUtil;


    


    


    @ResponseBody


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


@@ -1810,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);


    }


}