语音通话上送设备号

yiming
1 parent cbca7767
Showing 8 changed files with 52 additions and 23 deletions
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/data/zndd/carMonitor.java
src/main/java/com/bsth/entity/zndd/StationSignsLogger.java
src/main/resources/static/real_control_v2/call/assets/css/index.css
src/main/resources/static/real_control_v2/call/assets/js/index.js
src/main/resources/static/real_control_v2/call/index.html
src/main/resources/static/real_control_v2/js/stationcf/stationcf.js
src/main/resources/static/real_control_v2/main.html
@@ -71,9 +71,12 @@ public class OutEntrance {
              m.put("lineName",BasicData.lineCode2NameMap.get(ssLogger.getLineCode()));
              m.put("num",ssLogger.getNum());
              m.put("dir",ssLogger.getDir());
-
+             m.put("calleeId",ssLogger.getCalleeId());
              //线调页面推送
-             sendUtils.stationcf(m);
+             if(ssLogger.getNum()>15){
+                 sendUtils.stationcf(m);
+             }
+
  
              //查询班次情况自动回复
              //当前日期
@@ -130,6 +133,10 @@ public class OutEntrance {
                 return rtn;
             }
             String num=jsonObject.getString("num");
+            if(Integer.parseInt(num)<15){
+                rtn.put("status",ResponseCode.SUCCESS);
+                return rtn;
+            }
             String image=jsonObject.getString("image");
             String img=uploadBase64Img(image);
             JSONArray jsonArray = jsonObject.getJSONArray("stations");
@@ -139,16 +146,17 @@ public class OutEntrance {
                 JSONObject line=jsonArray.getJSONObject(i);
                 String lineCode = line.get("lineCode").toString();
                 String stationCode = line.get("stationCode").toString();
-                StationRoute stationRoute=BasicData.stationCode2StationMap.get(lineCode+"_"+stationCode);
+                String dir = line.get("dir").toString();
+                /*StationRoute stationRoute=BasicData.stationCode2StationMap.get(lineCode+"_"+stationCode);*/
                 Map m = new HashMap();
                 m.put("image", img);
                 m.put("stationCode", stationCode);
-                m.put("lineCode", stationRoute.getLineCode());
-                m.put("stationName",BasicData.stationCode2NameMap.get(stationRoute.getLineCode()+"_"+stationRoute.getDirections()+"_"+stationRoute.getStationCode()));
-                m.put("lineName",BasicData.lineCode2NameMap.get(stationRoute.getLineCode()));
+                m.put("lineCode", lineCode);
+                m.put("stationName",BasicData.stationCode2NameMap.get(lineCode+"_"+dir+"_"+stationCode));
+                m.put("lineName",BasicData.lineCode2NameMap.get(lineCode));
                 m.put("num",num);
-                m.put("xlDir",stationRoute.getDirections());
-                List<ScheduleRealInfo> srList=dayOfSchedule.findByLineAndUpDown(stationRoute.getLineCode(),stationRoute.getDirections());
+                m.put("xlDir",dir);
+                List<ScheduleRealInfo> srList=dayOfSchedule.findByLineAndUpDown(lineCode,Integer.parseInt(dir));
                 List<ScheduleRealInfo> sl=new ArrayList<>();
                 for (ScheduleRealInfo scheduleRealInfo : srList) {//筛选出运营班次
                     if((scheduleRealInfo.getBcType().equals("normal")||scheduleRealInfo.getBcType().equals("region"))){
@@ -165,7 +173,7 @@ public class OutEntrance {
                 for (int i1 = 0; i1 < sl.size(); i1++) {//最近的已发车班次
                     ScheduleRealInfo scheduleRealInfo=sl.get(i1);
                     LocalTime fcsj=LocalTime.parse(scheduleRealInfo.getFcsj(),dateTimeFormatter);
-                    if((scheduleRealInfo.getBcType().equals("normal")||scheduleRealInfo.getBcType().equals("region")) &&scheduleRealInfo.getXlDir().equals(String.valueOf(stationRoute.getDirections())) && fcsj.isAfter(localTime)){
+                    if((scheduleRealInfo.getBcType().equals("normal")||scheduleRealInfo.getBcType().equals("region")) &&scheduleRealInfo.getXlDir().equals(dir) && fcsj.isAfter(localTime)){
                         schedule =sl.get(i1-1);;
                         break;
                     }
@@ -26,7 +26,7 @@ public class carMonitor {
     public List<Map> carMonitor(String lineCode,String directions,String station) {
  
         List<Map> list = new ArrayList<>(); //返回的接口数据
-        url = "http://127.0.0.1:9777/xxfb/jd/carMonitor?lineid="+lineCode+"&stopid="+station+"&direction="+directions;
+        url = "http://58.34.52.130:9777/xxfb/jd/carMonitor?lineid="+lineCode+"&stopid="+station+"&direction="+directions;
         InputStream in = null;
         OutputStream out = null;
         try {
@@ -28,6 +28,8 @@ public class StationSignsLogger {
  
     private String sign;
  
+    private String calleeId;
+
  
  
     public String getLineCode() {
@@ -101,4 +103,12 @@ public class StationSignsLogger {
     public void setSign(String sign) {
         this.sign = sign;
     }
+
+    public String getCalleeId() {
+        return calleeId;
+    }
+
+    public void setCalleeId(String calleeId) {
+        this.calleeId = calleeId;
+    }
 }
@@ -133,18 +133,19 @@ p {
 } */
  
 .container-fluid {
-  /* height: 52px; */
+  height: 52px;
+  width: 105px;
   padding: 14px 0;
   border-color: #40a3fc;
   background: #40a3fc;
-  /* border-radius: 26px; */
+  border-radius: 26px;
   box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.17);
   font-size: 1.2em;
   display: flex;
   justify-content: center;
   align-items: center;
-  margin: 0 10px;
   color: #fff !important;
+  margin-top:400px;
 }
  
 .login-form_ownid {
@@ -429,7 +430,7 @@ p {
 /*  */
 .invitation {
   padding: 40px 15px;
-  width: 420px;
+  width: 100%;
   background-color: #169bd5;
 }
  
@@ -442,7 +443,7 @@ p {
   background: url(../images/call_bg.png) no-repeat;
   background-position: center;
   background-size: initial;
-  border-radius: 20px;
+  /*border-radius: 20px;*/
   box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.3);
 }
  
@@ -1325,13 +1325,14 @@ var OperationPackge = {
   },
   p2p: {
     // 语音呼叫
-    makeVoiceCall: async function () {
+    makeVoiceCall: async function (calleeId) {
       // 关闭设置
       await OperationPackge.p2p.closeSeting();
       // 获取输入的用户
-      var oPeerId = await OperationPackge.p2p.getPeerUserId();
+      /*var oPeerId = await OperationPackge.p2p.getPeerUserId();*/
       // 查询输入用户合法性
-      Store.peerUserId = await OperationPackge.p2p.peerUserVaplidity(oPeerId);
+      console.log("呼叫:"+calleeId)
+      Store.peerUserId = await OperationPackge.p2p.peerUserVaplidity(calleeId);
       if (Store.peerUserId) {
         Store.repetitionClick = true;
         Store.network = Object.assign(Store.network, {
@@ -2783,9 +2784,10 @@ var OperationPackge = {
   Utils.inputChangId("#userInputs > input");
   // 语音呼叫
   $("#p2pAudioMakeCall").click(function () {
+    var calleeId=$(this).val();
     if (navigator.onLine && Store.lineworkRTC && Store.lineworkRTM) {
       if (!Store.repetitionClick) {
-        OperationPackge.p2p.makeVoiceCall();
+        OperationPackge.p2p.makeVoiceCall(calleeId);
       }
     } else {
       // 页面提示
@@ -32,7 +32,7 @@
  
     >
       <!--  -->
-      <div class="login d-flex flex-row align-items-stretch">
+      <div>
         <!-- 警告框 -->
         <div class="warning_box" id="warningBox"></div>
         <!--  --> 
@@ -726,4 +726,11 @@
     </div>
     <script src="/real_control_v2/call/assets/js/index.js"></script>
   </body>
+<script>
+  (function() {
+    const urlParams = new URLSearchParams(window.location.search);
+    const calleeId = urlParams.get('calleeId');
+    $("#p2pAudioMakeCall").val(calleeId);
+  })();
+</script>
 </html>
@@ -26,7 +26,8 @@ var gb_stationcf = (function () {
  
     $wrap.on('click', '.all', function () {
         var type = $(this).data('ip');
-        let pageUrl ="/real_control_v2/call/index.html";
+        var calleeId = $(this).data('call')
+        let pageUrl ="/real_control_v2/call/index.html?calleeId="+calleeId;
         //将片段路径写入 localStorage
         window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
         var index = layer.open({
@@ -236,7 +236,7 @@
 <script src="/real_control_v2/js/forms/form_embed.js" merge="custom_js"></script>
 <!-- 模态框扩展 -->
 <script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
-
+<script src="/real_control_v2/call/assets/js/index.js" merge="custom_js"></script>
 <!-- #### 安全驾驶 start ###  -->
 <div class="multi_plat_msg_pop_wrap" ></div>
 <script id="sd_plat_msg_template" type="text/html">
@@ -270,7 +270,7 @@
             <span class="tests">站点人数&nbsp;&nbsp;&nbsp;{{num}}</span>
             <span class="time">催发时间：{{timeStr}}</span>
         </div>
-        <button class="all uk-button uk-modal-close" class="title" data-ip="{{dir}}" value="{{dir}}">拨打站台电话</button>
+        <button class="all uk-button uk-modal-close" class="title" data-call="{{calleeId}}" data-ip="{{dir}}" value="{{dir}}">拨打站台电话</button>
         <button class="images uk-button uk-modal-close" data-image="{{image}}" value="{{dir}}">查看图片</button>
     </div>
 </script>