(*)解决冲突

api/app/lib/controllers/alarm/video.js

@@ -6,6 +6,12 @@ async function deviceType (ctx) {
    try {
       const { models } = ctx.fs.dc;
       const { clickHouse } = ctx.app.fs
+      const { database: anxinyun } = clickHouse.anxinyun.opts.config
+      const { utils: { judgeSuper, anxinStrucIdRange } } = ctx.app.fs
+      let anxinStruc = await anxinStrucIdRange({
+         ctx,
+      })
+      const anxinStrucIds = anxinStruc.map(a => a.strucId)
 
       const kindRes = await clickHouse.vcmp.query(`
          SELECT DISTINCT
@@ -16,6 +22,10 @@ async function deviceType (ctx) {
          INNER JOIN camera_status_alarm
             ON camera.channel_no = camera_status_alarm.channel_no
             AND camera.serial_no = camera_status_alarm.serial_no
+         INNER JOIN ${anxinyun}.t_video_ipc
+            ON toString(${anxinyun}.t_video_ipc.channel_no) = camera_status_alarm.channel_no
+            AND ${anxinyun}.t_video_ipc.serial_no = camera_status_alarm.serial_no
+            ${`WHERE ${anxinyun}.t_video_ipc.structure IN (${anxinStrucIds.join(',')})`}
       `).toPromise()
       ctx.status = 200;
       ctx.body = kindRes
@@ -28,13 +38,46 @@ async function deviceType (ctx) {
    }
 }
 
+async function exceptionType(ctx) {
+   try {
+      const { models } = ctx.fs.dc;
+      const { clickHouse } = ctx.app.fs
+      const { database: anxinyun } = clickHouse.anxinyun.opts.config
+      const { utils: { judgeSuper, anxinStrucIdRange } } = ctx.app.fs
+      let anxinStruc = await anxinStrucIdRange({
+         ctx,
+      })
+      const anxinStrucIds = anxinStruc.map(a => a.strucId)
+
+      const statusRes = await clickHouse.vcmp.query(`
+         SELECT DISTINCT
+            camera_status.id AS statusId,camera_status.describe AS describe
+         FROM camera_status
+         INNER JOIN camera_status_alarm
+            ON camera_status.id = camera_status_alarm.status_id
+         INNER JOIN ${anxinyun}.t_video_ipc
+            ON toString(${anxinyun}.t_video_ipc.channel_no) = camera_status_alarm.channel_no
+            AND ${anxinyun}.t_video_ipc.serial_no = camera_status_alarm.serial_no
+            ${`WHERE ${anxinyun}.t_video_ipc.structure IN (${anxinStrucIds.join(',')})`}
+      `).toPromise()
+      ctx.status = 200;
+      ctx.body = statusRes
+   } catch (error) {
+      ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+      ctx.status = 400;
+      ctx.body = {
+         message: typeof error == 'string' ? error : undefined
+      }
+   }
+}
+
 async function alarmList (ctx) {
    try {
       const { models } = ctx.fs.dc;
       const { clickHouse } = ctx.app.fs
       const { utils: { judgeSuper, anxinStrucIdRange } } = ctx.app.fs
       const { database: anxinyun } = clickHouse.anxinyun.opts.config
-      const { pepProjectId, keywordTarget, keyword, state, kindId, sustainTimeStart, sustainTimeEnd, limit, page, statusId, toExport} = ctx.query
+      const { pepProjectId, keywordTarget, keyword, state, kindId, sustainTimeStart, sustainTimeEnd, limit, page, statusId, toExport } = ctx.query
 
       let anxinStruc = await anxinStrucIdRange({
          ctx, pepProjectId, keywordTarget, keyword
@@ -78,7 +121,7 @@ async function alarmList (ctx) {
             )
          `)
       }
-      if(statusId){
+      if (statusId) {
          statusAlarmWhereOption.push(`camera_status_alarm.status_id = ${statusId}`)
       }
 
@@ -279,7 +322,7 @@ async function alarmList (ctx) {
    }
 }
 
-async function exportVideoAlarms(ctx, alarmList) {
+async function exportVideoAlarms (ctx, alarmList) {
    let accessType = { yingshi: "萤石云", nvr: "NVR", ipc: "IPC", cascade: "级联" }
    try {
       const { clickHouse, utils: { simpleExcelDown, getExportAlarmHeader } } = ctx.app.fs;
@@ -328,7 +371,7 @@ async function exportVideoAlarms(ctx, alarmList) {
       }
    }
 }
-async function confirm(ctx) {
+async function confirm (ctx) {
    try {
       const { alarmId, content, confirmPost } = ctx.request.body;
       // TODO: 以视频·应用的秘钥进行鉴权
@@ -451,5 +494,6 @@ module.exports = {
    alarmList,
    confirm,
    alarmAdded,
-   vcmpAppAuthToken
+   vcmpAppAuthToken,
+   exceptionType
 };

api/app/lib/routes/alarm/index.js

@@ -60,4 +60,7 @@ module.exports = function (app, router, opts) {
 
    app.fs.api.logAttr['GET/vcmp/auth'] = { content: '获取视频平台应用鉴权token', visible: true };
    router.get('/vcmp/auth', videoAlarm.vcmpAppAuthToken);
+
+   app.fs.api.logAttr['GET/alarm/video/exception_statusId'] = { content: '查询视频异常类型', visible: true };
+   router.get('/alarm/video/exception_statusId', videoAlarm.exceptionType);
 };

web/client/src/sections/control/containers/control.jsx

@@ -155,13 +155,7 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject
             })
          } else {
             if (ProblemAlarm?.length > 0) {
-               ProblemAlarm.sort((a, b) => {
-                  if (moment(a.StartTime).isBefore(b.StartTime)) {
-                     return 1
-                  } else {
-                     return -1
-                  }
-               })
+               ProblemAlarm.sort((a, b) => (moment(a.StartTime).isBefore(b.StartTime) ? 1 : -1))
                setProblemsList([...ProblemAlarm, ...problemsList])
             }
          }
@@ -187,19 +181,12 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject
                }
             })
          }
-         newest.sort((a, b) => {
-            if (moment(a.time).isBefore(b.time)) {
-               return 1
-            } else {
-               return -1
-            }
-         })
+         newest.sort((a, b) => (moment(a.time).isBefore(b.time) ? 1 : -1))
          querydata.current = [...newest, ...querydata.current]
          setQueryData1([...querydata.current])
          
       }
    }, [socketData])
-   console.log(querydata.current);
    useEffect(() => {
       consoleToollink()
 
@@ -423,13 +410,7 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject
                         id: v.id,
                      }))
                   }
-                  data.sort((a, b) => {
-                     if (moment(a.time).isBefore(b.time)) {
-                        return 1
-                     } else {
-                        return -1
-                     }
-                  })
+                  data.sort((a, b) => (moment(a.time).isBefore(b.time) ? 1 : -1))
                   // console.log(data)
                   querydata.current = data
                   setQueryData1(data)
@@ -505,13 +486,7 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject
                               id: v.id,
                            }))
                         }
-                        data.sort((a, b) => {
-                           if (moment(a.time).isBefore(b.time)) {
-                              return 1
-                           } else {
-                              return -1
-                           }
-                        })
+                        data.sort((a, b) => (moment(a.time).isBefore(b.time) ? 1 : -1))
                         querydata.current = data
                         setQueryData1(data)
                      }

web/client/src/sections/install/components/systemModal.jsx

@@ -20,7 +20,8 @@ function adminModal (props) {
       anxincloudArr,//修改时已经选择的安心云列表
       anxinDelete,//修改时安心云项目有删除,显示提示信息
       appArr,//修改时添加应用
-      bindId
+      bindId,
+      mapping //修改时的映射类型
    } = props;
    const { install } = actions;
    const form = useRef();//表单
@@ -236,15 +237,13 @@ function adminModal (props) {
                         }
                      </Form.Select>
                      <Form.Select
-                        label="添加映射分类:"
+                        label="映射分类:"
                         field="mappingClass"
-                        multiple
                         filter
                         placeholder="请选择映射类型"
                         style={{ width: 425 }}
-                        initValue={appArr || []}
+                        initValue={mapping}
                         showClear
-                        renderSelectedItem={renderMultipleWithCustomTag}
                         >
                         {
                            [

web/client/src/sections/install/containers/system.jsx

@@ -27,6 +27,7 @@ const Example = (props) => {
    const [bindId, setBindId] = useState()  //修改时绑定的id
    const [tableKey, setTableKey] = useState([])  //修改时绑定的id
    const page = useRef(query.page);//哪一页
+   const [mapping, setMapping] = useState() //修改时的映射类型
 
 
 
@@ -46,7 +47,7 @@ const Example = (props) => {
 
    const [tableData, setTableData] = useState([])  //表格数据
 
-    const getPepProject = ()=>{
+   const getPepProject = () => {
       dispatch(install.getProjectPmanage(query)).then((res) => {//获取PEP项目管理项目
          setPeplist(res.payload.data)
       })
@@ -60,7 +61,7 @@ const Example = (props) => {
       dispatch(install.getProjectAppList(query)).then((res) => {//获取应用列表
          setAppList(res.payload.data)
       })
-        console.log('user',user);
+      console.log('user', user);
    }, [])
    useEffect(() => {
       getProjectPomsList();
@@ -228,7 +229,7 @@ const Example = (props) => {
         dataIndex: "createTime",
         key: 'time',
         render: (_, row) => {
-                return moment(row.createTime).format("YYYY-MM-DD HH:mm:ss");
+            return moment(row.createTime).format("YYYY-MM-DD HH:mm:ss")||'无';
         }
       },
       {
@@ -236,7 +237,7 @@ const Example = (props) => {
         dataIndex: "updateTime",
         key: 'updateTime',
         render: (_, row) => {
-                return moment(row.updateTime).format("YYYY-MM-DD HH:mm:ss");
+            return (row.updateTime?moment(row.updateTime).format("YYYY-MM-DD HH:mm:ss"):moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"));
         }
       },
       {
@@ -244,7 +245,7 @@ const Example = (props) => {
         dataIndex: "pepUserName",
         key: 'pepUserName',
         render: (_, row) => {
-                return row.pepUserName
+            return row.pepUserName||'无'
         }
       },
       {
@@ -284,9 +285,11 @@ const Example = (props) => {
                            delete myarrarrList[j].projectApp
                            myapparr.push(JSON.stringify(myarrarrList[j]))
                         }
+
                         setAppArr(myapparr)
                         setAnxincloudArr(myanxinArr)
                         setBindId(row.id)
+                        setMapping(row?.mappingClass)
                         setSystemEdit(true)
                      }}
                   >
@@ -310,7 +313,7 @@ const Example = (props) => {
                   >
                      <Button theme="borderless">删除</Button>
                   </Popconfirm>
-                    </div>
+               </div >
             );
          },
       },
@@ -355,6 +358,7 @@ const Example = (props) => {
                         setAppArr([])
                         setAnxincloudArr()
                         setBindId()
+                        setMapping('')
                      }}
                   >
                      添加映射关系
@@ -450,6 +454,7 @@ const Example = (props) => {
                   anxincloudArr={anxincloudArr}
                   pepProjectId={pepProjectId}
                   anxinDelete={anxinDelete}
+                  mapping={mapping}
                   appArr={appArr}
                   bindId={bindId}
                   cancel={() => {

web/client/src/sections/problem/actions/problem.jsx

@@ -149,6 +149,17 @@ export function getAlarmVideoDeviceKind () {   //查询视频设备类型
    });
 }
 
+export function getAlarmVideoExceptionStatusId () {   //查询视频异常类型
+    return dispatch => basicAction({
+       type: 'get',
+       dispatch: dispatch,
+       actionType: 'GET_ALARM_VIDEO_EXCEPTION_STATUS_ID',
+       url: `${ApiTable.getAlarmVideoExceptionStatusId}`,
+       msg: { option: '查询视频异常类型' },
+       reducer: { name: '' }
+    });
+ }
+
 export function putAlarmVideoConfirm (data) {   //确认视频告警
    return dispatch => basicAction({
       type: 'put',

web/client/src/sections/problem/components/sideSheet.jsx

@@ -32,13 +32,7 @@ function SideSheets ({ dispatch, actions, close, alarmId }) {
          dispatch(problem.getAlarmDataDetailAgg({ alarmId: alarmId })).then((res) => {
             if (res?.success) {
                let dataSort = res.payload.data || []
-               dataSort.sort((a, b) => {
-                  if (moment(a.hours).isBefore(b.hours)) {
-                     return -1
-                  } else {
-                     return 1
-                  }
-               })
+               dataSort.sort((a, b) => (moment(a.hours).isBefore(b.hours) ? -1 : 1))
                let data = {
                   grid: {
                      left: '5%',

web/client/src/sections/problem/components/tableData.jsx

@@ -10,14 +10,14 @@ import qs from "qs";
 
 
 const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition, pepProjectId,
-   selected, setSelected, setIfBulk, setConfirm, genre, setGenre, query, setQuery, tableData, setTableData, location, user }) => {
+   selected, setSelected, setIfBulk, setConfirm, genre, setGenre, query, setQuery, tableData, setTableData, location, user, statusId, setStatusId }) => {
    const { problem } = actions
 
    const [count, setCount] = useState(0)  //
    const [checkAll, setCheckAll] = useState(true)  //查询
    const api = useRef();
    const search = useRef({
-      state: '', keywordTarget: '', keyword: '', kindId: '', groupUnitId: '',
+      state: '', keywordTarget: '', keyword: '', kindId: '', groupUnitId: '', statusId: '',
       errType: '', confirmState: '', onlineState: '', sustainTimeStart: '', sustainTimeEnd: ''
    })
    const kindName = useRef()
@@ -153,6 +153,11 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
                setGenre(res.payload.data.map(v => ({ name: v.kind, value: v.id })))
             }
          })
+         dispatch(problem.getAlarmVideoExceptionStatusId()).then((res) => {
+            if (res.success) {
+               setStatusId(res.payload.data.map(v => ({ name: v.describe, value: v.statusId })))
+            }
+         })
       }
    }, [])
 
@@ -326,6 +331,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
                                     keywordTarget: v.keywordTarget,
                                     keyword: v.keyword,
                                     kindId: v.kindId,
+                                    statusId: v.statusId,
                                     groupUnitId: v.groupUnitId,
                                     errType: v.errType,
                                     confirmState: v.confirmState,
@@ -349,6 +355,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
                                  keywordTarget: v.keywordTarget,
                                  keyword: v.keyword,
                                  kindId: v.kindId,
+                                 statusId: v.statusId,
                                  groupUnitId: v.groupUnitId,
                                  errType: v.errType,
                                  confirmState: v.confirmState,

web/client/src/sections/problem/containers/dataAlarm.jsx

@@ -31,6 +31,7 @@ const DataAlarm = (props) => {
    const [content, setContent] = useState(false);  //确认内容
    const [selected, setSelected] = useState([])  //表格被勾选项
    const [genre, setGenre] = useState([])  //搜索类型
+   const [statusId, setStatusId] = useState([])  //异常类型
    const [checkPop, setCheckPop] = useState(false)  //查看弹框是否显现
    const [alarmId, setAlarmId] = useState(false)  //查看alarmId
    const [query, setQuery] = useState({ limit: 10, page: 0 })  //分页
@@ -112,6 +113,10 @@ const DataAlarm = (props) => {
             name: '设备类型', field: 'kindId',
             data: genre,
          },
+         {
+            name: '异常类型', field: 'statusId',
+            data: statusId,
+         },
          {
             name: '异常状态', field: 'state',
             data: [
@@ -424,11 +429,13 @@ const DataAlarm = (props) => {
             selected={selected}
             setSelected={setSelected}
             setGenre={setGenre}
+            setStatusId={setStatusId}
             query={query}
             setQuery={setQuery}
             tableData={tableData}
             setTableData={setTableData}
             genre={genre}
+            statusId={statusId}
             location={props.location?.query}
          />
          {setup ? (

web/client/src/utils/webapi.js

@@ -47,6 +47,7 @@ export const ApiTable = {
    getAlarmVideoDeviceKind: 'alarm/video/device_kind',  //查询视频设备类型
    putAlarmVideoConfirm: 'alarm/video/confirm',    //确认视频告警信息
    getVcmpAuth: 'vcmp/auth',         // 获取视频平台应用鉴权token
+   getAlarmVideoExceptionStatusId: 'alarm/video/exception_statusId',  //查询视频设备类型
 
    //服务-信鸽服务
    getPush: "push",     //获取推送配置列表