DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -3,6 +3,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.stylefeng.guns.core.shiro.ShiroKit; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService; import com.stylefeng.guns.modular.system.model.OrderPosition; import com.stylefeng.guns.modular.system.model.Reassign; @@ -11,6 +13,7 @@ import com.stylefeng.guns.modular.system.service.IReassignService; //import com.stylefeng.guns.modular.system.util.ChinaMobileUtil; import com.stylefeng.guns.modular.system.util.PushUtil; import com.stylefeng.guns.modular.system.util.RedisUtil; import com.stylefeng.guns.modular.system.util.ResultUtil; import com.stylefeng.guns.modular.system.util.SystemException; import com.stylefeng.guns.modular.system.warpper.BaseWarpper; @@ -66,10 +69,8 @@ @Value("${filePath}") private String filePath; @Autowired private RedisUtil redisUtil; /** @@ -778,4 +779,28 @@ } } @ResponseBody @PostMapping("/api/order/getDriverNewOrder") @ApiOperation(value = "获取司机最新的指派单数据", tags = {"司机端-服务中"}, notes = "") @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil getDriverNewOrder(HttpServletRequest request){ try { Integer uid = driverService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } String value = redisUtil.getValue("DRIVER_ORDER" + uid); return ResultUtil.success(value); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } } DriverZYTravel/guns-admin/src/main/resources/application.yml
@@ -55,8 +55,8 @@ datasource: url: jdbc:mysql://localhost:3306/zytravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 0KiwEhl6EnIFWNqB7d1FJLWKy9urjvMS # password: 123456 # password: 0KiwEhl6EnIFWNqB7d1FJLWKy9urjvMS password: 123456 db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat DriverZYTravel/guns-admin/src/test/sql/test.sql
File was deleted ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -289,7 +289,7 @@ t_server_carmodel as sc ON sc.id = ot.serverCarModelId <where> ot.isDelete = 1 AND ot.type = 1 AND ot.type = 1 and ot.state = 6 <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''"> AND (ot.insertTime BETWEEN CONCAT(#{beginTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')) </if> UserZYTravel/guns-admin/src/main/resources/application.yml
@@ -61,8 +61,8 @@ datasource: url: jdbc:mysql://localhost:3306/zytravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 0KiwEhl6EnIFWNqB7d1FJLWKy9urjvMS # password: 123456 # password: 0KiwEhl6EnIFWNqB7d1FJLWKy9urjvMS password: 123456 db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -1,8 +1,14 @@ //package com.stylefeng.guns; // //import com.baomidou.mybatisplus.mapper.EntityWrapper; //import com.stylefeng.guns.modular.system.model.AssignOrder; //import com.stylefeng.guns.modular.system.model.Company; //import com.stylefeng.guns.modular.system.service.IAssignOrderService; //import com.stylefeng.guns.modular.system.service.ICompanyCityService; //import com.stylefeng.guns.modular.system.util.RedisUtil; //import org.junit.Test; //import org.junit.runner.RunWith; //import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.boot.test.context.SpringBootTest; //import org.springframework.test.context.junit4.SpringRunner; // @@ -13,21 +19,20 @@ //@SpringBootTest //public class GunsApplicationTest { // // @Resource // private RedisUtil redisUtil; // @Autowired // private ICompanyCityService companyCityService; // // @Autowired // private IAssignOrderService assignOrderService; // // @Test // public void test(){ // boolean lock = redisUtil.lock("key_test", 10, 30); // if(lock){ // System.err.println("-----------------"); // try { // Company query = companyCityService.query("104.2350778537", "28.1113837348"); // AssignOrder assignOrder = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", query.getId()).eq("type", 1)); // System.err.println(assignOrder); // }catch (Exception e){ // e.printStackTrace(); // } //// redisUtil.unlock("key_test"); // lock = redisUtil.lock("key_test", 10, 30); // if(lock){ // System.err.println("!!!!!!!!!!!!!!!!!!!!"); // return; // } // System.err.println("*****************"); // } //}