Merge remote-tracking branch 'origin/master'

luodangjia

2024-06-05 7b055971157b91bf1f0de03c1332965a7b161735

Merge remote-tracking branch 'origin/master'

 ManagementNTTravel/guns-admin/pom.xml

@@ -26,6 +26,12 @@
        </dependency>-->

        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>
            <version>5.3.9</version>
        </dependency>

        <dependency>
            <groupId>com.stylefeng</groupId>
            <artifactId>guns-core</artifactId>
        </dependency>

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java

@@ -145,8 +145,8 @@
        activityGeneralizationService.insert(tActivityGeneralization);

        // 生成二维码，上传到服务器
        MyQrCodeUtil.createCodeToFile("https://www.baidu.com?id=" + tActivityGeneralization.getId());
        BufferedImage qrCodeImage = QRCodeUtil.createImage("https://www.baidu.com?id=" + tActivityGeneralization.getId());
        MyQrCodeUtil.createCodeToFile("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
        BufferedImage qrCodeImage = QRCodeUtil.createImage("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
        MultipartFile qrCodeFile = convert(qrCodeImage, new Date().getTime()+ UUIDUtil.getRandomCode(3)+".PNG");
        String picture = OssUploadUtil.ossUpload(qrCodeFile);
        System.err.println("二维码："+ picture);

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java

@@ -243,6 +243,8 @@
                businessType = 5;
            }else if ("包车".equals(type)){
                businessType = 6;
            }else if ("接送机".equals(type)){
                businessType = 7;
            }
            business.setBusinessType(businessType);
            business.setSort(jsonObject.getInteger("sort"));

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java

@@ -70,12 +70,12 @@
            page.setRecords(null);
        }else{
            List<Map<String, Object>> charterCarOrderList = tOrderCharteredCarService.getCharterCarOrderList(page, beginTime, endTime, userName, contactPerson, contactPhone, modelUse, state, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId());
            for(Map<String, Object> map : charterCarOrderList){
                String[] prices = map.get("price").toString().split("-");
                String p = Double.valueOf(prices[0]) * Integer.valueOf(map.get("peopleNumber").toString()) + "-" + Double.valueOf(prices[1]) * Integer.valueOf(map.get("peopleNumber").toString());
                map.put("price", p);

            }
//            for(Map<String, Object> map : charterCarOrderList){
//                String[] prices = map.get("price").toString().split("-");
//                String p = Double.valueOf(prices[0]) * Integer.valueOf(map.get("peopleNumber").toString()) + "-" + Double.valueOf(prices[1]) * Integer.valueOf(map.get("peopleNumber").toString());
//                map.put("price", p);
//
//            }
            page.setRecords(charterCarOrderList);
        }
        return super.packForBT(page);

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java

@@ -28,6 +28,9 @@
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

@@ -87,7 +90,7 @@
     * 跳转到查看跨城出行订单详情页面
     */
    @RequestMapping("/tOrderCrossCity_detail/{tOrderCrossCityId}")
    public String tOrderCrossCityUpdate(@PathVariable Integer tOrderCrossCityId, Model model) {
    public String tOrderCrossCityUpdate(@PathVariable Integer tOrderCrossCityId, Model model) throws ParseException {
        Map<String, Object> item = tOrderCrossCityService.getCrossCityOrderDetailById(tOrderCrossCityId);
        model.addAttribute("item",item);
        List<OrderFrequentPassengers> orderFrequentPassengers = orderFrequentPassengersService.selectList(new EntityWrapper<OrderFrequentPassengers>().eq("orderType", 3).eq("orderId", tOrderCrossCityId));
@@ -97,6 +100,19 @@
            frequentPassengers = frequentPassengersService.selectBatchIds(collect);
        }
        model.addAttribute("frequentPassengers",frequentPassengers);
        if(Objects.nonNull(item.get("routeRecord"))){
            List<String> routeRecordList = Arrays.asList(item.get("routeRecord").toString().split(","));
            model.addAttribute("routeRecordList",routeRecordList);
        }
        if(Objects.nonNull(item.get("routeRecord")) && Objects.nonNull(item.get("recordTime"))){
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            LocalDateTime recordTime = DateUtil.dateToLocalDateTime(format.parse(item.get("recordTime").toString()));
            if(LocalDateTime.now().isBefore(recordTime.plusMonths(1))){
                model.addAttribute("recordState",1);
            }else {
                model.addAttribute("recordState",2);
            }
        }
        return PREFIX + "tOrderCrossCity_detail.html";
    }


 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -11,10 +11,7 @@
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +24,9 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;

