Merge remote-tracking branch 'origin/master'

jiangping

2024-12-12 142f590c9b32435f22830421a9c6f1c1e5669f0f

Merge remote-tracking branch 'origin/master'

 h5/pages/login/login.vue

@@ -41,7 +41,7 @@
    export default {

        data() {

            return {

                code: '111'

                code: ''

            }

        },
        onLoad(option) {
@@ -59,7 +59,7 @@
            let code = ''

            if (window.location.href.indexOf('code=') !== -1 || this.code) {

                const ywinfo = uni.getStorageSync('ywinfo') || {}
                 if(ywinfo.ywid){
                 if(ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)){
                     this.userAuth(ywinfo.type)
                 }

            } else {


 h5/pages/staff/task/index.vue

@@ -293,6 +293,9 @@
    },
    modalReset() {
      this.modelParam = {}
      this.search = {
                queryType: 0
            }
      this.pagination.page = 0
      this.dataList = []
      this.showFilter = false
@@ -319,13 +322,16 @@
          ...search
        }
      }).then(res => {
                if(res.data && res.data.records){
                    res.data.records.forEach(i => {
                      if (i.param1) {
                        i.param1 = JSON.parse(i.param1)
                      }
                    })
                }
        this.dataList = [...this.dataList, ...res.data.records]
                this.total = res.data.total
        this.dataList.forEach(i => {
          if (i.param1) {
            i.param1 = JSON.parse(i.param1)
          }
        })
        
      })
    },
    getHeadList() {

 h5/pages/staff/vehicle/sendACar.vue

@@ -123,6 +123,10 @@
        param.queryStartTime = param.queryDate + ' 00:00:00'
        param.queryEndTime = param.queryDate + ' 23:59:59'
      }
            if(param.carCode == '全部车辆'){
                param.carCode = null
                param.carId = null
            }
      carUseBookPaiche({
        ...pagination,
        model: { ...param }

 h5/utils/config.js

@@ -1,8 +1,8 @@

export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/' 
export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/' 

export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'


 screen/src/assets/images/SecurityControl/ic_unable@2x.png

 screen/src/views/SecurityControl.vue

@@ -111,7 +111,8 @@
          <div v-show="showJk" class="jiankong">
            <img class="jk_bg" src="@/assets/images/SecurityControl/jiankong_bg@2x.png" alt="">
            <div class="content">
              <div class="player_bg" style="width: 100%;height: 100%;" id="playWnd"> </div>
              <Video v-if="showJk && activeMenu && activeMenu.indexCode" :href="data.videoPluginUrl" :indexCode="activeMenu.indexCode" />
              <!-- <div class="player_bg" style="width: 100%;height: 100%;" id="playWnd"> </div> -->
            </div>
            <div class="right_wrap">
              <div class="menus">
@@ -384,7 +385,7 @@
            </div>
            <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
          </div>
          <div class="monitoring" @click="showJk = !showJk">
          <div class="monitoring" @click="changeMon">
            <img src="@/assets/images/SecurityControl/ic_jiankong@2x.png" class="icon" alt="">
            <div>监控列表</div>
            <img v-if="showJk" src="@/assets/images/SecurityControl/jiankong_ic_close@2x.png" class="top" alt="">
@@ -485,6 +486,7 @@
import * as echarts from 'echarts'
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
import Video from './videoUrl/Video.vue'
import {
  getEnergyCenterData,
  afgetCarmeraPreviemUrl,
@@ -507,145 +509,6 @@
  time.value = dayjs().format('HH:mm:ss')

}, 1000)


const oWebControl = ref(null)
const initCount = ref()
const pubKey = ref('')
const initPlugin = () => {
  oWebControl.value = new WebControl({
    szPluginContainer: "playWnd",                       // æŒ‡å®šå®¹å™¨id
    iServicePortStart: 15900,                           // æŒ‡å®šèµ·æ­¢ç«¯å£å·ï¼Œå»ºè®®ä½¿ç”¨è¯¥å€¼
    iServicePortEnd: 15900,
    szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11",   // ç”¨äºŽIE10使用ActiveX的clsid
    cbConnectSuccess: function () {
      // åˆ›å»ºWebControl实例成功
      console.log('创建WebControl实例成功');
      
      oWebControl.value.JS_StartService("window", {         // WebControl实例创建成功后需要启动服务
        dllPath: "./VideoPluginConnect.dll"         // å€¼"./VideoPluginConnect.dll"写死
      }).then(function () {
        oWebControl.value.JS_SetWindowControlCallback({   // è®¾ç½®æ¶ˆæ¯å›žè°ƒ
          cbIntegrationCallBack: cbIntegrationCallBack
        })// å¯åŠ¨æ’件服务成功
        oWebControl.value.JS_CreateWnd("playWnd", '300', '200').then(function () { //JS_CreateWnd创建视频播放窗口，宽高可设定，boxWidth, boxHeight容器
        // oWebControl.value.JS_CreateWnd("playWnd").then(function () { //JS_CreateWnd创建视频播放窗口，宽高可设定，boxWidth, boxHeight容器
          init()  // åˆ›å»ºæ’­æ”¾å®žä¾‹æˆåŠŸåŽåˆå§‹åŒ–
        })
      }, function () { // å¯åŠ¨æ’件服务失败
      })
    },
    cbConnectError: function () { // åˆ›å»ºWebControl实例失败
      console.log('创建WebControl实例失败');
      oWebControl.value = null
      $("#playWnd").html("插件未启动，正在尝试启动，请稍候...")
      WebControl.JS_WakeUp("VideoWebPlugin://") // ç¨‹åºæœªå¯åŠ¨æ—¶æ‰§è¡Œerror函数，采用wakeup来启动程序
      initCount.value++
      if (initCount.value < 3) {
        setTimeout(function () {
          initPlugin()
        }, 3000)
      } else {
        $("#playWnd").html("插件启动失败，请检查插件是否安装！或重新下载 <a href='./videoUrl/VideoWebPlugin.exe' target='_blank'>下载a<a>")
      }
    },
    cbConnectClose: function (bNormalClose) {
      // å¼‚常断开：bNormalClose = false
      // JS_Disconnect正常断开：bNormalClose = true
      console.log('异常断开：bNormalClose');
      oWebControl.value = null
      $("#playWnd").html("插件未启动，正在尝试启动，请稍候...")
      WebControl.JS_WakeUp("VideoWebPlugin://")
      initCount.value++
      if (initCount.value < 3) {
        setTimeout(function () {
          initPlugin()
        }, 3000)
      } else {
        $("#playWnd").html("插件启动失败，请检查插件是否安装！或重新下载 <a href='https://img0.baidu.com/it/u=3867022436,608124672&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1422' target='_blank'>下载b<a>")
      }
    }
  })
}
function fileDown() {
  window.open('./videoUrl/VideoWebPlugin.exe')
}
// æ¶ˆæ¯å›žè°ƒ
const cbIntegrationCallBack = (oData) => {
  let response = oData.responseMsg
  // response.type=1  é€‰ä¸­çª—口消息  type=2 æ’­æ”¾æ¶ˆæ¯
}
// ç›‘控




// åˆå§‹åŒ–
const init = () => {
  getPubKey(function () {
    ////////////////////////////////// è¯·è‡ªè¡Œä¿®æ”¹ä»¥ä¸‹å˜é‡å€¼   ////////////////////////////////////
    let appkey = "23154099"                           //综合安防管理平台提供的appkey，必填
    let secret = '88wFsg3xfn7o8QMsWEO2'   //综合安防管理平台提供的secret，必填
    // let secret = setEncrypt("88wFsg3xfn7o8QMsWEO2")   //综合安防管理平台提供的secret，必填
    let ip = "10.50.250.253"                           //综合安防管理平台IP地址，必填
    let playMode = 0                                  //初始播放模式：0-预览(实时流)，1-回放(视频)
    let port = 443                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
    let snapDir = "D:\\SnapDir"                       //抓图存储路径
    let videoDir = "D:\\VideoDir"                     //紧急录像或录像剪辑存储路径
    let layout = "1x1"                                //playMode指定模式的布局
    let enableHTTPS = 1                               //是否启用HTTPS协议与综合安防管理平台交互，这里总是填1
    let encryptedFields = 'secret'                    //加密字段，默认加密领域为secret
    let showToolbar = 1                               //是否显示工具栏，0-不显示，非0-显示
    let showSmart = 1                                 //是否显示智能信息（如配置移动侦测后画面上的线框），0-不显示，非0-显示
    let buttonIDs = "0,16,256,257,258,259,260,513,514,515,516,517,768"  //自定义工具条按钮
    oWebControl.value.JS_RequestInterface({
      funcName: "init",
      argument: JSON.stringify({
        appkey: appkey,                            //API网关提供的appkey
        secret: secret,                            //API网关提供的secret
        ip: ip,                                    //API网关IP地址
        playMode: playMode,                        //播放模式（决定显示预览还是回放界面）
        port: port,                                //端口
        snapDir: snapDir,                          //抓图存储路径
        videoDir: videoDir,                        //紧急录像或录像剪辑存储路径
        layout: layout,                            //布局
        enableHTTPS: enableHTTPS,                  //是否启用HTTPS协议
        encryptedFields: encryptedFields,          //加密字段
        showToolbar: showToolbar,                  //是否显示工具栏
        showSmart: showSmart,                      //是否显示智能信息
        buttonIDs: buttonIDs                       //自定义工具条按钮
      })
    }).then(function (oData) {
      console.log('初始化成功');
      
      // oWebControl.value.JS_Resize(that.boxWidth, that.boxHeight)  // åˆå§‹åŒ–后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
    })
  })
}

// èŽ·å–公钥
function getPubKey(callback) {
  oWebControl.value.JS_RequestInterface({
    funcName: 'getRSAPubKey',
    argument: JSON.stringify({
      keyLength: 1024,
    }),
  }).then((oData) => {
    if (oData.responseMsg.data) {
      pubKey.value = oData.responseMsg.data
      callback()
    }
  })
}

// RSA加密
function setEncrypt(value) {
  let that = this
  let encrypt = new JSEncrypt()
  encrypt.setPublicKey(pubKey.value)
  return encrypt.encrypt(value)
}


const arr = ['#68e2e3', '#50afd3', '#377cdb', '#d5ae3a']
const initEnergy = () => {
@@ -1045,6 +908,13 @@
    data5.value = result.filter(item => item.carmeraList && item.carmeraList.length > 0)
  })
}
const changeMon = () => {
  showJk.value = !showJk.value
  if(!showJk.value){
    activeJkIndex.value = -1
    activeMenu.value = {}
  }
}
const menuClick = (val) => {
  if (val == activeJkIndex.value) {
    activeJkIndex.value = -1
@@ -1053,35 +923,9 @@
  }
}
const menuItemClick = (val) => {
  initPlugin()
  activeMenu.value = val
  nextTick(() => {
    console.log('indexCode', val.indexCode);
    
    oWebControl.value.JS_RequestInterface({
      funcName: "startPreview",
      argument: JSON.stringify({
        cameraIndexCode: val.indexCode,            //监控点编号
        streamMode: 0,                   //主子码流标识：0-主码流，1-子码流
        transMode: 1,                    //传输协议：0-UDP，1-TCP
        gpuMode: 0,                      //是否启用GPU硬解，0-不启用，1-启用
        wndId: -1                         //播放窗口序号（在2x2以上布局下可指定播放窗口）
      })
    }).then((oData) => {
      if (oData.responseMsg.code === 1) {
        console.log('success', oData)
      }
    }, err => {
      console.log('err', err)

    })
  })

  // afgetCarmeraPreviemUrl({ indexCode: val.indexCode }).then(res => {
  //   activeVideo.value = res.data
  // })
}

