puzhibing
2023-08-16 31b547db52ff85ae1ab84a662dbd476f6276bcc1
语音播报及其他
3个文件已删除
3个文件已添加
4个文件已修改
182 ■■■■ 已修改文件
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/audio/cancelOrder.mp3 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/audio/lobbyOrder.mp3 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/audio/newOrder.mp3 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/netCarInfo.js 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
@@ -291,6 +291,7 @@
            tDriver.setServerStatus(1);
            driverService.updateById(tDriver);
        }
        redisUtil.setStrValue("cancelOrder", "true");
        return SUCCESS_TIP;
    }
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
@@ -272,4 +272,32 @@
    }
    /**
     * 获取语音播报
     * @return
     */
    @ResponseBody
    @RequestMapping(value = "/queryOrderBroadcast", method = RequestMethod.POST)
    public Map<String, Object> queryOrderBroadcast(){
        String newOrder = redisUtil.getValue("newOrder");
        String cancelOrder = redisUtil.getValue("cancelOrder");
        String lobbyOrder = redisUtil.getValue("lobbyOrder");
        Map<String, Object> map = new HashMap<>();
        boolean n = ToolUtil.isNotEmpty(newOrder) ? Boolean.valueOf(newOrder) : false;
        boolean c = ToolUtil.isNotEmpty(cancelOrder) ? Boolean.valueOf(cancelOrder) : false;
        boolean l = ToolUtil.isNotEmpty(lobbyOrder) ? Boolean.valueOf(lobbyOrder) : false;
        map.put("newOrder", n);
        map.put("cancelOrder", c);
        map.put("lobbyOrder", l);
        if(n){
            redisUtil.setStrValue("newOrder", "false");
        }
        if(c){
            redisUtil.setStrValue("cancelOrder", "false");
        }
        if(l){
            redisUtil.setStrValue("lobbyOrder", "false");
        }
        return map;
    }
}
management/guns-admin/src/main/resources/application.yml
@@ -50,7 +50,7 @@
spring:
  datasource:
    url: jdbc:mysql://192.168.110.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    url: jdbc:mysql://127.0.0.1:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    username: root
#    password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
    password: 123456
management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
@@ -7,7 +7,6 @@
    <!--地图-->
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
    <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->
    <!-- 全局css -->
    <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
@@ -23,7 +22,6 @@
    <link href="${ctxPath}/static/css/plugins/webuploader/webuploader.css" rel="stylesheet">
    <link href="${ctxPath}/static/css/plugins/ztree/zTreeStyle.css" rel="stylesheet">
    <link href="${ctxPath}/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css" rel="stylesheet"/>
    <!-- <link href="${ctxPath}/static/css/plugins/ztree/demo.css" rel="stylesheet"> -->
    <link href="${ctxPath}/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css" rel="stylesheet">
    <link href="${ctxPath}/static/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
    <link href="${ctxPath}/static/layui/css/layui.css" rel="stylesheet">
@@ -182,10 +180,32 @@
            return currentdate;
        }
        setInterval(function () {
            var ajax = new $ax(Feng.ctxPath + "/blackboard/queryOrderBroadcast", function (data) {
                let newOrder = data.newOrder;
                let cancelOrder = data.cancelOrder;
                let lobbyOrder = data.lobbyOrder;
                if(newOrder){
                    $('#newOrder')[0].play();
                }
                if(cancelOrder){
                    $('#cancelOrder')[0].play();
                }
                if(lobbyOrder){
                    $('#lobbyOrder')[0].play();
                }
            }, function (data) {
            });
            ajax.start();
        }, 3000);
    </script>
</head>
<body class="gray-bg">
<audio id="newOrder"><source src="${ctxPath}/static/audio/newOrder.mp3" type="audio/mpeg"></audio>
<audio id="cancelOrder"><source src="${ctxPath}/static/audio/cancelOrder.mp3" type="audio/mpeg"></audio>
<audio id="lobbyOrder"><source src="${ctxPath}/static/audio/lobbyOrder.mp3" type="audio/mpeg"></audio>
<div class="wrapper wrapper-content">
    ${layoutContent}
</div>
management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
File was deleted
management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html
File was deleted
management/guns-admin/src/main/webapp/static/audio/cancelOrder.mp3
Binary files differ
management/guns-admin/src/main/webapp/static/audio/lobbyOrder.mp3
Binary files differ
management/guns-admin/src/main/webapp/static/audio/newOrder.mp3
Binary files differ
management/guns-admin/src/main/webapp/static/netCarInfo.js
File was deleted