From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 80 ++++++++++++++++------------------------
1 files changed, 32 insertions(+), 48 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index b4f6aa9..56870c6 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -1,16 +1,13 @@
package com.stylefeng.guns.modular.system.controller.specialTrain;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
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.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
-
-
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
@@ -19,18 +16,17 @@
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
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.Autowired;
import org.springframework.beans.factory.annotation.Value;
+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 javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
import java.util.*;
/**
@@ -59,23 +55,24 @@
@Autowired
private ITDriverService tDriverService;
-
+
@Autowired
private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
@Autowired
private ITUserService userService;
@Resource
private OrderCancelMapper orderCancelMapper;
-
+
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
-
- @Value("${filePath}")
- private String filePath;
-
-
-
-
+
+ @Resource
+ private MongoTemplate mongoTemplate;
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+
/**
* 跳转到快车订单首页
*/
@@ -83,7 +80,7 @@
public String index(Model model) {
//服务快车车型
List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
- model.addAttribute("carmodelList",carmodelList);
+ model.addAttribute("carmodelList", carmodelList);
return PREFIX + "tOrderPrivateCar.html";
}
@@ -133,58 +130,45 @@
Integer rideType) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),
- orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,rideType));
+ page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
+ orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType));
return super.packForBT(page);
}
-
+
private ResultUtil resultUtil;
-
+
/**
* 获取订单轨迹
+ *
* @param orderDetailId
* @return
*/
@ResponseBody
@RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
- public ResultUtil getOrderTrack(String orderDetailId){
- if(ToolUtil.isNotEmpty(orderDetailId)){
+ public ResultUtil getOrderTrack(Integer orderDetailId) {
+ if (ToolUtil.isNotEmpty(orderDetailId)) {
try {
-// List<TOrderPosition> list = tOrderPositionService.selectList(new EntityWrapper<TOrderPosition>().eq("orderType", 1).eq("orderId", orderDetailId).orderBy("insertTime"));
- /*if(list.size() == 0){
- return ResultUtil.error("该订单没有运行轨迹");
- }*/
- //将数据存储到文件中
- File file = new File(filePath + orderDetailId + "_1.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);
- }catch (Exception e){
+ Query query = new Query()
+ .addCriteria(Criteria.where("orderId").is(orderDetailId).and("orderType").is(1))
+ .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();
}
- }else {
+ } else {
resultUtil = ResultUtil.paranErr();
}
return resultUtil;
}
-
+
/**
* 取消快车订单
*/
--
Gitblit v1.7.1