const autoplayFlag = (list = [], leng = 4, time = 2000) => {
  if (list.length > leng) {
    return { delay: time, disableOnInteraction: false }
@@ -1129,7 +973,6 @@
  getData3()
  getData5()
  getWarning()


  setInterval(() => {
    getData1()

 screen/src/views/videoUrl/Video.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,229 @@
<template>
  <div class="video_app">
    <div class="player_bg" ref="videoRef" style="width: 100%;height: 100%;" id="playWnd"> </div>
  </div>
  <!-- <img style="width: 34px;margin-bottom: 16px;" src="../../assets/images/SecurityControl/ic_unable@2x.png" > -->
</template>

<script setup>
import { defineProps, ref, onMounted, onUnmounted, watch } from 'vue'
const props = defineProps({
  indexCode: String,
  href: String,
})
const templateA = `
  <div style="width:100%;height: 100%;display: flex;justify-content: center;align-items: center;flex-direction: column;">
    <div style="font-weight: 500;font-size: 15px;color: #CCCCCC;margin-bottom: 4px;">无法播放监控画面？</div>
    <div style="font-weight: 500;font-size: 15px;color: #CCCCCC;margin-bottom: 20px;">点击下载并安装视屏播放插件</div>
    <a href="${props.href}" target="_blank" style="font-weight: 500;font-size: 15px;color: #01D9FE;">点击下载</a>
  </div>
`


const width = ref(0)
const height = ref(0)
const videoRef = ref(null)

onMounted(() => {
  const rect = videoRef.value.getBoundingClientRect()
  width.value = rect.width
  height.value = rect.height

  initPlugin()
  window.addEventListener('resize', function () { // æ‰§è¡Œ
    if (oWebControl.value) {
      const rect = videoRef.value.getBoundingClientRect()
      width.value = rect.width
      height.value = rect.height
      oWebControl.value.JS_Resize($('#playWnd').width(), $('#playWnd').height())
    }
  })
})
onUnmounted(() => {
  destroyed()
})
const oWebControl = ref(null)
const initCount = ref()
const pubKey = ref('')

watch(
  () => props.indexCode,
  (newValue, oldValue) => {
    console.log('父组件传值变化：', newValue)
    videoPlay()
  }
)

const initPlugin = () => {
  oWebControl.value = new WebControl({
    szPluginContainer: "playWnd",                       // æŒ‡å®šå®¹å™¨id
    iServicePortStart: 15900,                           // æŒ‡å®šèµ·æ­¢ç«¯å£å·ï¼Œå»ºè®®ä½¿ç”¨è¯¥å€¼
    iServicePortEnd: 15900,
    szClassId: "23BF3B0A-2C56-4D97-9C03-0CB103AA8F11",   // ç”¨äºŽIE10使用ActiveX的clsid
    cbConnectSuccess: function () {
      // åˆ›å»ºWebControl实例成功
      console.log('1--创建WebControl实例成功')

      oWebControl.value.JS_StartService("window", {         // WebControl实例创建成功后需要启动服务
        dllPath: "./VideoPluginConnect.dll"         // å€¼"./VideoPluginConnect.dll"写死
      }).then(function () {
        oWebControl.value.JS_SetWindowControlCallback({   // è®¾ç½®æ¶ˆæ¯å›žè°ƒ
          cbIntegrationCallBack: cbIntegrationCallBack
        })// å¯åŠ¨æ’件服务成功
        oWebControl.value.JS_CreateWnd("playWnd", width.value, height.value).then(function () { //JS_CreateWnd创建视频播放窗口，宽高可设定，boxWidth, boxHeight容器
          // oWebControl.value.JS_CreateWnd("playWnd").then(function () { //JS_CreateWnd创建视频播放窗口，宽高可设定，boxWidth, boxHeight容器
          init()  // åˆ›å»ºæ’­æ”¾å®žä¾‹æˆåŠŸåŽåˆå§‹åŒ–
        })
      }, function () { // å¯åŠ¨æ’件服务失败
      })
    },
    cbConnectError: function () { // åˆ›å»ºWebControl实例失败
      console.log('创建WebControl实例失败')
      oWebControl.value = null
      $("#playWnd").html("插件未启动，正在尝试启动，请稍候...")
      WebControl.JS_WakeUp("VideoWebPlugin://") // ç¨‹åºæœªå¯åŠ¨æ—¶æ‰§è¡Œerror函数，采用wakeup来启动程序
      initCount.value++
      if (initCount.value < 3) {
        setTimeout(function () {
          initPlugin()
        }, 3000)
      } else {
        $("#playWnd").html(templateA)
      }
    },
    cbConnectClose: function (bNormalClose) {
      // å¼‚常断开：bNormalClose = false
      // JS_Disconnect正常断开：bNormalClose = true
      console.log('异常断开：bNormalClose')
      oWebControl.value = null
      $("#playWnd").html("插件未启动，正在尝试启动，请稍候...")
      WebControl.JS_WakeUp("VideoWebPlugin://")
      initCount.value++
      if (initCount.value < 3) {
        setTimeout(function () {
          initPlugin()
        }, 3000)
      } else {
        $("#playWnd").html(templateA)
      }
    }
  })
}
// åˆå§‹åŒ–
const init = () => {
  getPubKey(function () {
    ////////////////////////////////// è¯·è‡ªè¡Œä¿®æ”¹ä»¥ä¸‹å˜é‡å€¼   ////////////////////////////////////
    let appkey = "23154099"                           //综合安防管理平台提供的appkey，必填
    // let secret = '88wFsg3xfn7o8QMsWEO2'   //综合安防管理平台提供的secret，必填
    let secret = setEncrypt("88wFsg3xfn7o8QMsWEO2")   //综合安防管理平台提供的secret，必填
    let ip = "10.50.250.253"                           //综合安防管理平台IP地址，必填
    let playMode = 0                                  //初始播放模式：0-预览(实时流)，1-回放(视频)
    let port = 443                                    //综合安防管理平台端口，若启用HTTPS协议，默认443
    let snapDir = "D:\\SnapDir"                       //抓图存储路径
    let videoDir = "D:\\VideoDir"                     //紧急录像或录像剪辑存储路径
    let layout = "1x1"                                //playMode指定模式的布局
    let enableHTTPS = 1                               //是否启用HTTPS协议与综合安防管理平台交互，这里总是填1
    let encryptedFields = 'secret'                    //加密字段，默认加密领域为secret
    let showToolbar = 1                               //是否显示工具栏，0-不显示，非0-显示
    let showSmart = 1                                 //是否显示智能信息（如配置移动侦测后画面上的线框），0-不显示，非0-显示
    let buttonIDs = "0,16,256,257,258,259,260,513,514,515,516,517,768"  //自定义工具条按钮
    oWebControl.value.JS_RequestInterface({
      funcName: "init",
      argument: JSON.stringify({
        appkey: appkey,                            //API网关提供的appkey
        secret: secret,                            //API网关提供的secret
        ip: ip,                                    //API网关IP地址
        playMode: playMode,                        //播放模式（决定显示预览还是回放界面）
        port: port,                                //端口
        snapDir: snapDir,                          //抓图存储路径
        videoDir: videoDir,                        //紧急录像或录像剪辑存储路径
        layout: layout,                            //布局
        enableHTTPS: enableHTTPS,                  //是否启用HTTPS协议
        encryptedFields: encryptedFields,          //加密字段
        showToolbar: showToolbar,                  //是否显示工具栏
        showSmart: showSmart,                      //是否显示智能信息
        buttonIDs: buttonIDs                       //自定义工具条按钮
      })
    }).then(function (oData) {
      console.log('初始化成功')
      videoPlay()
      // oWebControl.value.JS_Resize(that.boxWidth, that.boxHeight)  // åˆå§‹åŒ–后resize一次，规避firefox下首次显示窗口后插件窗口未与DIV窗口重合问题
    })
  })
}
const videoPlay = () => {
  console.log('开始播放')

  oWebControl.value.JS_RequestInterface({
    funcName: "startPreview",
    argument: JSON.stringify({
      cameraIndexCode: props.indexCode,            //监控点编号
      streamMode: 0,                   //主子码流标识：0-主码流，1-子码流
      transMode: 1,                    //传输协议：0-UDP，1-TCP
      gpuMode: 0,                      //是否启用GPU硬解，0-不启用，1-启用
      wndId: -1                         //播放窗口序号（在2x2以上布局下可指定播放窗口）
    })
  }).then((oData) => {
    if (oData.responseMsg.code === 1) {
      console.log('播放成功', oData)
    }
  }, err => {
    console.log('err', err)

  })
}
// é”€æ¯
const destroyed = () => {
  if (oWebControl.value) {
    oWebControl.value.JS_HideWnd()   // å…ˆè®©çª—口隐藏，规避插件窗口滞后于浏览器消失问题
    oWebControl.value.JS_Disconnect().then(function () { }, function () { })
  }
}

function fileDown() {
  window.open('./videoUrl/VideoWebPlugin.exe')
}
// æ¶ˆæ¯å›žè°ƒ
const cbIntegrationCallBack = (oData) => {
  let response = oData.responseMsg
  // response.type=1  é€‰ä¸­çª—口消息  type=2 æ’­æ”¾æ¶ˆæ¯
}
// ç›‘控





// èŽ·å–公钥
function getPubKey(callback) {
  oWebControl.value.JS_RequestInterface({
    funcName: 'getRSAPubKey',
    argument: JSON.stringify({
      keyLength: 1024,
    }),
  }).then((oData) => {
    if (oData.responseMsg.data) {
      pubKey.value = oData.responseMsg.data
      callback()
    }
  })
}

// RSA加密
function setEncrypt(value) {
  let that = this
  let encrypt = new JSEncrypt()
  encrypt.setPublicKey(pubKey.value)
  return encrypt.encrypt(value)
}


</script>

<style lang="scss" scoped>
.video_app {
  width: 100%;
  height: 100%;

}
</style>

 screen/src/views/videoUrl/demo_embedded_for_iframe.html

ÎļþÒÑɾ³ý

 screen/src/views/videoUrl/init.js

ÎļþÒÑɾ³ý

 server/meeting/meeting_service/src/main/java/com/doumee/core/wx/WxPlatNotice.java

@@ -73,9 +73,8 @@
     */
    public void  sendMeetingBookTemplateNotice(SystemDictDataBiz systemDictDataBiz,Bookings bookings,String tempId, String token, Set<String> openIds){
        if(CollectionUtils.isNotEmpty(openIds)){
            String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
            String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                    Constants.WxUrlParams.MEETING,bookings.getId().toString());
            String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);

            String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
            //整体参数map
@@ -127,9 +126,8 @@
     */
    public void  sendMeetingBookCancelTemplateNotice(SystemDictDataBiz systemDictDataBiz,Bookings bookings, String tempId, String token, Set<String> openIds){
        if(CollectionUtils.isNotEmpty(openIds)){
            String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
            String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                    Constants.WxUrlParams.MEETING,bookings.getId().toString());
            String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);


            String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;

 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java

@@ -25,7 +25,7 @@
    @Select(" select a.id , a.START_TIME , a.END_TIME , b.`NAME` as roomName , a.`NAME` as meetingName  ,date_format(a.START_TIME,'%Y-%m-%d') as meetingDate , a.START_TIME as startTime, a.status ," +
            " CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime,  c.REALNAME as bookingUser ," +
            //" CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1  WHEN ( (a.END_TIME < now()  AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            " CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1  WHEN ( (a.END_TIME < now()  AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            " CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1  WHEN (  a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            " b.IMGURL as imgUrl ," +
            " a.remark  " +
            " from meeting_book a inner join meeting_rooms b  on a.ROOM_ID = b.ID  " +
@@ -37,7 +37,8 @@
            " CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime,  c.REALNAME as bookingUser ," +
            //" CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1  WHEN ( (a.END_TIME < now()  AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            " CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1 " +
            " WHEN ( (a.END_TIME < now()  AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 " +
            //" WHEN ( (a.END_TIME < now()  AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 " +
            " WHEN (  a.`STATUS` = 2 ) THEN 3 " +
            "WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            " b.IMGURL as imgUrl ," +
            " a.remark  " +
@@ -49,7 +50,7 @@
    @Select(" select a.id , a.START_TIME , a.END_TIME , b.id as roomId,  b.`NAME` as roomName , a.`NAME` as meetingName  ,date_format(a.START_TIME,'%Yå¹´%m月%d日') as meetingDate ," +
            " CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime,  c.REALNAME as bookingUserName ," +
            //"  CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1  WHEN a.END_TIME < now() AND a.`STATUS` = 0  THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            "  CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1  WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 )  or a.status = 2   ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            "  CASE WHEN a.START_TIME_REAL IS NULL AND a.`STATUS` = 0 THEN 1  WHEN (  a.status = 2   ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ," +
            " a.CONTENT as meetingContent, c.MOBILE as bookingUserMobile , e.`NAME` as bookingUserDepartment , a.CREATOR as bookingUserId  , a.remark  " +
            " from meeting_book a inner join meeting_rooms b  on a.ROOM_ID = b.ID  " +
            " left join system_user c on a.CREATOR = c.id " +

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -1272,12 +1272,14 @@
    public void dealMeetingStatus(List<MeetingListResponse> meetingResponseList){
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(meetingResponseList)){
            String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
            String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.SOON_START).getCode();
            String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
            Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
            for (MeetingListResponse m:meetingResponseList) {
                if(Constants.equalsInteger(m.getStatus(),Constants.ZERO)&&Constants.equalsInteger(m.getMeetingStatus(),Constants.ONE)){
                    //开始前120分钟 å¤§äºŽå½“前时间 åˆ™æ˜¾ç¤ºå³å°†å¼€å§‹
                    if(DateUtil.afterMinutesDate(m.getStartTime(),-minute).getTime()>System.currentTimeMillis()){
                    if(
                            DateUtil.afterMinutesDate(m.getStartTime(),-minute).getTime()<=System.currentTimeMillis()
                    ){
                        m.setMeetingStatus(4);
                    }
                }

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java

@@ -101,10 +101,10 @@
                        wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_USER;
                    }
                }
                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                        wxUrlParams
                        ,visits.getId().toString());
                String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);

                
                String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
                //整体参数map
@@ -166,9 +166,9 @@
                if(Objects.isNull(wxNoticeConfig)){
                    return;
                }
                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                        Constants.WxUrlParams.HIDDEN_DANGER,hiddenDanger.getId().toString());
                String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);


                String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
                //整体参数map
@@ -233,9 +233,9 @@
                if(Objects.isNull(wxNoticeConfig)){
                    return;
                }
                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                        Constants.WxUrlParams.HIDDEN_DANGER,hiddenDanger.getId().toString());
                String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);


                String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
                //整体参数map
