ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -434,9 +434,23 @@ @ResponseBody @PostMapping("/getAllOrder") public Object getAllOrder(){ List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(new EntityWrapper<TOrderTaxi>().eq("isDelete", 1)); List<TOrderPrivateCar> tOrderTaxis = itOrderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>().eq("isDelete", 1).in("state", Arrays.asList(6, 7, 8, 9))); List<TOrderCrossCity> tOrderTaxis1 = itOrderCrossCityService.selectList(new EntityWrapper<TOrderCrossCity>().eq("isDelete", 1).in("state", Arrays.asList(6, 7, 8, 9))); List<TOrderLogistics> tOrderTaxis2 = itOrderLogisticsService.selectList(new EntityWrapper<TOrderLogistics>().eq("isDelete", 1).in("state", Arrays.asList(6))); List list = new ArrayList<>(); for(TOrderTaxi t : tOrderTaxis){ for(TOrderPrivateCar t : tOrderTaxis){ Map<String, Object> map = new HashMap<>(); map.put("lon", t.getStartLon()); map.put("lat", t.getStartLat()); list.add(map); } for(TOrderCrossCity t : tOrderTaxis1){ Map<String, Object> map = new HashMap<>(); map.put("lon", t.getStartLon()); map.put("lat", t.getStartLat()); list.add(map); } for(TOrderLogistics t : tOrderTaxis2){ Map<String, Object> map = new HashMap<>(); map.put("lon", t.getStartLon()); map.put("lat", t.getStartLat()); ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
@@ -23,7 +23,7 @@ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/> <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/> <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/> <#label id="passengersPhone" name="收货人手机号" value="${item.passengersPhone}"/> <#label id="passengersPhone" name="收货人手机号" value="${item.recipientPhone}"/> <#label id="endAddress" name="终点" value="${item.endAddress}"/> <#label id="car" name="接单车辆" value="${item.car}"/> <#label id="cargoNumber" name="物品数量" value="${item.cargoNumber}"/> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html
@@ -3,6 +3,7 @@ <div class="ibox-content"> <div class="form-horizontal" id="siteInfoForm"> <input type="hidden" id="id" name="id" value="${item.id}"> <input type="hidden" id="locationList1" name="locationList1" value='${locationList1}'> <div class="row"> <div class="col-sm-12"> <div class=""> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html
@@ -9,10 +9,10 @@ <div class="form-group"> <label class="col-sm-3 control-label">端口类型：</label> <div class="col-sm-9" style="display: flex;align-items: center;"> <div class="radio radio-info radio-inline"> <input type="radio" id="type1" value="1" name="type" checked="" > <label for="type1"> 用户端 </label> </div> <!-- <div class="radio radio-info radio-inline">--> <!-- <input type="radio" id="type1" value="1" name="type" checked="" >--> <!-- <label for="type1"> 用户端 </label>--> <!-- </div>--> <div class="radio radio-success radio-inline"> <input type="radio" id="type2" value="2" name="type" > <label for="type2"> 司机端 </label> ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tSite/electricFence.js
@@ -1,15 +1,59 @@ var map = new AMap.Map('container',{ resizeEnable: true, zoom:10 zoom:15 }); setCenterCoordinate(); function setCenterCoordinate() { var locationsStr = $("#locationList1").val(); if ("" != locationsStr && null != locationsStr) { var locations = JSON.parse(locationsStr); var gid = locations[0].coordinate; var path = convertData(gid); var center = path[0]; map.setCenter(center) } } function setElectricFence() { var locationsStr = $("#locationList1").val(); if ("" != locationsStr && null != locationsStr) { var locations = JSON.parse(locationsStr); for (let i = 0; i < locations.length; i++) { console.log(locations[i]) var gid = locations[i].coordinate if (gid == null || gid == "") { continue; } var path = convertData(gid) var polygon = new AMap.Polygon({ path: path, strokeWeight: 1, fillOpacity: 0.4, fillColor: '#00b0ff', strokeColor: '#80d8ff' }); map.add(polygon); } } } function convertData(data) { var coordinates = data.split(';'); var path = []; for (var i = 0; i < coordinates.length; i++) { var coordinate = coordinates[i].split(','); var lng = parseFloat(coordinate[0]); var lat = parseFloat(coordinate[1]); path.push([lng, lat]); } return path; } var value = ""; map.getCity( callback=function (result) { value = result.city; drawBounds(); } callback=function (result) { value = result.city; drawBounds(); } ); @@ -28,7 +72,7 @@ mouseTool.on('draw',function(e){ overlays.push(e.obj); console.log(e.obj.getPath()); switch (name) { case 'polyline':{//折线图 var polyline = e.obj.getPath(); @@ -51,6 +95,10 @@ case 'circle':{//圆形 var center = e.obj.getCenter(); var radius = e.obj.getRadius(); if(radius > 5000){ Feng.error("创建电子围栏失败，圆半径不能大于5000米"); return; } coordinate += center.lng + ',' + center.lat + ';' + radius + "_"; objs.circle.push(e.obj); break; @@ -66,7 +114,7 @@ if(value == ''){ value = '北京市'; } //加载行政区划插件 if(!district){ //实例化DistrictSearch @@ -216,7 +264,7 @@ return; } coordinate = coordinate.substring(0, coordinate.length - 1); } function editAll() { @@ -229,15 +277,15 @@ polyEditor.on('addnode', function(event) { // log.info('触发事件：addnode') }) polyEditor.on('adjust', function(event) { // log.info('触发事件：adjust') }) polyEditor.on('removenode', function(event) { // log.info('触发事件：removenode') }) polyEditor.on('end', function(e) { var polyline = e.target.getPath(); getCoordinate(polyline); @@ -245,24 +293,24 @@ editors.push(polyEditor); polyEditor.open(); } //多边形 for(var i in objs.polygon){ var polygon = objs.polygon[i]; var polyEditor = new AMap.PolyEditor(map, polygon) polyEditor.on('addnode', function(event) { // log.info('触发事件：addnode') }) polyEditor.on('adjust', function(event) { // log.info('触发事件：adjust') }) polyEditor.on('removenode', function(event) { // log.info('触发事件：removenode') }) polyEditor.on('end', function(e) { var polygon = e.target.getPath(); getCoordinate(polygon); @@ -270,17 +318,17 @@ editors.push(polyEditor); polyEditor.open(); } //矩形 for(var i in objs.rectangle){ var rectangle = objs.rectangle[i]; var rectangleEditor = new AMap.RectangleEditor(map, rectangle) rectangleEditor.on('adjust', function(event) { // log.info('触发事件：adjust') }) rectangleEditor.on('end', function(e) { var polygon = e.target.getPath(); getCoordinate(polygon); @@ -288,20 +336,24 @@ editors.push(rectangleEditor); rectangleEditor.open(); } //圆形 for(var i in objs.circle){ var circle = objs.circle[i]; var circleEditor = new AMap.CircleEditor(map, circle) circleEditor.on('move', function(event) { // log.info('触发事件：move') }) circleEditor.on('adjust', function(e) { var radius = e.target.getRadius(); if(radius > 5000){ Feng.error("创建电子围栏失败，圆半径不能大于5000米"); return; } }) circleEditor.on('end', function(e) { var center = e.target.getCenter(); var radius = e.target.getRadius(); @@ -318,4 +370,7 @@ var editor = editors[i]; editor.close(); } } } $(function () { setElectricFence() }) UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount2Mapper.xml
@@ -8,6 +8,6 @@ <select id="query" resultType="com.stylefeng.guns.modular.system.model.UserActivityDiscount2"> select a.* from t_user_activity_discount2 a left join t_user_activity b on (a.userActivityId = b.id) where a.lineId = #{lineId} and a.now() between startTime and endTime and a.enable = 2 and b.`status` = 3 order by b.insertTime desc limit 1 where a.lineId = #{lineId} and now() between a.startTime and a.endTime and a.enable = 2 and b.`status` = 3 order by b.insertTime desc limit 1 </select> </mapper>
