From 7477b1e8cbe8d656452c5a79cc1b46b2285ff4ed Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 十月 2025 18:22:22 +0800
Subject: [PATCH] 添加日志记录
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 33 ++++++++++++++--
/dev/null | 35 -----------------
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 2
UserZYTravel/guns-admin/src/main/resources/application.yml | 4 +-
UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 29 ++++++++------
DriverZYTravel/guns-admin/src/main/resources/application.yml | 4 +-
6 files changed, 51 insertions(+), 56 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 22ef996..c3dd4bb 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/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();
+ }
+ }
+
+
+
+
}
diff --git a/DriverZYTravel/guns-admin/src/main/resources/application.yml b/DriverZYTravel/guns-admin/src/main/resources/application.yml
index 01738fd..af0c066 100644
--- a/DriverZYTravel/guns-admin/src/main/resources/application.yml
+++ b/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
diff --git a/DriverZYTravel/guns-admin/src/test/sql/test.sql b/DriverZYTravel/guns-admin/src/test/sql/test.sql
deleted file mode 100644
index 04b15ca..0000000
--- a/DriverZYTravel/guns-admin/src/test/sql/test.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server : localhost
- Source Server Type : MySQL
- Source Server Version : 50719
- Source Host : localhost:3306
- Source Schema : guns
-
- Target Server Type : MySQL
- Target Server Version : 50719
- File Encoding : 65001
-
- Date: 10/07/2018 14:09:19
-*/
-
-DROP DATABASE IF EXISTS guns_test;
-CREATE DATABASE IF NOT EXISTS guns_test DEFAULT CHARSET utf8 COLLATE utf8_general_ci;
-
-use guns_test;
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for test
--- ----------------------------
-DROP TABLE IF EXISTS `test`;
-CREATE TABLE `test` (
- `aaa` int(11) NOT NULL AUTO_INCREMENT,
- `bbb` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`aaa`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
-SET FOREIGN_KEY_CHECKS = 1;
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index 4ed18c9..ec681d9 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/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>
diff --git a/UserZYTravel/guns-admin/src/main/resources/application.yml b/UserZYTravel/guns-admin/src/main/resources/application.yml
index 82e8cd3..e47b5c0 100644
--- a/UserZYTravel/guns-admin/src/main/resources/application.yml
+++ b/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
diff --git a/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index df95ef0..1c98e23 100644
--- a/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/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("*****************");
// }
//}
--
Gitblit v1.7.1