@@ -304,9 +304,8 @@
                if(Objects.isNull(wxNoticeConfig)){
                    return;
                }
                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                        Constants.WxUrlParams.CAR_USE,carUseBook.getId().toString());
                String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);

                String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
                //整体参数map
@@ -392,9 +391,8 @@
                if(!objCode.equals(WxPlatConstants.platformBookContent.platformBookUpload)){
                    wxUrlParams = Constants.WxUrlParams.PLATFORM_BOOK;
                }
                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                        wxUrlParams,platformBooks.getId().toString());
                String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);

                String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
                //整体参数map
@@ -473,9 +471,8 @@
                    return;
                }

                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                        Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.getId().toString());
                String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);

                String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
                //整体参数map
@@ -536,9 +533,8 @@
                    return;
                }

                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                        Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.getId().toString());
                String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);

                String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
                //整体参数map
@@ -597,9 +593,8 @@
                    return;
                }

                String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                String jumpUrl = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),
                        Constants.WxUrlParams.PLATFORM_JOB_DRIVER,platformJob.getId().toString());
                String jumpUrl = systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url);

                String postUrL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token;
                //整体参数map
@@ -613,14 +608,14 @@
                Map<String, Object> car_number3 = new HashMap<String,Object>();
                car_number3.put("value",platformJob.getCarCodeFront());
                //月台号
                Map<String, Object> character_string7 = new HashMap<String,Object>();
                character_string7.put("value", "A001");
                Map<String, Object> thing9 = new HashMap<String,Object>();
                thing9.put("value", platformJob.getPlatformName());
                //时间
                Map<String, Object> time4 = new HashMap<String,Object>();
                time4.put("value", DateUtil.getFomartDate(new Date(),"yyyyå¹´MM月dd日 HH:mm:ss") );
                dataMap.put("const6",const6);
                dataMap.put("car_number3",car_number3);
                dataMap.put("character_string7",character_string7);
                dataMap.put("thing9",thing9);
                dataMap.put("time4",time4);
                for (String openId:openIds) {
                    paramMap.clear();

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java

@@ -892,7 +892,7 @@
            PlatformJob p = platformJobJoinMapper.selectJoinOne(PlatformJob.class,
                    new MPJLambdaWrapper<PlatformJob>()
                            .selectAll(PlatformJob.class)
                            .selectAs(Platform::getCode,PlatformJob::getPlatformName)
                            .selectAs(Platform::getName,PlatformJob::getPlatformName)
                            .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
                            .eq(PlatformJob::getId,platformJob.getId())
                            .last(" limit 1")
@@ -2092,7 +2092,7 @@
        String u =  UUID.randomUUID().toString();
        redisTemplate.opsForValue().set(Constants.RedisKeys.BIGSCREEN_UUID,u,3, TimeUnit.MINUTES);
        String url = Constants.getWxUrl(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.WX_REDIRECT_URL).getCode(),Constants.WxUrlParams.BISCREEN_CODE,u);
        largeScreenDataVO.setQrCode(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE_PREFIX).getCode().replace( "${param}", url));
        largeScreenDataVO.setQrCode(url);
        largeScreenDataVO.setAttention(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_ATTENTION).getCode());
        return largeScreenDataVO;


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -22,6 +22,7 @@
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.core.wms.model.response.WmsInventoryJsonResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
@@ -60,7 +61,7 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private PlatformWarnEventMapper platformWarnEventMapper;
    private PlatformWarnEventJoinMapper platformWarnEventJoinMapper;
    @Autowired
    private PlatformJobMapper platformJobMapper;
    @Autowired
