ManagementOKTravel/guns-admin/pom.xml
@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>guns-admin</artifactId> <artifactId>management</artifactId> <name>guns-admin</name> <description>guns 的spring boot版本</description> <parent> ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.google.gson.Gson; import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.common.constant.factory.PageFactory; import com.stylefeng.guns.core.log.LogObjectHolder; import com.stylefeng.guns.core.shiro.ShiroKit; import com.stylefeng.guns.core.util.DateUtil; import com.stylefeng.guns.core.util.ExcelExportUtil; @@ -15,13 +15,12 @@ import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.util.CollectionUtils; 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 javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -40,50 +39,37 @@ @RequestMapping("/tOrderTaxi") public class TOrderTaxiController extends BaseController { public static List<Integer> orderIds = new ArrayList<>(); private String PREFIX = "/system/tOrderTaxi/"; @Autowired private ITOrderTaxiService tOrderTaxiService; @Autowired private ITPubTransactionDetailsService pubTransactionDetailsService; @Autowired private ITOrderPositionService tOrderPositionService; @Autowired private ITDriverService tDriverService; @Autowired private GDMapElectricFenceUtil gdMapElectricFenceUtil; @Autowired private GDMapGeocodingUtil gdMapGeocodingUtil; @Autowired private ITUserService itUserService; @Autowired private PushUtil pushUtil; @Autowired private ITCompanyCityService companyCityService; @Autowired private ITSysPushOrderService pushOrderService; @Autowired private RedisUtil redisUtil; @Autowired private ITDriverService driverService; @Autowired private ITSystemNoticeService systemNoticeService; public static List<Integer> orderIds = new ArrayList<>(); @Value("${filePath}") private String filePath; private ResultUtil resultUtil; /** * 跳转到出租车订单首页 @@ -157,6 +143,7 @@ map.put("lat",tOrderPosition.getLat()); maps.add(map); } // resultUtil = ResultUtil.success(list); // 将maps转化为jsonArray字符串 // 使用 Gson 转换为 JSON 字符串 @@ -225,7 +212,7 @@ } return PREFIX + "tOrderTaxi_trajectory.html"; } /** * 获取出租车订单列表 */ @@ -251,7 +238,6 @@ page.setRecords(tOrderTaxiService.getTaxiOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,driver,state)); return super.packForBT(page); } /** * 导出订单 @@ -468,8 +454,7 @@ e.printStackTrace(); } } /** * 选择司机列表 */ @@ -483,8 +468,6 @@ page.setRecords(tOrderTaxiService.getCanSelectTaxiDriverList(page,tOrderTaxi.getCompanyId(),name,phone)); return super.packForBT(page); } private ResultUtil resultUtil; /** * 获取订单轨迹 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
@@ -49,8 +49,8 @@ <div class="ibox float-e-margins"> <div class="ibox-content"> <div class="form-horizontal"> <input type="hidden" id="id" name="id" value="${item.id}"> <input type="hidden" id="guiji" name="guiji" value="${guiji}"> <input id="id" name="id" type="hidden" value="${item.id}"> <input id="guiji" name="guiji" type="hidden" value="${guiji}"> <div class="row" style="margin-top: 30px;"> <div class="col-sm-4"> <h2 class="h3Class" style="font-weight: 700;">订单详情</h2> @@ -113,10 +113,10 @@ <div class="input-card" style="margin-left: 50px;"> <h4>轨迹回放控制</h4> <div class="input-item"> <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/> <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/> <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/> <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/> <input class="btn" id="start" onclick="startAnimation()" type="button" value="开始动画"/> <input class="btn" id="pause" onclick="pauseAnimation()" type="button" value="暂停动画"/> <input class="btn" id="resume" onclick="resumeAnimation()" type="button" value="继续动画"/> <input class="btn" id="stop" onclick="stopAnimation()" type="button" value="停止动画"/> </div> <div class="input-item"> @@ -128,11 +128,11 @@ </div> </div> </div> <script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=t5pcBZB5G4D11G9MzHq8Kik7jqzlTrAL"></script> <script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=t5pcBZB5G4D11G9MzHq8Kik7jqzlTrAL" type="text/javascript"></script> <script src="${ctxPath}/static/js/track1.js"></script> <script src="${ctxPath}/static/js/track2.js"></script> <script src="${ctxPath}/static/js/track3.js"></script> <script type="text/javascript" src="//mapopen-pub-jsapi.bj.bcebos.com/jsapiGlgeo/track.js"></script> <script src="//mapopen-pub-jsapi.bj.bcebos.com/jsapiGlgeo/track.js" type="text/javascript"></script> <script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script> <script> var temp = "${guiji}"
