From 13d2bd6a27f941cfd8f096a7ae2def858a565363 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:01:34 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java | 41 ++++++-----------------------------------
1 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java
index 5a6223c..3449240 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.service.impl;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.CharsetUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -8,9 +10,6 @@
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.service.IOrderPositionService;
import com.stylefeng.guns.modular.system.service.IOrderService;
-import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
-import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
-import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -20,7 +19,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
@Service
@@ -32,14 +30,8 @@
@Autowired
private IOrderService orderService;
- @Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
@Value("${filePath}")
private String filePath;
-
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
@@ -63,24 +55,10 @@
file.createNewFile();
}
//写入相应的文件
- PrintWriter out = new PrintWriter(new FileWriter(file));
orderPositions.add(orderPosition);
System.err.println("存储新数据：" + JSON.toJSONString(orderPositions));
- out.write(JSON.toJSONString(orderPositions));
- out.flush();
- out.close();
+ FileUtil.writeUtf8String(JSON.toJSONString(orderPositions), file);
}
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport && orderPosition.getOrderType() == 1){//上传数据
- pushMinistryOfTransportUtil.positionDriver(orderPosition.getOrderId());
- pushMinistryOfTransportUtil.positionVehicle(orderPosition.getOrderId());
- }
- }
- }).start();
-
}
@@ -113,18 +91,11 @@
return 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);
- }
+ String s = FileUtil.readString(file, CharsetUtil.CHARSET_UTF_8);
List<OrderPosition> list = new ArrayList<>();
- if(ToolUtil.isNotEmpty(sb.toString())){
- list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
+ if(ToolUtil.isNotEmpty(s)){
+ list = JSONArray.parseArray(s, OrderPosition.class);
}
- System.err.println("坐标：" + sb);
return list;
}
}
--
Gitblit v1.7.1