/**
@@ -83,9 +83,22 @@
     * 跳转到修改专车订单
     */
    @RequestMapping("/tOrderPrivateCar_orderDetail/{tOrderPrivateCarId}")
    public String tOrderPrivateCarUpdate(@PathVariable Integer tOrderPrivateCarId, Model model) {
    public String tOrderPrivateCarUpdate(@PathVariable Integer tOrderPrivateCarId, Model model) throws ParseException {
        Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId);
        model.addAttribute("item",item);
        if(Objects.nonNull(item.get("routeRecord"))){
            List<String> routeRecordList = Arrays.asList(item.get("routeRecord").toString().split(","));
            model.addAttribute("routeRecordList",routeRecordList);
        }
        if(Objects.nonNull(item.get("routeRecord")) && Objects.nonNull(item.get("recordTime"))){
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            LocalDateTime recordTime = DateUtil.dateToLocalDateTime(format.parse(item.get("recordTime").toString()));
            if(LocalDateTime.now().isBefore(recordTime.plusMonths(1))){
                model.addAttribute("recordState",1);
            }else {
                model.addAttribute("recordState",2);
            }
        }
        return PREFIX + "tOrderPrivateCar_orderDetail.html";
    }


 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderTransferController.java

@@ -14,10 +14,7 @@
import com.stylefeng.guns.modular.system.service.ITOrderPositionService;
import com.stylefeng.guns.modular.system.service.ITOrderTransferService;
import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
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;
@@ -29,6 +26,9 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;

/**
@@ -85,9 +85,22 @@
     * 跳转到修改接送机订单
     */
    @RequestMapping("/tOrderTransfer_orderDetail/{tOrderTransferId}")
    public String tOrderTransferUpdate(@PathVariable Integer tOrderTransferId, Model model) {
    public String tOrderTransferUpdate(@PathVariable Integer tOrderTransferId, Model model) throws ParseException {
        Map<String, Object> item = tOrderTransferService.getTransferOrderDetailById(tOrderTransferId);
        model.addAttribute("item",item);
        if(Objects.nonNull(item.get("routeRecord"))){
            List<String> routeRecordList = Arrays.asList(item.get("routeRecord").toString().split(","));
            model.addAttribute("routeRecordList",routeRecordList);
        }
        if(Objects.nonNull(item.get("routeRecord")) && Objects.nonNull(item.get("recordTime"))){
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            LocalDateTime recordTime = DateUtil.dateToLocalDateTime(format.parse(item.get("recordTime").toString()));
            if(LocalDateTime.now().isBefore(recordTime.plusMonths(1))){
                model.addAttribute("recordState",1);
            }else {
                model.addAttribute("recordState",2);
            }
        }
        return PREFIX + "tOrderTransfer_orderDetail.html";
    }


 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml

@@ -35,6 +35,7 @@
        when businessType = 4 then '同城小件物流'
        when businessType = 5 then '跨城小件物流'
        when businessType = 6 then '包车'
        when businessType = 7 then '接送机'
        else '' end),' ：',sort)) as str,openCityId from t_open_city_business where flag != 3 GROUP BY openCityId
        ) as ocb on ocb.openCityId = oc.id) as o
        <where>
@@ -58,7 +59,8 @@
        when bb.businessType = 4 then '同城小件物流'
        when bb.businessType = 5 then '跨城小件物流'
        when bb.businessType = 6 then '包车'
        else '' end as businessTypeStr,bb.*
             when bb.businessType = 7 then '接送机'
             else '' end as businessTypeStr,bb.*
        FROM t_open_city_business as bb where bb.openCityId = #{openCityId} and bb.flag != 3
    </select>


 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java

