From c35ea17d309300dc41bc042a07c33c14bda43705 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 21 七月 2025 15:28:55 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 88 ++++++++++++++++++++-----------------------
1 files changed, 41 insertions(+), 47 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
index adbb5be..c7d26e2 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -1,34 +1,33 @@
package com.stylefeng.guns.modular.system.controller.taxi;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TOrderPosition;
+import com.stylefeng.guns.modular.system.model.TOrderTaxi;
import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.ui.Model;
import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
-import com.stylefeng.guns.modular.system.model.TOrderTaxi;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -40,27 +39,30 @@
@Controller
@RequestMapping("/tOrderTaxi")
public class TOrderTaxiController extends BaseController {
-
+
private String PREFIX = "/system/tOrderTaxi/";
-
+
@Autowired
private ITOrderTaxiService tOrderTaxiService;
-
+
@Autowired
private ITOrderPrivateCarService tOrderPrivateCarService;
-
+
@Autowired
private ITOrderPositionService tOrderPositionService;
-
+
@Autowired
private ITDriverService tDriverService;
-
+
@Autowired
private ITUserService userService;
-
- @Value("${filePath}")
- private String filePath;
-
+
+ @Resource
+ private MongoTemplate mongoTemplate;
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到出租车订单首页
*/
@@ -68,7 +70,7 @@
public String index() {
return PREFIX + "tOrderTaxi.html";
}
-
+
/**
* 跳转到添加出租车订单
*/
@@ -76,7 +78,7 @@
public String tOrderTaxiAdd() {
return PREFIX + "tOrderTaxi_add.html";
}
-
+
/**
* 跳转到修改出租车订单
*/
@@ -148,7 +150,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state));
+ page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state));
return super.packForBT(page);
}
@@ -167,7 +169,7 @@
}
private ResultUtil resultUtil;
-
+
/**
* 获取订单轨迹
*
@@ -176,28 +178,14 @@
*/
@ResponseBody
@RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
- public ResultUtil getOrderTrack(String orderDetailId) {
+ public ResultUtil getOrderTrack(Integer orderDetailId) {
if (ToolUtil.isNotEmpty(orderDetailId)) {
try {
-// List<TOrderPosition> list = tOrderPositionService.selectList(new EntityWrapper<TOrderPosition>().eq("orderType", 2).eq("orderId", orderDetailId).orderBy("insertTime"));
- /*if(list.size() == 0){
- return ResultUtil.error("该订单没有运行轨迹");
- }*/
- //将数据存储到文件中
- File file = new File(filePath + orderDetailId + "_2.txt");
- if (!file.exists()) {
- return ResultUtil.success(new ArrayList<>());
- }
- //读取文件(字符流)
- BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
- //循环取出数据
- String str = null;
- StringBuffer sb = new StringBuffer();
- while ((str = in.readLine()) != null) {
- sb.append(str);
- }
- List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
- resultUtil = ResultUtil.success(list);
+ Query query = new Query()
+ .addCriteria(Criteria.where("orderId").is(orderDetailId).and("orderType").is(2))
+ .with(new Sort(Sort.Direction.ASC, "insertTime"));
+ List<TOrderPosition> positions = mongoTemplate.find(query, TOrderPosition.class);
+ resultUtil = ResultUtil.success(positions);
} catch (Exception e) {
e.printStackTrace();
resultUtil = ResultUtil.runErr();
@@ -288,6 +276,12 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TOrderTaxi tOrderTaxi) {
+ if (ToolUtil.isEmpty(tOrderTaxi.getStartLat()) || ToolUtil.isEmpty(tOrderTaxi.getStartLon())) {
+ return "请选择有效的上车地点";
+ }
+ if (ToolUtil.isEmpty(tOrderTaxi.getEndLat()) || ToolUtil.isEmpty(tOrderTaxi.getEndLon())) {
+ return "请选择有效的下车地点";
+ }
TUser user = userService.selectOne(new EntityWrapper<TUser>().eq("phone", tOrderTaxi.getPassengersPhone()));
if (ToolUtil.isNotEmpty(user)) {/// 用户是平台用户
tOrderTaxi.setOrderNum("TAXI" + String.valueOf(1000000 + tOrderTaxiService.selectList(null).size() + 1).substring(1));
@@ -321,7 +315,7 @@
tUser.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
tUser.setPhone(tOrderTaxi.getPassengersPhone());
tUser.setName(tOrderTaxi.getPassengers());
- tUser.setNickName("JYX" + String.valueOf(1000000 + userService.selectList(null).size() + 1).substring(1));
+ tUser.setNickName("GRJY" + String.valueOf(1000000 + userService.selectList(null).size() + 1).substring(1));
userService.insert(tUser);
/// 存入订单信息
--
Gitblit v1.7.1