@@ -314,7 +315,10 @@
    public  List<PlatformGroupFinishVO> platformGroupFinish(){
        List<PlatformGroupFinishVO> data = new ArrayList<>();
        List<PlatformGroup> groups = platformGroupMapper.selectJoinList(PlatformGroup.class, new MPJLambdaWrapper<PlatformGroup>()
                .select("(select sum(a.TOTAL_NUM) from platform_job a where a.PLATFORM_GROUP_ID=t.id and a.isdeleted=0   and a.status in(6,9,10) and to_days(a.done_date) = to_days(now()))",PlatformGroup::getOrtherTotalNum)
                .select("(select sum(case when a.total_num is null  then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = a.id  ) else a.total_num end) from platform_job a where a.PLATFORM_GROUP_ID=t.id and a.isdeleted=0   and a.status in(6,9,10) and to_days(a.done_date) = to_days(now()))",PlatformGroup::getOrtherTotalNum)
                //.select("(select sum(a.TOTAL_NUM) from platform_job a where a.PLATFORM_GROUP_ID=t.id and a.isdeleted=0   and a.status in(6,9,10) and to_days(a.done_date) = to_days(now()))",PlatformGroup::getOrtherTotalNum)

                //.select(" case when t.total_num is null  then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id  ) else t.total_num end ioQty ")
                .selectAll(PlatformGroup.class)
                .eq(PlatformGroup::getIsdeleted,Constants.ZERO)
        );
@@ -1481,7 +1485,8 @@
            List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
                    .selectAll( PlatformJob.class)
                    .select("( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+"  order by pl.CREATE_DATE desc  limit 1  ) as newStartDate")
                    .select(" (select sum(ifnull(pl.IO_QTY , 0 ))   from platform_wms_detail pl  where   pl.job_id = t.id and pl.isdeleted=0 )",PlatformJob::getWorkNum)
                    //.select(" (  select sum(ifnull(pl.IO_QTY , 0 ))   from platform_wms_detail pl  where   pl.job_id = t.id and pl.isdeleted=0 )",PlatformJob::getWorkNum)
                    .select(" (  case when t.total_num is null  then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id  ) else a.total_num end )",PlatformJob::getWorkNum)
                    .apply("to_days(t.create_date) = to_days(now())")
                    .eq(Platform::getIsdeleted, Constants.ZERO)
                    .in(PlatformJob ::getStatus,new Integer[]{Constants.PlatformJobStatus.WORKING.getKey(),Constants.PlatformJobStatus.CALLED.getKey() })
@@ -1618,9 +1623,13 @@
    }
    @Override
    public      List<PlatformWarnEvent> warningList(int limit){
        List<PlatformWarnEvent> platformLogList = platformWarnEventMapper.selectList(new QueryWrapper<PlatformWarnEvent>().lambda()
        List<PlatformWarnEvent> platformLogList = platformWarnEventJoinMapper
                .selectJoinList(PlatformWarnEvent.class,new MPJLambdaWrapper<PlatformWarnEvent>()
                .selectAll(PlatformWarnEvent.class)
                .selectAs(Platform::getName,PlatformWarnEvent::getPlatformName)
                .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
                .eq(PlatformWarnEvent::getIsdeleted,Constants.ZERO)
                .apply("to_days(create_date) = to_days(now())")
                .apply("to_days(t.create_date) = to_days(now())")
                .orderByDesc(PlatformWarnEvent::getCreateDate)
                .last(" limit "+limit)
        );
@@ -1671,12 +1680,14 @@
                if( Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                //已叫号（预约车、签到数、已叫号）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.CALLED.getKey()) ){
                    data.setSignedNum(data.getSignedNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setReservationCar(data.getReservationCar()+Constants.formatIntegerNum(model.getCountum()));
                    data.setCalledNum(data.getCalledNum()+Constants.formatIntegerNum(model.getCountum()));
                    data.setLineUpCar(data.getLineUpCar()+Constants.formatIntegerNum(model.getCountum()));
                }
                // ä½œä¸šè½¦è¾†ï¼ˆé¢„约车、签到数、已叫号、作业车）
                if(Constants.equalsInteger(model.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){