@@ -5,10 +5,9 @@

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.TimeZone;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.*;

/**
 * <h3>处理时间的工具类</h3>
@@ -1120,8 +1119,32 @@

        return defaultStartDate + "," + defaultEndDate;
    }
	
	

    /**
     * 获取指定日期字符串的LocalDateTime
     * String转LocalDateTime
     *
     * @param time 日期字符串
     * @return 结果LocalDateTime
     */
    public static LocalDateTime getLocalDateTime(String time) {
        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
        LocalDate localDate = LocalDate.parse(time, dateTimeFormatter);
        Date date = Date.from(localDate.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
        return date.toInstant().atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
    }

    /**
     * Date转为LocalDateTime
     *
     * @param date 日期
     * @return LocalDateTime
     */
    public static LocalDateTime dateToLocalDateTime(Date date) {
        Instant instant = date.toInstant();
        ZoneId zoneId = ZoneId.systemDefault();
        return instant.atZone(zoneId).toLocalDateTime();
    }
    
    public static void main(String[] args) throws ParseException {
        System.out.println(getDay());

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html

@@ -6,7 +6,7 @@
    <meta name="renderer" content="webkit"/><!-- 让360浏览器默认选择webkit内核 -->

    <!--地图-->
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
    <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->

    <!-- 全局css -->

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html

@@ -256,8 +256,8 @@
        </div>
    </div>
</div>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.MouseTool"></script>
<script type="text/javascript" src='https://a.amap.com/jsapi_demos/static/citys.js'></script>
<script src="${ctxPath}/static/home.js"></script>
<script src="${ctxPath}/static/js/jquery.sparkline 2.1.2.js"></script>

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/addHtml.html

@@ -25,12 +25,15 @@
                                </div>
                            </div>
                            <div class="initialLevel col-sm-6 control-label form-group"  >
                                <div class="initialLevel col-sm-2 control-label form-group"  >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <label class="control-label" >最多可参与人数:</label>
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <input id="participateCount" name="participateCount" type="number" max="1000000" min="1" class="form-control" style="height: 30px;width: 300px" placeholder="请输入最多可参与人数" required="required">
                                </div>
                                <div class="initialLevel col-sm-4 control-label form-group"  >
                                    <label class="control-label" >【注：不填表示无上限】</label>
                                </div>
                            </div>
                        </div>


 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html

@@ -1,6 +1,4 @@
@layout("/common/_container.html"){
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>

<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="openCityForm">
@@ -34,6 +32,7 @@
                                <!--<option value="4">跨城小件物流</option>-->
                                <!--<option value="5">同城小件物流</option>-->
                                <option value="6">包车</option>
                                <option value="7">接送机</option>
                            </select>
                        </div>
                        <div class="col-sm-3" >
@@ -126,4 +125,10 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
<script>
    window._AMapSecurityConfig = {
        securityJsCode:'58f0e656d02373943498c93ccb11b02f',
    };
</script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html

@@ -1,5 +1,4 @@
@layout("/common/_container.html"){
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="openCityForm">
@@ -40,6 +39,7 @@
                                <!--<option value="4">跨城小件物流</option>-->
                                <!--<option value="5">同城小件物流</option>-->
                                <option value="6">包车</option>
                                <option value="7">接送机</option>
                            </select>
                        </div>
                        <div class="col-sm-3" >
@@ -153,4 +153,10 @@
    </div>
</div>
<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
<script>
    window._AMapSecurityConfig = {
        securityJsCode:'58f0e656d02373943498c93ccb11b02f',
    };
</script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html

@@ -128,7 +128,13 @@
                <div class="col-sm-10">
                    @if(isNotEmpty(routeRecordList)){
                        @for(obj in routeRecordList){
                            <audio id="audio" src="${obj.routeRecord}" controls muted data-enabled="false"></audio>
                            <audio id="audio" src="${obj}" controls muted data-enabled="false"></audio>
                            @if(isNotEmpty(recordState) && recordState == 2){
                                <label>已过期</label>
                                <br/>
                            @}else{
                            <br/>
                            @}
                        @}
                    @}
                </div>
@@ -139,7 +145,18 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
<script>
    var audioElements = document.querySelectorAll('audio');
    audioElements.forEach(function(audio) {
        audio.addEventListener('play', function() {
            console.log('Audio is playing:', this.id);
            // 在这里添加你想要在播放时执行的代码
            this.pause();
            this.currentTime = 0;
        });
    });
</script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html

@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html

@@ -66,22 +66,22 @@
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">
                                <#button name="搜索" icon="fa-search" clickFun="TOrderTransfer.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TOrderTransfer.resetSearch()" space="true"/>
                                <#button name="搜索" icon="fa-search" clickFun="TOrderPrivateCar.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="TOrderPrivateCar.resetSearch()" space="true"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="TOrderPrivateCarTableToolbar" role="group">
                            @if(shiro.hasPermission("/tOrderPrivateCar/orderDetail")){
                                <#button name="订单详情" icon="fa-plus" clickFun="TOrderTransfer.orderDetail()"/>
                                <#button name="订单详情" icon="fa-plus" clickFun="TOrderPrivateCar.orderDetail()"/>
                            @}
                            @if(shiro.hasPermission("/tOrderPrivateCar/cancelOrder")){
                                <#button name="取消订单" icon="fa-edit" clickFun="TOrderTransfer.cancelOrder()" space="true"/>
                                <#button name="取消订单" icon="fa-edit" clickFun="TOrderPrivateCar.cancelOrder()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tOrderPrivateCar/orderTrack")){
                                <#button name="订单轨迹" icon="fa-edit" clickFun="TOrderTransfer.trajectory()" space="true"/>
                                <#button name="订单轨迹" icon="fa-edit" clickFun="TOrderPrivateCar.trajectory()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tOrderPrivateCar/deleteOrder")){
                                <#button name="删除记录" icon="fa-remove" clickFun="TOrderTransfer.deleteOrder()" space="true"/>
                                <#button name="删除记录" icon="fa-remove" clickFun="TOrderPrivateCar.deleteOrder()" space="true"/>
                            @}
                        </div>
                        <#table id="TOrderPrivateCarTable"/>

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html

@@ -112,7 +112,13 @@
                <div class="col-sm-10">
                    @if(isNotEmpty(routeRecordList)){
                        @for(obj in routeRecordList){
                            <audio id="audio" src="${obj.routeRecord}" controls muted data-enabled="false"></audio>
                            <audio src="${obj}" controls muted data-enabled="false" disabled></audio>
                            @if(isNotEmpty(recordState) && recordState == 2){
                            <label>已过期</label>
                            <br/>
                            @}else{
                            <br/>
                            @}
                        @}
                    @}
                </div>
@@ -122,7 +128,18 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
<script>
    var audioElements = document.querySelectorAll('audio');
    audioElements.forEach(function(audio) {
        audio.addEventListener('play', function() {
            console.log('Audio is playing:', this.id);
            // 在这里添加你想要在播放时执行的代码
            this.pause();
            this.currentTime = 0;
        });
    });
</script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html

@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html

@@ -102,7 +102,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html

@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_orderDetail.html

@@ -112,7 +112,13 @@
                <div class="col-sm-10">
                    @if(isNotEmpty(routeRecordList)){
                        @for(obj in routeRecordList){
                            <audio id="audio" src="${obj.routeRecord}" controls muted data-enabled="false"></audio>
                            <audio src="${obj}" controls muted data-enabled="false" disabled></audio>
                            @if(isNotEmpty(recordState) && recordState == 2){
                            <label>已过期</label>
                            <br/>
                            @}else{
                            <br/>
                            @}
                        @}
                    @}
                </div>
@@ -122,17 +128,18 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTransfer/tOrderTransfer_info.js"></script>
<script>
    $(function (){
        var myAudio = document.getElementById('audio');
        console.log(myAudio.dataset.enabled);
        if (myAudio.dataset.enabled === 'false') {
            console.log('audio is disabled');
            myAudio.pause();
        }
    })
    var audioElements = document.querySelectorAll('audio');
    audioElements.forEach(function(audio) {
        audio.addEventListener('play', function() {
            console.log('Audio is playing:', this.id);
            // 在这里添加你想要在播放时执行的代码
            this.pause();
            this.currentTime = 0;
        });
    });
</script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_trajectory.html

@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTransfer/tOrderTransfer_info.js"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html

@@ -164,7 +164,7 @@

    </div>
</div>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html

@@ -187,7 +187,7 @@

    </div>
</div>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
@}

 ManagementNTTravel/guns-admin/src/main/webapp/static/favicon1.ico

 ManagementNTTravel/guns-admin/src/main/webapp/static/img/index4.png

 ManagementNTTravel/guns-admin/src/main/webapp/static/img/logo.png

 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization.js

@@ -22,7 +22,7 @@
            {title: '当前参与人数', field: 'count', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    return '<a href="#"  style="color:cornflowerblue">'+row.count+'</a>' +'&nbsp;' +'&nbsp;'+'&nbsp;'+'&nbsp;'+'&nbsp;'+
                        '<a href="#" onclick="Generalization.activityRecord('+row.id+')" style="color:cornflowerblue">查看领取记录</a>' +'&nbsp;'
                        '<a href="#" onclick="Generalization.userCouponRecord('+row.id+')" style="color:cornflowerblue">查看领取记录</a>' +'&nbsp;'
                }
            },
            {title: '当前状态', field: 'state', visible: true, align: 'center', valign: 'middle',
@@ -128,26 +128,33 @@
    var imgElement = document.getElementById('qrCode');
    var imgURL = imgElement.src;
    console.log(imgURL)
    // var downloadLink = document.createElement('a');
    // downloadLink.href = imgURL;
    // downloadLink.download = '二维码.png'; // 自定义下载文件名
    // // 将链接添加到文档中（可以是隐藏的）
    // document.body.appendChild(downloadLink);
    // // 触发点击
    // downloadLink.click();
    // // 清理，可选
    // document.body.removeChild(downloadLink);
    var downloadLink = document.createElement('a');
    downloadLink.href = imgURL;
    downloadLink.download = '二维码.png'; // 自定义下载文件名
    // 将链接添加到文档中（可以是隐藏的）
    document.body.appendChild(downloadLink);
    // 触发点击
    downloadLink.click();
    // 清理，可选
    document.body.removeChild(downloadLink);
    // GeneralizationInfoDlg.close();
};

    var ajax = new $ax(Feng.ctxPath + "/generalization/downQrcode", function(data){
        Feng.success("下载成功!");
        GeneralizationInfoDlg.close();
    },function(data){
        Feng.error("下载失败!" + data.responseJSON.message + "!");
    });
    ajax.set("imgURL",imgURL);
    ajax.start();

/**
 * 领取记录
 */
Generalization.receiveRecord= function () {
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '领取记录',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/userActivity/receiveRecord?activityId='+ UserActivity.seItem.id
        });
        this.layerIndex = index;
    }
};

/**
@@ -198,18 +205,16 @@
/**
 * 领取记录
 */
Generalization.receiveRecord= function () {
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '领取记录',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,
            content: Feng.ctxPath + '/generalization/receiveRecord?activityId='+ Generalization.seItem.id
        });
        this.layerIndex = index;
    }
Generalization.userCouponRecord= function (id) {
    var index = layer.open({
        type: 2,
        title: '领取记录',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/userCouponRecord?activityType=5&couponActivityId='+ id
    });
    this.layerIndex = index;
};

/**

 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js

@@ -11,13 +11,6 @@
                }
            }
        },
        participateCount: {
            validators: {
                notEmpty: {
                    message: '请输入最多参与人数'
                }
            }
        },
        startTime: {
            validators: {
                notEmpty: {

 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTape/tOrderTape.js

@@ -137,7 +137,7 @@
            content: Feng.ctxPath + '/tOrderPrivateCar/tOrderPrivateCar_orderDetail/' + id
        });
        this.layerIndex = index;
    }else if(orderType == 2){
    }else if(orderType == 3){
        console.log("直通车出行订单详情");
        var index = layer.open({
            type: 2,