java/IgoTravel.git

			@@ -27,7 +27,9 @@
			import org.springframework.web.bind.annotation.RestController;

			import javax.servlet.http.HttpServletRequest;
			import java.io.BufferedReader;
			import java.io.IOException;
			import java.io.InputStreamReader;
			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.util.*;
			@@ -119,9 +121,10 @@
			@ApiImplicitParam(value = "终点经纬度（103.23265,30.2312）", name = "endLonLat", required = true, paramType = "query", dataType = "string"),
			@ApiImplicitParam(value = "终点详细地址", name = "endAddress", required = true, paramType = "query", dataType = "string")
			})
			public ResultUtil queryPayMoney(Integer number, Integer type, String startLonLat, String endLonLat, String endAddress, Integer language){
			public ResultUtil queryPayMoney(Integer number, Integer type, String startLonLat, String endLonLat, String endAddress, Integer language, HttpServletRequest request){
			try {
			return orderLogisticsService.queryPayMoney(number, type, startLonLat, endLonLat, endAddress, language);
			Integer uid = userInfoService.getUserIdFormRedis(request);
			return orderLogisticsService.queryPayMoney(uid, number, type, startLonLat, endLonLat, endAddress, language);
			}catch (Exception e){
			e.printStackTrace();
			return ResultUtil.runErr();
			@@ -317,8 +320,12 @@
			@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
			})
			public ResultUtil<OrderTimeInfo> queryTimeInfo(Integer orderId, Integer language){
			public ResultUtil<OrderTimeInfo> queryTimeInfo(Integer orderId, Integer language, HttpServletRequest request){
			try {
			Integer uid = userInfoService.getUserIdFormRedis(request);
			if(null == uid) {
			return ResultUtil.tokenErr();
			}
			OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
			OrderTimeInfo orderTimeInfo = new OrderTimeInfo();
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			@@ -340,21 +347,22 @@
			usedTime = language == 1 ? h + "小时" + m + "分钟" : language == 2 ? h + "-hour" + m + "-minute(s)" : h + "-hour" + m + "-minute";
			}
			orderTimeInfo.setUsedTime(usedTime);
			String tripId = redisUtil.getValue("trip" + uid);
			if(null != orderLogistics.getEndServiceTime()){
			orderTimeInfo.setEndServiceTime(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getEndServiceTime())));
			}else{
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), orderLogistics.getEndLat(), orderLogistics.getEndLon());
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), orderLogistics.getEndLat(), orderLogistics.getEndLon(), tripId);
			Long duration = distancematrix.getDuration();
			orderTimeInfo.setEndServiceTime(DateUtil.conversionFormat(language, sdf.format(new Date(System.currentTimeMillis() + duration * 1000))));
			}
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), orderLogistics.getEndLat(), orderLogistics.getEndLon());
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), orderLogistics.getEndLat(), orderLogistics.getEndLon(), tripId);
			Long distance = distancematrix.getDistance();
			orderTimeInfo.setAllMileage(Double.valueOf(distance / 1000));
			orderTimeInfo.setMileage(orderLogistics.getMileage() / 1000);
			String value = redisUtil.getValue("DRIVER" + orderLogistics.getDriverId());
			if(ToolUtil.isNotEmpty(value)){
			String[] split = value.split(",");
			distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(split[1]), Double.valueOf(split[0]), orderLogistics.getEndLat(), orderLogistics.getEndLon());
			distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(split[1]), Double.valueOf(split[0]), orderLogistics.getEndLat(), orderLogistics.getEndLon(), tripId);
			//分钟
			Long duration = distancematrix.getDuration() / 60;
			h = Double.valueOf(duration / 60).intValue();
			@@ -398,13 +406,13 @@
			String text = "";
			switch (language){
			case 1:
			text = "您的包裹订单申请补差价 GSH " + difference + " 已被用户拒绝，请重新与用户协商";
			text = "您的包裹订单申请补差价 GHS " + difference + " 已被用户拒绝，请重新与用户协商";
			break;
			case 2:
			text = "Your delivery order,Request difference GSH " + difference + " was rejected, please renegotiate with the subscriber";
			text = "Your delivery order,Request difference GHS " + difference + " was rejected, please renegotiate with the subscriber";
			break;
			case 3:
			text = "Votre commande de livraison,Demande de différence GSH " + difference + " a été rejeté, veuillez renégocier avec l’abonné";
			text = "Votre commande de livraison,Demande de différence GHS " + difference + " a été rejeté, veuillez renégocier avec l’abonné";
			break;

			}
			@@ -418,14 +426,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);
			} 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);
			// 读取命令的输出
			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);