java/IgoTravel.git

			@@ -2,6 +2,7 @@

			import com.alibaba.fastjson.JSON;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.mchange.util.FailSuppressedMessageLogger;
			import com.stylefeng.guns.core.util.ToolUtil;
			import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
			import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
			@@ -22,14 +23,20 @@
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.util.StringUtils;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import java.io.BufferedReader;
			import java.io.IOException;
			import java.io.InputStream;
			import java.io.InputStreamReader;
			import java.text.SimpleDateFormat;
			import java.util.*;

			@@ -41,6 +48,8 @@
			@RestController
			@RequestMapping("")
			public class DriverController {

			private Logger log = LoggerFactory.getLogger(DriverController.class);

			@Autowired
			private IDriverService driverService;
			@@ -95,6 +104,9 @@

			@Autowired
			private FleetEngineUtil fleetEngineUtil;

			@Autowired
			private IOrderCancelService orderCancelService;



			@@ -1274,6 +1286,7 @@
			continue;
			}
			List<Income> incomes3 = incomeService.queryData(1, null, 2, orderLogistics.getId(), 4);
			map1.put("travelMoney", orderLogistics != null ? orderLogistics.getOrderMoney() : 0);//行程费
			map1.put("parkMoney", orderLogistics != null ? orderLogistics.getParkMoney() : 0);//停车费
			map1.put("tipMoney", 0);//小费
			map1.put("roadTollMoney", orderLogistics != null ? orderLogistics.getRoadTollMoney() : 0);//过路费
			@@ -1286,9 +1299,9 @@
			}
			List<Income> incomes4 = incomeService.queryData(1, null, 2, orderLogistics1.getId(), 5);
			map1.put("travelMoney", orderLogistics1 != null ? orderLogistics1.getOrderMoney() : 0);//行程费
			map1.put("parkMoney", 0);//停车费
			map1.put("parkMoney", orderLogistics1 != null ? orderLogistics1.getParkMoney() : 0);//停车费
			map1.put("tipMoney", 0);//小费
			map1.put("roadTollMoney", 0);//过路费
			map1.put("roadTollMoney", orderLogistics1 != null ? orderLogistics1.getRoadTollMoney() : 0);//过路费
			map1.put("rakeMoney", incomes4.size() > 0 ? incomes4.get(0).getMoney() : 0);//抽成
			break;
			}
			@@ -1316,6 +1329,10 @@
			baseWarpper.setName(language == 1 ? "取消订单费用" : language == 2 ? "Cancellation fee" : "Frais d'annulation");
			List<Income> incomes = incomeService.queryData(1, 1, 3, Integer.valueOf(map.get("incomeId").toString()), Integer.valueOf(map.get("orderType").toString()));
			Map<String, Object> map1 = new HashMap<>();

			OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>().eq("orderType", map.get("orderType"))
			.eq("orderId", map.get("incomeId")).eq("state", 2));
			map1.put("travelMoney", orderCancel.getMoney());//支付金额
			map1.put("rakeMoney", incomes.size() > 0 ? incomes.get(0).getMoney() : 0);//抽成
			baseWarpper.setData(map1);
			}
			@@ -1470,7 +1487,7 @@
			return ResultUtil.tokenErr();
			}
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
			List<ActivityWarpper> activityWarppers = driverService.queryMyActivity(uid, sdf.parse(time), language);
			List<ActivityWarpper> activityWarppers = driverService.queryHistoryList(uid, sdf.parse(time), language);
			return ResultUtil.success(activityWarppers);
			}catch (Exception e){
			e.printStackTrace();
			@@ -1760,6 +1777,9 @@
			if(null == uid){
			return ResultUtil.tokenErr();
			}
			if(!StringUtils.hasLength(vehicleId)){
			return ResultUtil.paranErr();
			}
			Map<String, Object> s = fleetEngineUtil.fleetEngineAuth(2, vehicleId);
			return ResultUtil.success(s);
			}catch (Exception e){
			@@ -1786,14 +1806,21 @@
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			Process process = null;
			try {
			process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName + ".mp3");
			} catch (IOException e) {
			throw new RuntimeException(e);
			}
			if (process != null) {
			process.destroy();
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName + ".mp3");
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			@@ -1817,4 +1844,29 @@
			throw new RuntimeException(e);
			}
			}



			/**
			* 短信回调通知
			* @param request
			*/
			@ResponseBody
			@PostMapping("/base/sendCellulantMessageCallback")
			public void sendCellulantMessageCallback(HttpServletRequest request){
			try {
			StringBuilder sb = new StringBuilder();
			InputStream inputStream = request.getInputStream();
			String s;
			BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
			while ((s = in.readLine()) != null) {
			sb.append(s);
			}
			in.close();
			inputStream.close();
			log.info("短信通知回调：" + sb.toString());
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}