From 622b7ec40f4d0e8340b6210521ba212f64a68dc4 Mon Sep 17 00:00:00 2001
From: deartibers <947466799@qq.com>
Date: Wed, 3 Aug 2022 11:41:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=A1=E9=B8=BD=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/fluoriteCamera.jsx             | 42 +++++----
 .../components/ipcCamera.jsx                  | 43 ++++-----
 .../components/nvrCamera.jsx                  | 21 +++++
 .../offline/components/pushSideSheet.jsx      | 94 +++++++++++++++++--
 .../offline/components/pushSideSheet.less     | 44 +++++++++
 .../offline/containers/carrierpigeon.jsx      | 17 ++--
 .../web/client/src/utils/webapi.js            |  2 +-
 code/VideoAccess-VCMP/web/package.json        |  2 +-
 8 files changed, 204 insertions(+), 61 deletions(-)

diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
index f993f67..e718330 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
@@ -83,7 +83,8 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                 labelWidth="115px"
                 onValueChange={(values) => {
                     console.log(values);
-                    let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "rtmp", "serialNo",]
+                    // let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "rtmp", "serialNo",]
+                    let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "serialNo",]
                     let b = {}
                     setting.map((item) => {
                         if (values.hasOwnProperty(item)) {
@@ -109,7 +110,8 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                     cloudControl: cameraData.cloudControl || "",
                     voice: cameraData.voice || "",
                     serialNo: cameraData.serialNo || "",
-                    rtmp: cameraData.rtmp || "",
+                    // rtmp: cameraData.rtmp || "",
+                    rtmp: '此处无效 自动生成',
                 }}
                 getFormApi={(formApi) => (form.current = formApi)}
             >
@@ -264,7 +266,7 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                             label="设备类型:"
                             field="kindId"
                             placeholder="请选择摄像头类型"
-                            style={{ width: 180 }}
+                            style={{ width: 307 }}
                             rules={[{ required: true, message: "请选择摄像头类型" }]}
                         >
                             {CameraKind.map((item, index) => (
@@ -274,21 +276,6 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                             ))}
                         </Form.Select>
 
-                        <Form.Select
-                            label="设备能力:"
-                            multiple
-                            maxTagCount={1}
-                            field="abilityId"
-                            placeholder="请选择能力"
-                            style={{ width: 180 }}
-                            rules={[{ required: true, message: "请选择能力" }]}
-                        >
-                            {CameraAbility.map((item, index) => (
-                                <Form.Select.Option key={index} value={item.id}>
-                                    {item.ability}
-                                </Form.Select.Option>
-                            ))}
-                        </Form.Select>
                     </Col>
                     <Col span={12}>
                         {/* 云台支持 */}
@@ -473,7 +460,7 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                             rules={[{ required: true, message: "请输入设备序列号" }]}
                         />
                         {/* RTMP地址接入 */}
-                        <TextArea
+                        {/* <TextArea
                             style={{ width: 320, height: 90 }}
                             field="rtmp"
                             label="RTMP地址接入:"
@@ -481,7 +468,22 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                             disabled={cameraData.id ? true :  false}
                             placeholder="请输入RTMP地址接入"
                             rules={[{ required: true, message: "请输入RTMP地址接入" }]}
-                        />
+                        /> */}
+                        <Form.Select
+                            label="设备能力:"
+                            multiple
+                            maxTagCount={1}
+                            field="abilityId"
+                            placeholder="请选择能力"
+                            style={{ width: 307 }}
+                            rules={[{ required: true, message: "请选择能力" }]}
+                        >
+                            {CameraAbility.map((item, index) => (
+                                <Form.Select.Option key={index} value={item.id}>
+                                    {item.ability}
+                                </Form.Select.Option>
+                            ))}
+                        </Form.Select>
                     </Col>
                 </Row>
             </Form>
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx
index 4037c47..9fd4b57 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx
@@ -88,7 +88,8 @@ function ipcCamera ({
                 labelWidth="115px"
                 onValueChange={(values) => {
                     console.log(values);
-                    let setting = ["abilityId", "cloudControl", "kindId", "name", "position", "rtmp", "serialNo"]
+                    let setting = ["abilityId", "cloudControl", "kindId", "name", "position", "serialNo"]
+                    // let setting = ["abilityId", "cloudControl", "kindId", "name", "position", "rtmp", "serialNo"]
                     let b = {}
                     setting.map((item) => {
                         if (values.hasOwnProperty(item)) {
@@ -113,7 +114,8 @@ function ipcCamera ({
                     cloudControl: cameraData.cloudControl || "",
                     voice: cameraData.voice || "",
                     serialNo: cameraData.serialNo || "",
-                    rtmp: cameraData.rtmp || "",
+                    rtmp: "此处无效 自动生成",
+                    // rtmp: cameraData.rtmp || "",
                 }}
                 getFormApi={(formApi) => (form.current = formApi)}
             >
@@ -190,7 +192,7 @@ function ipcCamera ({
                             label="设备类型:"
                             field="kindId"
                             placeholder="请选择摄像头类型"
-                            style={{ width: 180 }}
+                            style={{ width: 307 }}
                             rules={[{ required: true, message: "请选择摄像头类型" }]}
                         >
                             {CameraKind.map((item, index) => (
@@ -199,22 +201,6 @@ function ipcCamera ({
                                 </Form.Select.Option>
                             ))}
                         </Form.Select>
-
-                        <Form.Select
-                            label="设备能力:"
-                            multiple
-                            maxTagCount={1}
-                            field="abilityId"
-                            placeholder="请选择能力"
-                            style={{ width: 180 }}
-                            rules={[{ required: true, message: "请选择能力" }]}
-                        >
-                            {CameraAbility.map((item, index) => (
-                                <Form.Select.Option key={index} value={item.id}>
-                                    {item.ability}
-                                </Form.Select.Option>
-                            ))}
-                        </Form.Select>
                     </Col>
                     <Col span={12}>
                         <Form.RadioGroup
@@ -398,14 +384,29 @@ function ipcCamera ({
                                 rules={[{ required: true, message: "请输入设备编号" }]}
                             />
                         </div>
-                        <TextArea
+                        <Form.Select
+                            label="设备能力:"
+                            multiple
+                            maxTagCount={1}
+                            field="abilityId"
+                            placeholder="请选择能力"
+                            style={{ width: 307 }}
+                            rules={[{ required: true, message: "请选择能力" }]}
+                        >
+                            {CameraAbility.map((item, index) => (
+                                <Form.Select.Option key={index} value={item.id}>
+                                    {item.ability}
+                                </Form.Select.Option>
+                            ))}
+                        </Form.Select>
+                        {/* <TextArea
                             style={{ width: 320, height: 90 }}
                             field="rtmp"
                             label="RTMP地址接入:"
                             disabled={cameraData.id ? true : false}
                             placeholder="请输入RTMP地址接入"
                             rules={[{ required: true, message: "请输入RTMP地址" }]}
-                        />
+                        /> */}
                     </Col>
                     {/* <Col span={18}>
               
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
index 917e437..ca80619 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
@@ -54,6 +54,13 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber,
                     streamId: cameraDataNvr.serialNo,
                 })
             ).then((res) => {
+                if(res.success==false){
+                    setstep("none");
+                    setloading(false);
+                    setstepp("none");
+                    setloadingTip("获取中...");
+                    return
+                }
                 let oneData = res.payload.data[0];
                 let modifyData = res.payload.data.find(
                     (item) => item.id == cameraData.gbId);
@@ -92,6 +99,13 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber,
             setloading(true);
             setstep("block");
             dispatch(equipmentWarehouse.getVideoStreaming({ streamId: nvrNumber })).then((res) => {
+                if(res.success==false){
+                    setstep("none");
+                    setloading(false);
+                    setstepp("none");
+                    setloadingTip("获取中...");
+                    return
+                }
                 let chooseList = [];
                 let data = res.payload.data.map((item) => {
                     item.change = false;
@@ -159,6 +173,13 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber,
                 setloading(true);
                 setstep("block");
                 dispatch(equipmentWarehouse.getVideoStreaming(valuess)).then((res) => {
+                    if(res.success==false){
+                        setstep("none");
+                        setloading(false);
+                        setstepp("none");
+                        setloadingTip("获取中...");
+                        return
+                    }
                     let data = res.payload.data.map((item) => {
                         item.change = false;
                         item.support = false;
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
index 033ef44..f02da93 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
@@ -1,8 +1,9 @@
 import React, { useState, useRef, useEffect } from "react";
 import { connect } from "react-redux";
-import { Modal, Spin,Input,Collapse ,SideSheet,Tabs, TabPane} from "@douyinfe/semi-ui";
+import { Modal, Spin,Input,Collapse ,SideSheet,Tabs, TabPane,Popover} from "@douyinfe/semi-ui";
 import moment from "moment";
 import './pushSideSheet.less'
+import { push } from "react-router-redux";
 function pushSideSheet (props) {
     const {
         close,
@@ -11,20 +12,67 @@ function pushSideSheet (props) {
         journal//日志信息
     } = props;
     const { offline } = actions;
-    const [notesValue, setNotesValue] = useState('');//释义
+    const [logList, setLogList] = useState([]);//日志列表
+    const [noticeTest, setNoticeTest] = useState('');//通知列表
+    const [equipmentTest, setEquipmentTest] = useState();//设备列表
     
     //初始化
     useEffect(() => {
         let timeList = []
         for (let index = 0; index < journal.length; index++) {
+            let receiverTest=journal[index].receiver.join(';');
+            let camerTest=''
+            for (let j = 0; j < journal[index].camera.length; j++) {
+                camerTest=camerTest+journal[index].camera[j].name+';'
+            }
             timeList.push(
                 {
                     title:getTimeTitle(journal[index].time),
-                    time:getTimeData(journal[index].time)
+                    time:getTimeData(journal[index].time),
+                    cameraList:camerTest,
+                    receiverList:receiverTest
                 }
             )
         }
-        console.log('timeList',timeList);
+        let yearList=[]
+        for (let index = 0; index < journal.length; index++) {
+            yearList.push(
+                {
+                    title:getTimeTitle(journal[index].time),
+                }
+            )
+        }
+        let showList=[]
+        let obj = {};
+        for (let i = 0; i < yearList.length; i++) {
+            if (!obj[yearList[i].title]) {
+                showList.push(yearList[i]);
+                obj[yearList[i].title] = true;
+              }
+        }
+        for (let index = 0; index < showList.length; index++) {
+            showList[index].timeList=[]
+        }
+        for (let j = 0; j < showList.length; j++) {
+            for (let i = 0; i < timeList.length; i++) {
+                if(timeList[i].title==showList[j].title){
+                    showList[j].timeList.push({time:timeList[i].time,cameraList:timeList[i].cameraList,receiverList:timeList[i].receiverList})
+                }
+            }
+        }
+        setLogList(showList)
+        let noticeList =''
+        for (let i = 0; i < pushData.cameraStatusPushReceivers.length; i++) {
+            noticeList=noticeList+pushData.cameraStatusPushReceivers[i].receiver+';'
+        }
+        setNoticeTest(noticeList)
+        
+        let equipmentList=''
+        for (let i = 0; i < pushData.cameraStatusPushMonitors.length; i++) {
+            noticeList=noticeList+pushData.cameraStatusPushMonitors[i].camera.name+';'
+        }
+        setEquipmentTest(equipmentList)
+        console.log('pushData',pushData);
     }, []);
     function getTimeTitle(date){
         let year = moment(date).year()+'年'
@@ -47,16 +95,46 @@ function pushSideSheet (props) {
                 <Tabs type="line">
                     <TabPane tab="推送日志" itemKey="1">
                         <Collapse>
-                            <Collapse.Panel header={<div style={{width:'100%',textAlign:'center'}}>11111111</div>} itemKey="1">
-                                <p>Hi, bytedance dance dance. This is the docsite of Semi UI. </p>
+                        {logList.map((item, index) => {
+                        return (
+                            <Collapse.Panel header={<div style={{width:'100%',textAlign:'center'}}>{item.title}</div>} itemKey={String(index)}  key={index} >
+                                {item.timeList.map((itm,idx)=>{
+                                    return(
+                                        <div style={{display:'flex',alignItems:'center',height:46,borderBottom: '1px solid #E8E8E8',fontSize:12,color:'rgba(0,0,0,0.6500)'}} key={idx}>
+                                            <div style={{margin:'0px 24px',width:74}}>{itm.time}</div>
+                                            <Popover content={
+                                                <div style={{ padding: 12,width:300,wordBreak:'break-all' }}>
+                                                    {itm.receiverList}
+                                                </div>
+                                            }>
+                                                <div style={{marginRight:24,width:262,textOverflow:'ellipsis',whiteSpace:'nowrap',overflow:'hidden'}}>{itm.receiverList}</div>
+                                            </Popover>
+                                            <Popover content={
+                                                <div style={{ padding: 12,width:200,wordBreak:'break-all' }}>
+                                                    {itm.cameraList}
+                                                </div>
+                                            }>
+                                                <div style={{marginRight:24,width:133,textOverflow:'ellipsis',whiteSpace:'nowrap',overflow:'hidden'}}>{itm.cameraList}</div>
+                                            </Popover>
+                                            <div style={{marginRight:25,width:83}} className='online' >上线及时通知</div>
+                                        </div>
+                                    )
+                                })}
                             </Collapse.Panel>
+                        )})}
                         </Collapse>
                     </TabPane>
                     <TabPane tab="监听范围" itemKey="2">
-                        22
+                        <div style={{margin:'12px 36px',fontSize:12,color:'rgba(0,0,0,0.6500)'}}>
+                            <div style={{marginBottom:8}}>摄像头名称</div>
+                            <div>{equipmentTest}</div>
+                        </div>
                     </TabPane>
                     <TabPane tab="接收信息" itemKey="3">
-                        33
+                        <div style={{margin:'12px 36px',fontSize:12,color:'rgba(0,0,0,0.6500)'}}>
+                            <div style={{marginBottom:8}}>{pushData.pushWay=='email'?'邮件通知':'短信通知'}</div>
+                            <div>{noticeTest}</div>
+                        </div>
                     </TabPane>
                 </Tabs>
             </SideSheet>
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.less b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.less
index a831f80..e4cecc9 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.less
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.less
@@ -5,4 +5,48 @@
     .semi-tabs-tab-active{
         color: #1859C1;
     }
+    .semi-sidesheet-body{
+        padding:0px;
+    }
+    .semi-tabs-bar{
+        margin: 0px 24px;
+        border-bottom:none;
+    }
+    .semi-collapse-header{
+        background: #F7F8FA;
+        margin:0px;
+    }
+    .semi-tabs-content{
+        padding:0px;
+    }
+    .semi-collapse-content{
+        padding: 0px;
+    }
+    .online{
+        background: #E7F6EB;
+        color: #007B22;
+        display: flex;
+        align-items: center;
+        height: 22px;
+        justify-content: center;
+        border-radius: 3px;
+    }
+    .offline{
+        background:#FFF6D8;
+        color: #E8B500;
+        display: flex;
+        align-items: center;
+        height: 22px;
+        justify-content: center;
+        border-radius: 3px;
+    }
+    .timing{
+        background: #F0F6FF;
+        color: #1859C1;
+        display: flex;
+        align-items: center;
+        height: 22px;
+        justify-content: center;
+        border-radius: 3px;
+    }
 }
\ No newline at end of file
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
index f42b9c0..a28a636 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
@@ -198,13 +198,12 @@ const Carrierpigeon = (props) => {
                         </Button>
                         <Button onClick={()=>{
                             dispatch(offline.getPushLog(row.id)).then((res) => {
-                                // equipmentGetStatusPush();
                                 setJournal(res.payload.data);
-                                setSideSheetVisible(true);
                                 setPushData(row);
+                                setSideSheetVisible(true);
                             });
                         }} theme="borderless">
-                            日志
+                            查看
                         </Button>
                     </div>
                 );
@@ -376,7 +375,7 @@ const Carrierpigeon = (props) => {
                         >
                             <Form.Select.Option value="">全部</Form.Select.Option>
                             <Form.Select.Option value="phone">短信通知</Form.Select.Option>
-                            <Form.Select.Option value="email ">邮件通知</Form.Select.Option>
+                            <Form.Select.Option value="email">邮件通知</Form.Select.Option>
                         </Form.Select>
                     </Form>
                     <div
@@ -479,8 +478,7 @@ const Carrierpigeon = (props) => {
                 >
                     <Table
                         columns={setupp.filter((s) => s)}
-                        // dataSource={StatusPushList.data}
-                        dataSource={StatusPushList}
+                        dataSource={StatusPushList.rows}
                         bordered={false}
                         empty="暂无数据"
                         style={{
@@ -498,10 +496,10 @@ const Carrierpigeon = (props) => {
                     }}
                 >
                     <span style={{ lineHeight: "30px" }}>
-                        共{StatusPushList.total}条策略
+                        共{StatusPushList.count}条策略
                     </span>
                     <Pagination
-                        total={StatusPushList.total}
+                        total={StatusPushList.count}
                         showSizeChanger
                         currentPage={query.page + 1}
                         pageSizeOpts={[10, 20, 30, 40]}
@@ -556,8 +554,7 @@ function mapStateToProps (state) {
         user: auth.user,
         actions: global.actions,
         members: members.data,
-        StatusPushList: StatusPushList.data || [],
-        // StatusPushList: StatusPushList.data || {},
+        StatusPushList: StatusPushList.data || {},
     };
 }
 
diff --git a/code/VideoAccess-VCMP/web/client/src/utils/webapi.js b/code/VideoAccess-VCMP/web/client/src/utils/webapi.js
index 4f376c7..efc5a40 100644
--- a/code/VideoAccess-VCMP/web/client/src/utils/webapi.js
+++ b/code/VideoAccess-VCMP/web/client/src/utils/webapi.js
@@ -47,7 +47,7 @@ export const ApiTable = {
    getStatusSimpleAll:'status/simple_all',//获取全部状态码简略信息
    getCameraListAll:'camera/listAll',//获取所有摄像头信息
    getStatusPush:'status/push',//获取推送配置
-   putSasdtatusPush:'sasdtatus/push',//编辑推送配置
+   putSasdtatusPush:'status/push',//编辑推送配置
    delPush:'status/push/{configId}',//删除推送配置
    putPushBanned:'status/push/banned',//禁用推送配置
    getPushCopy:'status/push/{configId}/copy',//复制推送配置
diff --git a/code/VideoAccess-VCMP/web/package.json b/code/VideoAccess-VCMP/web/package.json
index 92c61fc..b11736a 100644
--- a/code/VideoAccess-VCMP/web/package.json
+++ b/code/VideoAccess-VCMP/web/package.json
@@ -7,7 +7,7 @@
       "test": "mocha",
       "start-vite": "cross-env NODE_ENV=developmentVite npm run start-params",
       "start": "cross-env NODE_ENV=development npm run start-params",
-      "start-params": "node server -p 5000 -u http://10.8.30.24:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://10.8.30.24:4200 --apiAnxinyunUrl http://10.8.30.24:4100  --iotAuthWeb http://localhost:5200 --iotVideoServer ws://221.230.55.27:8081",
+      "start-params": "node server -p 5000 -u http://10.8.30.34:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://10.8.30.34:4200 --apiAnxinyunUrl http://10.8.30.34:4100  --iotAuthWeb http://localhost:5200 --iotVideoServer ws://221.230.55.27:8081",
       "deploy": "export NODE_ENV=production&& npm run build && node server",
       "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js",
       "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js"

From 707567a13952890a90a3ce2ccb217006c0ef2639 Mon Sep 17 00:00:00 2001
From: deartibers <947466799@qq.com>
Date: Wed, 3 Aug 2022 11:55:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/images/background/icon_camera.png     | Bin 0 -> 1990 bytes
 .../assets/images/background/icon_email.png      | Bin 0 -> 1313 bytes
 .../assets/images/background/icon_phone.png      | Bin 0 -> 561 bytes
 .../offline/components/pushSideSheet.jsx         |  12 ++++++++++--
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/icon_camera.png
 create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/icon_email.png
 create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/background/icon_phone.png

diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_camera.png b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..4464f9f6c28155e093bcb4451230c1fd075be86c
GIT binary patch
literal 1990
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
Y0p6!aUicauz5oCK07*qoM6N<$g0BM1X8-^I

literal 0
HcmV?d00001

diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_email.png b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..184799fc128eeac9512bfcc496ef8703a634771d
GIT binary patch
literal 1313
zcmV++1>X9JP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(+et)0RA@u(n15(hWf;f5&$+w1lgY4#K_QbXhDJrdh#<;2sgPJvX`@KaxxZX(
zrny`s(eR*x1=@_^ribm^a}I^LvIt#2B>WK;K@b**g1FhFLPo~uHr?*-`NmmpEOTDn
zxpyYr^Y43}=Y2lk@AIDbyszLof8;u^9|eGG?O?%yf&)GkD727I0ey!T9Plln&jkMu
z2V$DG1Y{F{+X)o;6zz(_1sDc!6e1f;+ul7<P*w*Lk;pR{*Bwb9z+nLAuc!ilFO?8@
zXf#DYQI@n@)<>60nH3<Ws^1g1=K{b7i>s@juc@iY_^WT?XkFKfd%L@L6Q~C8iHIx&
z*=;(`y^{mbv?2Vh{2<B2BC@k09A2jDx|?f=+S=OS@Zex4$)`l*<BD*&=BMuNy&|&6
zwC&<a0Yp`m0_?3&lxKTgcMpL_M8v5GhoiZK&~?42x2I<($)yn46AXox7>1FKsj4?;
zb<%Mz*)3UHXcWM7oF^I@8m9H1J=;aH3V><ac0xqx*NM)~&cNqgUGI^64#20g=gfIp
z*LBZ%<P^Y5*x1-u`deS$XCNOI5u?MhUh)H>>$-Bfr^j~5Wg@b#w5;sOmX?;mQBiUZ
z;3clFub+M{mHGm}gCercwC$HC;{r*EM<OQ42!Q=F%FC;po14##&y^PdZ-SL8SC;+R
z-@lK*10u53wC#qgffy-X({>P8F2JFpl9I;_!x*?YN8SLuiB?A<Gy2IdLEZ<E%}LvS
z?Mflyn%3%)bt3Y0Noncg*4Eb4rDF36;7wRpS9intfr0%X?}o^xq;0>E4I-v#?~+^v
zk#8jsc+51-KPHOFJAgOwiWMu$2U4j6An#N})_2(Uy2})_g}|#2`7Rg=J!%+6|K)(E
z1i&jG8ja3`>wX1tz9Q1pVcQ%3)z6X0TXfym1^6LUT3XfC*7kc=w{p1;Tvn-A>@H+7
z`$^vDy{7<cI~?cj(U_>FZ2<Y^$S;Y=nIe&ehGiZ9PXNT@@jIAK9{@0eBC7y2fV@>i
z8co~Y5>wT61aycT1z-r!4Dw7+Q7U&>)`@G{LWxA;w#?AbK>+1}K;VV;WO7#`k(lMC
z(}zgT5s^NUGX*%N6c<;ux3`~(YFZRz2Sk1e0+ohspS&iEI2Mb|V<vM@fSUlQrft7J
zwu8oEw_td9D@E=H`3(Yr)yZVCZ)`jgSx(p80pN5<Q7X4v)~PA|jK<^fxf~w$RK8gh
zC1zTdm93vI9*;*N^{(q~gUG31C{$?}M(>ntWQjx~oJpq-ft;lPwH=PreznDqz8_cB
zS6pB#L{5gt%I%Kxb6$TX;_>)wdi@Q|hDd$Vw%aCK{8&3_+8UCZA#&n^6Tgm)<?=K7
zkHx7dt4zyk@mu`3HL;eiy9px41Hs@zZ?Su0IorrkRP-Xeo(JZNqO373>z!N`KMtaa
zuDgEZbE_y--lF#n5Yx0F0!M@_BQWpc4Jzjls=A&)lZgB{ZTj>@=TfO%02WO8NICvc
zKhZBj9w0UmSPPLO0OkvMY|@AN(Q6g&o`xcah4k)g^8OH50AS=G@9SE{OAuAnr2=^W
zF;jlAMPOsnaXy?#v8;#syi4tKf&zd~0ey!T9Plln&jbYrd<y70yx@Ru34JEG?j86G
XV&<byIhF$$00000NkvXXu0mjfb>Mw`

literal 0
HcmV?d00001

diff --git a/code/VideoAccess-VCMP/web/client/assets/images/background/icon_phone.png b/code/VideoAccess-VCMP/web/client/assets/images/background/icon_phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..770340a211fc19d10858f7449cf6b08622367ed3
GIT binary patch
literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$>q$gGRA@u(Sv^baP!K(H-G{3`L+l>%O0}@FQTzo8cTFA^B3RgHBd#C_79uu6
zKw|>${Q~tBue4BGZT$n5HY!N&NS0Mx&^Xz|kHtxSX70>6XD6GvgbshG!|R7O@YxEg
z0;)hk2EM0-JkOheb9G|=#XzMXiH&d~x@X`V#?-?wJdozht$=Us7z0Pr1KPn6FuoVZ
z|0J>PG;qqmAOV*!W*f{ml7rsF5cR^jc?S9kINOWkp*Lev<s_iz7_U~l1#{IHGqt<F
z|2J=Z7XJ72^rUm{4~Xu<DC&{q&fkEw-0*A;nI(m!nCJEk<5*Oi2-Kp0Ht@P0s({3+
zo?1vP)WU#HA<6GXiqR<~VM?b^21{xowUC4XwNNVq`XVdnnwD^#LJ~HgUS!71b}=7I
zVx*XaXoQ{HN%8OgNhvL=U7R-X8gq{p0?|Sj(Mh`uzZ91+4}*F0Lo6g&tN6a(ha_1C
z^Hrr<T?&FAa|!n4rjTdtA%O7)+eC|D6m4WF_T?Jzt^LoyXj-%(THcMKwa;%L$7*q=
zR{NPSZ-MBl(%n551i^Jy10S+l^sVje<!;BX*Ha5LFE~~S7+~ffWsK711;+)9S$WqB
zjxvfZGe_>f(`6oBMlNlj3>J&zPz8#xS4QjuBlmegtO0~!00000NkvXXu0mjfU_$-X

literal 0
HcmV?d00001

diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
index f02da93..fccf34e 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
@@ -126,13 +126,21 @@ function pushSideSheet (props) {
                     </TabPane>
                     <TabPane tab="监听范围" itemKey="2">
                         <div style={{margin:'12px 36px',fontSize:12,color:'rgba(0,0,0,0.6500)'}}>
-                            <div style={{marginBottom:8}}>摄像头名称</div>
+                            <img
+                                src="/assets/images/background/icon_camera.png"
+                                alt="设置"
+                                style={{ width: 24, height: 24 }}
+                            />
                             <div>{equipmentTest}</div>
                         </div>
                     </TabPane>
                     <TabPane tab="接收信息" itemKey="3">
                         <div style={{margin:'12px 36px',fontSize:12,color:'rgba(0,0,0,0.6500)'}}>
-                            <div style={{marginBottom:8}}>{pushData.pushWay=='email'?'邮件通知':'短信通知'}</div>
+                            <img
+                                src={pushData.pushWay=='email'?"/assets/images/background/icon_email.png":"/assets/images/background/icon_phone.png"}
+                                alt="设置"
+                                style={{ width: 24, height: 24 }}
+                            />
                             <div>{noticeTest}</div>
                         </div>
                     </TabPane>

From 50b5cdaeb164babbaeb7282b3bb167bb9093782b Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Wed, 3 Aug 2022 13:33:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=A1=E9=B8=BD=E6=8E=A8=E9=80=81=2080%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/app/lib/controllers/status/push.js    |  63 +++++--
 code/VideoAccess-VCMP/api/app/lib/index.js    |  17 +-
 .../lib/models/camera_status_offline_log.js   |  52 ++++++
 .../api/app/lib/schedule/cameraStatePush.js   | 170 +++++++++++++++++-
 .../api/app/lib/schedule/freshYingshiMsg.js   |  29 ++-
 .../api/app/lib/schedule/index.js             |   4 +-
 .../api/app/lib/utils/push.js                 |   6 +-
 .../api/sequelize-automate.config.js          |   2 +-
 8 files changed, 308 insertions(+), 35 deletions(-)
 create mode 100644 code/VideoAccess-VCMP/api/app/lib/models/camera_status_offline_log.js

diff --git a/code/VideoAccess-VCMP/api/app/lib/controllers/status/push.js b/code/VideoAccess-VCMP/api/app/lib/controllers/status/push.js
index a2b4055..91f5253 100644
--- a/code/VideoAccess-VCMP/api/app/lib/controllers/status/push.js
+++ b/code/VideoAccess-VCMP/api/app/lib/controllers/status/push.js
@@ -11,20 +11,55 @@ async function edit (ctx) {
          receiver, cameraId
       } = ctx.request.body;
 
+
       let configId_ = configId
+      let receiverSorted = receiver.sort()
+      let cameraIdSorted = cameraId.sort()
+      let noticeWaySorted = noticeWay.sort()
+      let editDataExist = false
       // 判重
-
+      const configAllRes = await models.CameraStatusPushConfig.findAll({
+         include: [{
+            model: models.CameraStatusPushMonitor,
+            attributes: ['cameraId'],
+            required: false,
+            duplicating: true,
+         }, {
+            model: models.CameraStatusPushReceiver,
+            attributes: ['receiver'],
+            duplicating: false,
+            required: false,
+         },]
+      })
+      for (let c of configAllRes) {
+         if (configId_ && c.id == configId_) {
+            editDataExist = true
+            continue
+         } else if (c.name == name) {
+            throw '已有同名称配置信息'
+         }
+         const cReceiver = c.cameraStatusPushReceivers.map(r => r.receiver)
+         const cCameraId = c.cameraStatusPushMonitors.map(m => m.cameraId)
+         const cReceiverSorted = cReceiver.sort()
+         const cCameraIdSorted = cCameraId.sort()
+         if (
+            receiverSorted.join(',') == cReceiverSorted.join(',') && cameraIdSorted.join(',') == cCameraIdSorted.join(',') &&
+            c.pushWay == pushWay &&
+            c.noticeWay.sort().join(',') == noticeWaySorted.join(',') &&
+            (
+               (!c.timing && !timing) ||
+               c.timing == timing
+            )
+         ) {
+            throw '已有相同配置信息'
+         }
+      }
 
       let config = {
          name, pushWay, noticeWay, timing
       }
       if (configId) {
-         const configRes = await models.CameraStatusPushConfig.findOne({
-            where: {
-               id: configId
-            }
-         })
-         if (!configRes) {
+         if (!editDataExist) {
             throw '参数错误'
          } else {
             // DO UPDATE
@@ -89,7 +124,7 @@ async function get (ctx) {
    try {
       const models = ctx.fs.dc.models;
       const { userId, token } = ctx.fs.api
-      const { limit, page, orderBy, orderDirection, keyword, pushWay } = ctx.query
+      const { limit, page, orderBy, orderDirection, name, pushWay } = ctx.query
 
       const sequelize = ctx.fs.dc.ORM;
       let findOption = {
@@ -104,13 +139,16 @@ async function get (ctx) {
       if (page && limit) {
          findOption.offset = page * limit
       }
-      if (keyword) {
+      if (name) {
          findOption.where['$or'] = {
             name: {
-               $like: `%${keyword}%`
+               $like: `%${name}%`
             },
          }
       }
+      if (pushWay) {
+         findOption.where.pushWay = pushWay
+      }
 
       const configLimitRes = await models.CameraStatusPushConfig.findAll(findOption)
 
@@ -131,6 +169,7 @@ async function get (ctx) {
          'cameraStatusPushMonitors.id',
          'cameraStatusPushLogs.id',
          'cameraStatusPushReceivers.id',
+         'cameraStatusPushMonitors->camera.id',
       ]
       findOption.order = [
          [orderBy || 'id', orderDirection || 'DESC']
@@ -141,6 +180,10 @@ async function get (ctx) {
             attributes: ['cameraId'],
             required: false,
             duplicating: true,
+            include: [{
+               model: models.Camera,
+               attributes: ['name'],
+            }]
          },
          {
             model: models.CameraStatusPushLog,
diff --git a/code/VideoAccess-VCMP/api/app/lib/index.js b/code/VideoAccess-VCMP/api/app/lib/index.js
index b50280c..3b9484e 100644
--- a/code/VideoAccess-VCMP/api/app/lib/index.js
+++ b/code/VideoAccess-VCMP/api/app/lib/index.js
@@ -46,15 +46,6 @@ module.exports.entry = function (app, router, opts) {
 module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Sequelize, models: {} }
    // 加载定义模型 历史写法
    // require('./models/nvr')(dc);
-   // require('./models/camera_ability')(dc);
-   // require('./models/camera_kind')(dc);
-   // require('./models/camera')(dc);
-   // require('./models/camera_ability_bind')(dc);
-   // require('./models/vender')(dc);
-   // require('./models/secret_yingshi')(dc);
-   // require('./models/gb_camera')(dc);
-   // require('./models/ax_project')(dc);
-   // require('./models/camera_remark')(dc);
 
    // 模型关系摘出来 初始化之后再定义关系才行
    fs.readdirSync(path.join(__dirname, '/models')).forEach((filename) => {
@@ -64,7 +55,7 @@ module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Seq
    const {
       Nvr, Camera, CameraAbility, CameraAbilityBind, CameraKind, CameraRemark,
       GbCamera, SecretYingshi, Vender, CameraStatus, CameraStatusResolve, CameraStatusLog,
-      CameraStatusPushConfig, CameraStatusPushMonitor, CameraStatusPushLog, CameraStatusPushReceiver,
+      CameraStatusPushConfig, CameraStatusPushMonitor, CameraStatusPushLog, CameraStatusPushReceiver, CameraStatusOfflineLog
    } = dc.models;
 
    // Nvr.belongsTo(User, { foreignKey: 'userId', targetKey: 'id' });
@@ -105,9 +96,15 @@ module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Seq
    CameraStatusPushMonitor.belongsTo(CameraStatusPushConfig, { foreignKey: 'configId', targetKey: 'id' });
    CameraStatusPushConfig.hasMany(CameraStatusPushMonitor, { foreignKey: 'configId', sourceKey: 'id' });
 
+   CameraStatusPushMonitor.belongsTo(Camera, { foreignKey: 'cameraId', targetKey: 'id' });
+   Camera.hasMany(CameraStatusPushMonitor, { foreignKey: 'cameraId', sourceKey: 'id' });
+
    CameraStatusPushLog.belongsTo(CameraStatusPushConfig, { foreignKey: 'pushConfigId', targetKey: 'id' });
    CameraStatusPushConfig.hasMany(CameraStatusPushLog, { foreignKey: 'pushConfigId', sourceKey: 'id' });
 
    CameraStatusPushReceiver.belongsTo(CameraStatusPushConfig, { foreignKey: 'configId', targetKey: 'id' });
    CameraStatusPushConfig.hasMany(CameraStatusPushReceiver, { foreignKey: 'configId', sourceKey: 'id' });
+
+   CameraStatusOfflineLog.belongsTo(Camera, { foreignKey: 'cameraId', targetKey: 'id' });
+   Camera.hasMany(CameraStatusOfflineLog, { foreignKey: 'cameraId', sourceKey: 'id' });
 };
diff --git a/code/VideoAccess-VCMP/api/app/lib/models/camera_status_offline_log.js b/code/VideoAccess-VCMP/api/app/lib/models/camera_status_offline_log.js
new file mode 100644
index 0000000..5d27b2c
--- /dev/null
+++ b/code/VideoAccess-VCMP/api/app/lib/models/camera_status_offline_log.js
@@ -0,0 +1,52 @@
+/* eslint-disable*/
+'use strict';
+
+module.exports = dc => {
+  const DataTypes = dc.ORM;
+  const sequelize = dc.orm;
+  const CameraStatusOfflineLog = sequelize.define("cameraStatusOfflineLog", {
+    id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: null,
+      comment: null,
+      primaryKey: true,
+      field: "id",
+      autoIncrement: true,
+      unique: "camera_status_offline_log_id_uindex"
+    },
+    cameraId: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "camera_id",
+      autoIncrement: false
+    },
+    status: {
+      type: DataTypes.STRING,
+      allowNull: false,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "status",
+      autoIncrement: false
+    },
+    time: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "time",
+      autoIncrement: false
+    }
+  }, {
+    tableName: "camera_status_offline_log",
+    comment: "",
+    indexes: []
+  });
+  dc.models.CameraStatusOfflineLog = CameraStatusOfflineLog;
+  return CameraStatusOfflineLog;
+};
\ No newline at end of file
diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js b/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js
index 72c389e..252b305 100644
--- a/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js
+++ b/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js
@@ -3,16 +3,178 @@ const moment = require('moment')
 module.exports = function (app, opts) {
    const cameraOnlinePush = app.fs.scheduleInit(
       {
-         // interval: '* * 4 * * *',
-         interval: '*/15 * * * *',
+         interval: '* */15 * * * *',
+         // interval: '*/15 * * * * *',
          immediate: false,
+         proRun: false,
       },
       async () => {
          try {
-            
+            const { models } = app.fs.dc
+            const { pushBySms, pushByEmail } = app.fs.utils
+            const configRes = await models.CameraStatusPushConfig.findAll({
+               where: {
+                  forbidden: false
+               },
+               include: [
+                  {
+                     model: models.CameraStatusPushMonitor,
+                     attributes: ['cameraId'],
+                     required: false,
+                     duplicating: true
+                  },
+                  {
+                     model: models.CameraStatusPushReceiver,
+                     attributes: ['receiver'],
+                     duplicating: false,
+                     required: false,
+                  },
+               ],
+            })
+
+            const timeNow = moment().format()
+            for (let c of configRes) {
+               // 查配置信息所对应的摄像头15min内的在离线状态
+               const cameraIds = c.cameraStatusPushMonitors.map(m => m.cameraId)
+               const offlineStatusRes = await models.CameraStatusOfflineLog.findAll({
+                  where: {
+                     cameraId: { $in: cameraIds },
+                     time: {
+                        $between: [moment(timeNow).subtract(15, 'minutes').format(), timeNow]
+                     }
+                  },
+                  include: [{
+                     model: models.Camera,
+                     attributes: ['name']
+                  }],
+                  order: [['time', 'ASC']],
+               })
+
+
+
+               if (offlineStatusRes.length) {
+                  const cameraStatusMap = {}
+                  // 当前逻辑
+                  // 只要最后状态是离线 就做离线推送
+                  // 只要出现一次上线 就做上线推送
+                  for (let s of offlineStatusRes) {
+                     if (cameraStatusMap[s.cameraId]) {
+                        cameraStatusMap.status.push({
+                           cameraId: s.cameraId,
+                           status: s.status,
+                           time: s.time,
+                        })
+                     } else {
+                        cameraStatusMap[s.cameraId] = {
+                           status: [{
+                              cameraId: s.cameraId,
+                              status: s.status,
+                              time: s.time,
+                           }],
+                           name: s.camera.name,
+                        }
+                     }
+                  }
+                  let offArr = []
+                  let onArr = []
+                  for (let k in Object.keys(cameraStatusMap).sort()) {
+                     const data = cameraStatusMap[k]
+                     if (data.status[0].status == 'OFF') {
+                        offArr.push({
+                           name: data.name,
+                           time: data.status[0].time,
+                        })
+                     }
+                     const onLineIndex = data.status.findIndex(s => s.status == 'ON')
+                     if (onLineIndex >= 0) {
+                        const onLineLastOffIndex = data.status.findIndex((s, i) => s.status == 'OFF' && i > onLineIndex)
+                        let onlineData = {
+                           cameraId: data.status[onLineIndex].cameraId,
+                           name: data.status[onLineIndex].name,
+                           time: data.status[onLineIndex].time,
+                        }
+                        if (onLineLastOffIndex >= 0) {
+                           onlineData.offTime = data.status[onLineLastOffIndex].time
+                        }
+                        onArr.push(onlineData)
+                     }
+                  }
+
+                  // 查当前配置由谁配置
+                  const corUser = await app.fs.authRequest.get(`user/${c.createUser}/message`, {
+                     query: {
+                        // TODO 这里拿不到 token 去鉴权 怎么能系统间鉴权呢
+                        // 暂时取消了鉴权系统对这里的判断
+                        token: ''
+                     }
+                  })
+
+                  const receiver = c.cameraStatusPushReceivers.map(r => r.receiver)
+                  // 离线推送
+                  if (offArr.length && c.noticeWay && c.noticeWay.includes('offline')) {
+                     if (c.pushWay == 'email') {
+                        // 邮件
+                        let text = `【${corUser[0].namePresent}】账号下的设备，截止【${moment(timeNow).format('YYYY年HH时mm分')}】，有${offArr.length}个设备掉线：\n`
+                        text += offArr.map(o => `【${o.name}】于【${o.time}】掉线，`).join('\n')
+                        text += `\n请及时处理！`
+                        await pushByEmail({
+                           email: receiver,
+                           title: '',
+                           text,
+                        })
+                     } else if (c.pushWay == 'phone') {
+                        // 短信
+                        let text = `【${corUser[0].namePresent}】账号下的`
+                        if (offArr.length == 1) {
+                           text += `【${offArr[0].name}】离线，请及时处理！【${moment(offArr[0].time).format('YYYY年HH时mm分')}】`
+                        } else {
+                           text += offArr.map(o => `【${o.name}】`).join('')
+                           if (text.length > 35) {
+                              text = text.substring(0, 35) + '...'
+                              text += `等${offArr.length}个摄像头离线`
+                           }
+                           text += `，请及时处理！【${moment().format('MM月DD日HH时mm分')}-${moment(timeNow).subtract(15, 'minutes').format('MM月DD日HH时mm分')}】`
+                        }
+                        await pushBySms({
+                           phone: receiver,
+                           templateCode: '',
+                           templateParam: '',
+                           text
+                        })
+                     }
+                  }
+
+                  // 上线推送
+                  if (onArr.length && c.noticeWay && c.noticeWay.includes('online')) {
+                     if (c.pushWay == 'email') {
+                        // 邮件
+                        // const outTimeCameraOff = onArr.filter(a => !a.offTime)
+                        // if (outTimeCameraOff.length) {
+                        //    let cameraIds = outTimeCameraOff.map(a => a.cameraId)
+                        //    const lastOfflineRes = await models.CameraStatus.findAll({
+                        //       where: {
+                        //          cameraId: { $in: cameraIds },
+                        //          status: 'OFF',
+                        //          time: {
+                        //             $lt: moment(timeNow).subtract(15, 'minutes').format()
+                        //          }
+                        //       },
+                        //       group: ['cameraId'],
+                        //       attributes: ['cameraId', [sequelize.fn('max', sequelize.col('time')), 'time']],
+                        //    })
+
+                        // }
+
+                     } else if (c.pushWay == 'phone') {
+                        // 短信
+                     }
+                  }
+               }
+            }
+
             console.log('cameraOnlinePush')
          } catch (error) {
-            
+
          }
       }
    )
diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js
index b6dd362..941015e 100644
--- a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js
+++ b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js
@@ -4,9 +4,10 @@ const moment = require('moment')
 module.exports = function (app, opts) {
    const freshYingshiState = app.fs.scheduleInit(
       {
-         // interval: '* * 4 * * *',
-         interval: '*/10 * * * *',
+         interval: '* */5 * * * *',
+         // interval: '*/10 * * * *',
          immediate: false,
+         proRun: true,
       },
       async () => {
 
@@ -49,22 +50,39 @@ module.exports = function (app, opts) {
                            if (existD.online != storageD.online) {
                               // 状态更新
                               if (storageD.online == 'ON' && !existD.playUrl) {
+                                 // 播放地址更新
                                  const playUrlRes = await getYingshiPlayUrl({ deviceSerial: d.deviceSerial, token: tokenYingshi })
                                  storageD.playUrl = playUrlRes
                               }
+                              // 在离线状态更新
                               await models.GbCamera.update(storageD, {
                                  where: {
                                     id: existD.id
                                  }
                               })
-                              // 状态更新 END
-
-                              // 状态推送
+                              // 状态向前端页面推送
                               cameraStatePush({
                                  gbId: existD.id,
                                  online: storageD.online,
                                  ipctype: storageD.ipctype,
                               })
+                              // 记录日志
+                              const cameraRes = await models.Camera.findAll({
+                                 where: {
+                                    gbId: existD.id
+                                 }
+                              })
+                              const nowTime = moment().format()
+                              let bulkCreateData = cameraRes.map(c => {
+                                 return {
+                                    cameraId: c.id,
+                                    status: storageD.online,
+                                    time: nowTime
+                                 }
+                              })
+                              if (bulkCreateData.length) {
+                                 await models.CameraStatusOfflineLog.bulkCreate(bulkCreateData)
+                              }
                            }
                         } else {
                            const yingshiRes = await models.GbCamera.create(storageD)
@@ -99,6 +117,7 @@ module.exports = function (app, opts) {
          // interval: '*/30 * * * *',
          interval: '0 34 5 1 * *',
          immediate: true,
+         proRun: true,
       },
       async () => {
          try {
diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/index.js b/code/VideoAccess-VCMP/api/app/lib/schedule/index.js
index d28db8c..e8f4137 100644
--- a/code/VideoAccess-VCMP/api/app/lib/schedule/index.js
+++ b/code/VideoAccess-VCMP/api/app/lib/schedule/index.js
@@ -7,10 +7,10 @@ const nodeSchedule = require('node-schedule');
 module.exports = async function (app, opts) {
 
    const scheduleInit = ({
-      interval, immediate
+      interval, immediate, proRun,
    }, callback) => {
       const j = nodeSchedule.scheduleJob(interval, callback);
-      if (immediate && !opts.dev) {
+      if (immediate && (!proRun || (proRun && !opts.dev))) {
          setTimeout(callback, 0)
       }
       return j;
diff --git a/code/VideoAccess-VCMP/api/app/lib/utils/push.js b/code/VideoAccess-VCMP/api/app/lib/utils/push.js
index a46dc9e..cb2e9b5 100644
--- a/code/VideoAccess-VCMP/api/app/lib/utils/push.js
+++ b/code/VideoAccess-VCMP/api/app/lib/utils/push.js
@@ -5,7 +5,7 @@ const Core = require('@alicloud/pop-core');
 const nodemailer = require('nodemailer')
 
 module.exports = function (app, opts) {
-   const pushBySms = async ({ phone = [] } = {}) => {
+   const pushBySms = async ({ phone = [], templateCode, templateParam } = {}) => {
       try {
          if (phone.length) {
             const client = new Core({
@@ -29,7 +29,7 @@ module.exports = function (app, opts) {
       }
    }
 
-   const pushByEmail = async () => {
+   const pushByEmail = async ({ email = [], title, text = '', html = '', attachments = undefined } = {}) => {
       try {
          let transporter = nodemailer.createTransport({
             host: opts.email.host,
@@ -44,7 +44,7 @@ module.exports = function (app, opts) {
          // send mail with defined transport object
          await transporter.sendMail({
             from: 'grazing-stars@qq.com', // sender address
-            to: email, // list of receivers 逗号分隔字符串
+            to: email.join(','), // list of receivers 逗号分隔字符串
             subject: title, // Subject line
             text: text, // plain text body
             html: html, // html body
diff --git a/code/VideoAccess-VCMP/api/sequelize-automate.config.js b/code/VideoAccess-VCMP/api/sequelize-automate.config.js
index efc91da..aaf2887 100644
--- a/code/VideoAccess-VCMP/api/sequelize-automate.config.js
+++ b/code/VideoAccess-VCMP/api/sequelize-automate.config.js
@@ -26,7 +26,7 @@ module.exports = {
       dir: './app/lib/models', // 指定输出 models 文件的目录
       typesDir: 'models', // 指定输出 TypeScript 类型定义的文件目录，只有 TypeScript / Midway 等会有类型定义
       emptyDir: false, // ！！！ 谨慎操作 生成 models 之前是否清空 `dir` 以及 `typesDir`
-      tables: ['camera_status_push_log'], // 指定生成哪些表的 models，如 ['user', 'user_post']；如果为 null，则忽略改属性
+      tables: ['camera_status_offline_log'], // 指定生成哪些表的 models，如 ['user', 'user_post']；如果为 null，则忽略改属性
       skipTables: [], // 指定跳过哪些表的 models，如 ['user']；如果为 null，则忽略改属性
       tsNoCheck: false, // 是否添加 `@ts-nocheck` 注释到 models 文件中
       ignorePrefix: [], // 生成的模型名称忽略的前缀，因为 项目中有以下表名是以 t_ 开头的，在实际模型中不需要， 可以添加多个 [ 't_data_', 't_',] ,长度较长的 前缀放前面