From 31b547db52ff85ae1ab84a662dbd476f6276bcc1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 00:36:32 +0800
Subject: [PATCH] 语音播报及其他
---
management/guns-admin/src/main/resources/application.yml | 2
/dev/null | 69 -----------------------
management/guns-admin/src/main/webapp/static/audio/lobbyOrder.mp3 | 0
management/guns-admin/src/main/webapp/static/audio/cancelOrder.mp3 | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java | 1
management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html | 24 +++++++
management/guns-admin/src/main/webapp/static/audio/newOrder.mp3 | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java | 28 +++++++++
8 files changed, 52 insertions(+), 72 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
index 4b70b58..764e5ff 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
+++ b/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;
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
index 593b7b0..a32a952 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
+++ b/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;
+ }
}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/resources/application.yml b/management/guns-admin/src/main/resources/application.yml
index 47c0ed2..d09fe0f 100644
--- a/management/guns-admin/src/main/resources/application.yml
+++ b/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
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
index 61ac26d..9bcc2e2 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
+++ b/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>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html b/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
deleted file mode 100644
index d38cf42..0000000
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
+++ /dev/null
@@ -1,33 +0,0 @@
-@layout("/common/_container.html"){
-<div class="row">
- <div class="col-sm-12">
- <div class="ibox float-e-margins">
- <div class="ibox-title">
- <h5>在线司机</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-sm-3">
- <#NameCon id="name" name="司机姓名" />
- </div>
- <div class="col-sm-3">
- <#NameCon id="phone" name="手机号" />
- </div>
- <div class="col-sm-3">
- <#button name="查询" icon="fa-search" clickFun="Home.search()"/>
- <#button name="重置" icon="fa-trash" clickFun="Home.resetSearch()" space="true"/>
- </div>
- </div>
- <div class="hidden-xs" id="HomeTableToolbar" role="group">
- </div>
- <#table id="HomeTable"/>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
-<script src="${ctxPath}/static/home.js"></script>
-@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html b/management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html
deleted file mode 100644
index 76a4e05..0000000
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html
+++ /dev/null
@@ -1,25 +0,0 @@
-@layout("/common/_container.html"){
-<style type="text/css">
- tr{
- height: 40px;
- }
- td{
- width: 200px;
- }
- h4{
- color: #1AB394;
- }
- img{
- height: 80px;
- }
-</style>
-<div class="ibox float-e-margins">
- <div class="ibox-content">
- <input type="hidden" id="driverId" value="${id}">
- <div class="form-horizontal" id="content">
-
- </div>
- </div>
-</div>
-<script src="${ctxPath}/static/netCarInfo.js"></script>
-@}
diff --git a/management/guns-admin/src/main/webapp/static/audio/cancelOrder.mp3 b/management/guns-admin/src/main/webapp/static/audio/cancelOrder.mp3
new file mode 100644
index 0000000..1e93218
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/audio/cancelOrder.mp3
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/audio/lobbyOrder.mp3 b/management/guns-admin/src/main/webapp/static/audio/lobbyOrder.mp3
new file mode 100644
index 0000000..f105354
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/audio/lobbyOrder.mp3
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/audio/newOrder.mp3 b/management/guns-admin/src/main/webapp/static/audio/newOrder.mp3
new file mode 100644
index 0000000..6855ddc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/audio/newOrder.mp3
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/netCarInfo.js b/management/guns-admin/src/main/webapp/static/netCarInfo.js
deleted file mode 100644
index 2ac5c59..0000000
--- a/management/guns-admin/src/main/webapp/static/netCarInfo.js
+++ /dev/null
@@ -1,69 +0,0 @@
-var driverId = $('#driverId').val();
-
-$(function () {
- getDataInfo();
-})
-
-
-/**
- * 分公司信息管理初始化
- */
-var VersionAdd = {
- id: "OpenCity", //表格id
- seItem: null, //选中的条目
- table: null,
- layerIndex: -1,
-
-};
-
-
-/**
- * 关闭此对话框
- */
-VersionAdd.close = function () {
- parent.layer.close(window.parent.Home.layerIndex);
-};
-
-
-
-function getDataInfo() {
- $.ajax({
- url: Feng.ctxPath + '/home/getDriverInfo',
- type: 'POST',
- data: {
- driverId: driverId
- },
- success: function (res) {
- var netcarDriver = res.netcarDriver;
- var netcar = res.netcar;
- var order = res.order;
- var str = '<table>';
- if('' != netcar){
- str += '<tr><td><h4>车辆信息：</h4></td><td></td><td></td><td></td></tr>' +
- '<tr><td>车牌号</td><td>' + netcar.carLicensePlate + '</td><td></td><td></td></tr>' +
- '<tr><td>车辆品牌</td><td>' + res.carBrand + '</td><td></td><td></td></tr>' +
- '<tr><td>车辆型号</td><td>' + res.carModel + '</td><td></td><td></td></tr>' +
- '<tr><td>车辆颜色</td><td>' + netcar.carColor + '</td><td></td><td></td></tr>';
- }
-
- if(netcarDriver != ''){
- str += '' +
- '<tr><td><h4>司机信息：</h4></td><td></td><td></td><td></td></tr>' +
- '<tr><td>司机姓名</td><td>' + netcarDriver.name + '</td><td></td><td></td></tr>' +
- '<tr><td>司机电话</td><td>' + netcarDriver.phone + '</td><td></td><td></td></tr>';
- }
- if(order.length > 0){
- for(var i in order){
- str += '<tr><td><h4>订单' + (parseInt(i) + 1) + '</h4></td><td></td><td></td><td></td></tr>' +
- '<tr><td>起点</td><td>' + order[i].startAddress + '</td><td>终点</td><td>' + order[i].endAddress + '</td></tr>' +
- '<tr><td>出行时间</td><td>' + order[i].travelTime + '</td><td></td><td></td></tr>' +
- '<tr><td>乘客姓名</td><td>' + order[i].passengers + '</td><td></td><td></td></tr>' +
- '<tr><td>乘客电话</td><td>' + order[i].passengersPhone + '</td><td></td><td></td></tr>';
- }
- }
- str += '</table>';
- $('#content').html(str);
- }
- });
-}
-
--
Gitblit v1.7.1