free-sun
/
OperationalService
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

dev
巴林闲侠 2 years ago
parent
1c586c4e88 ba2b7596bf
commit
834bea191c
7 changed files with 159 additions and 132 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      api/app/lib/controllers/alarm/app.js
  2. 2
      api/app/lib/controllers/control/toolLink.js
  3. 2
      api/app/lib/schedule/alarms_handle_statistics.js
  4. 18
      web/client/src/sections/control/containers/control.jsx
  5. 101
      web/client/src/sections/problem/components/tableData.jsx
  6. 11
      web/client/src/sections/problem/containers/dataAlarm.jsx
  7. 1
      web/package.json

8
api/app/lib/controllers/alarm/app.js
View File

@ -258,7 +258,7 @@ async function apiErrorList(ctx) {
const models = ctx.fs.dc.models;
const { clickHouse } = ctx.app.fs
const { utils: { anxinStrucIdRange, pomsProjectRange } } = ctx.app.fs
const { keyword, errType, confirmState, sustainTimeStart, sustainTimeEnd, limit, page, pepProjectId } = ctx.query
const { keyword, errType, confirmState, state, sustainTimeStart, sustainTimeEnd, limit, page, pepProjectId } = ctx.query
let pomsProject = await pomsProjectRange({
ctx, pepProjectId,
@ -311,10 +311,10 @@ async function apiErrorList(ctx) {
if (errType) {
findOption.where.type = errType // element / apiError
}
if (confirmState) {
if (confirmState == 'confirmd') {
if (confirmState || state) {
if (confirmState == 'confirmd' || state == 'histroy') {
findOption.where.confirmTime = { $ne: null }
} else if (confirmState == 'unconfirmed') {
} else if (confirmState == 'unconfirmed' || state == 'new') {
findOption.where.confirmTime = null
}
}

2
api/app/lib/controllers/control/toolLink.js
View File

@ -164,8 +164,6 @@ async function count (ctx) {
alarms.StructureId IN (${anxinStrucIds.join(",")})
AND
StartTime BETWEEN '${moment().startOf('day').format('YYYY-MM-DD HH:mm:ss')}' AND '${moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')}'
AND
State < 3
GROUP BY AlarmGroup
`).toPromise()
//今日新增数据告警

2
api/app/lib/schedule/alarms_handle_statistics.js
View File

@ -7,7 +7,7 @@ module.exports = function (app, opts) {
const { database: anxinyun } = clickHouse.anxinyun.opts.config
const alarmHandleStatistics = app.fs.scheduleInit(
{
interval: '0 18 1 ? * 1',//每周一1点18触发
interval: '0 18 1 ? * 3',//每周一1点18触发
// immediate: true,
proRun: true,
},

18
web/client/src/sections/control/containers/control.jsx
View File

@ -23,8 +23,8 @@ let member
let web
const Control = (props) => {
const { dispatch, actions, user, loading, socket, pepProjectId } = props
const Control = ({ dispatch, actions, user, history, loading, socket, pepProjectId }) => {
const { control, install } = actions
const [timelineList, setTimelineList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''])//最新动态列表
@ -171,7 +171,7 @@ const Control = (props) => {
await dispatch(control.getAppAlarmsAggDay({ pepProjectId: pepProjectId })).then(res => {
if (res.success) setAppBI(res.payload.data)
})
await dispatch(control.getAlarmsHandleStatistics({ pepProjectId: pepProjectId })).then(res => {
await dispatch(control.getAlarmsHandleStatistics({ projectCorrelationId: pepProjectId })).then(res => {
if (res.success) setEfficiencyBI(res.payload.data[0])
})
}
@ -681,7 +681,7 @@ const Control = (props) => {
<div id='alarm' style={{ width: 'calc(100% - 200px)', position: 'relative', whiteSpace: 'nowrap', }}>
{exhibition.current['workbench']?.map((item, index) => {
return (
<div key={item.name} style={{ background: item.img, backgroundSize: "100% 100%", display: "inline-block", width: 270, height: 135, marginRight: 26 }}>
pepProjectId && item.name == '关注的项目' ? '' : <div key={item.name} style={{ background: item.img, backgroundSize: "100% 100%", display: "inline-block", width: 270, height: 135, marginRight: 26 }}>
<div style={{ margin: '35px 0px 0px 134px' }}>
<div>
<span style={{ fontSize: 14, color: '#4A4A4A', fontWeight: 500, fontFamily: 'PingFangSC-Medium, PingFang SC' }}>{item.name}</span>
@ -915,7 +915,13 @@ const Control = (props) => {
problemsList?.map((v, index) => {
return (
<div style={{ marginBottom: 15, paddingRight: 30, }} key={'problems' + index} onClick={() => {
dispatch(push(v.url))
history.push({
pathname: v.url,
query: {
keywordTarget: v.groupName == '应用异常' ? "" : 'source',
keyword:v.SourceName,
}
})
}}>
<div style={{ fontSize: 14, color: '#646566' }} >
【{v.SourceName}】{v.groupName}{v.groupName == '视频异常' ? "" : '，诊断为 '} <span style={{ color: '#0F7EFB', borderBottom: '1px dotted #0F7EFB', cursor: "pointer" }} >{v.typeName}，请前往确认</span>
@ -1059,7 +1065,7 @@ const Control = (props) => {
text: v.name,
},
grid: {
left: '5%',
left: '10%',
// right: '4%',
// bottom: '3%',
// containLabel: true

101
web/client/src/sections/problem/components/tableData.jsx
View File

@ -5,23 +5,29 @@ import { SkeletonScreen, } from "$components";
import moment from "moment";
import { validate } from "schema-utils";
import { emit } from "superagent";
import qs from "qs";
const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition, pepProjectId,
selected, setSelected, setIfBulk, setConfirm, setGenre, query, setQuery, tableData, setTableData }) => {
selected, setSelected, setIfBulk, setConfirm, genre, setGenre, query, setQuery, tableData, setTableData, location }) => {
const { problem } = actions
const [count, setCount] = useState(0) //
const [search, setSearch] = useState({}) //查询
const [checkAll, setCheckAll] = useState(true) //查询
const api = useRef();
const search = useRef({
state: '', keywordTarget: '', keyword: '', kindId: '', groupUnitId: '',
errType: '', confirmState: '', onlineState: '', sustainTimeStart: '', sustainTimeEnd: ''
})
const kindName = useRef()
const groupId = useRef()
let title = { dataLnterrupt: "数据中断详情", dataAbnormal: "数据异常详情", strategyHit: "策略命中详情", videoAbnormal: "视频异常详情", useAbnormal: "应用异常详情", deviceAbnormal: "设备异常详情" }
useEffect(() => {
switch (route) {
case 'useAbnormal':
dispatch(problem.getAlarmLnspectionApi({ ...search, pepProjectId: pepProjectId })).then((res) => {
dispatch(problem.getAlarmLnspectionApi({ ...search.current, pepProjectId: pepProjectId })).then((res) => {
if (res.success) {
let typeData = { element: "元素异常", apiError: "接口报错 ", timeout: "加载超时" }
let tableDatas = res.payload.data?.rows.map(v => ({
@ -46,15 +52,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
})
break;
case 'videoAbnormal':
let cameraKind = []
dispatch(problem.getAlarmVideoDeviceKind()).then((res) => {
if (res.success) {
cameraKind = res.payload.data.map(v => ({ name: v.kind, value: v.id }))
setGenre(res.payload.data.map(v => ({ name: v.kind, value: v.id })))
}
})
dispatch(problem.getAlarmVideoList({ ...search, pepProjectId: pepProjectId })).then((res) => {
dispatch(problem.getAlarmVideoList({ ...search.current, pepProjectId: pepProjectId })).then((res) => {
if (res.success) {
let tableDatas = res.payload.data?.map(v => ({
key: v.alarmId,
@ -72,7 +70,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
resolve: v.resolve || [],
cameraChannelNo: v.cameraChannelNo,
cameraSerialNo: v.cameraSerialNo,
cameraKindId: v.cameraKindId ? cameraKind?.find(u => u.value == v.cameraKindId)?.name : "",
cameraKindId: v.cameraKindId ? kindName.current?.find(u => u.value == v.cameraKindId)?.name : "",
venderName: v.venderName,
platform: v.platform,
confirm: v.confirmContent,
@ -85,22 +83,8 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
})
break;
default:
dispatch(problem.getAlarmDataGroup()).then((res) => {
if (res.success) {
let data
if (route == 'dataLnterrupt') data = res.payload.data?.filter(v => v.desc == '数据中断')
if (route == 'dataAbnormal') data = res.payload.data?.filter(v => v.desc == '数据异常')
if (route == 'strategyHit') data = res.payload.data?.filter(v => v.desc == '策略命中')
if (route == 'deviceAbnormal') data = res.payload.data?.filter(v => v.desc == '掉线' || v.desc == '不活跃')
let genreData = []
data?.map(v => {
v?.unit?.map(vv => {
genreData.push({ name: vv.name, value: vv.id })
})
})
setGenre(genreData)
if (data && data[0]?.id) {
dispatch(problem.getAlarmDataList({ ...query, ...search, groupId: data.map(v => v.id).join(), pepProjectId: pepProjectId })).then((res) => {
if (genre?.length > 0) {
dispatch(problem.getAlarmDataList({ ...query, ...search.current, groupId: groupId.current.map(v => v.id).join(), pepProjectId: pepProjectId })).then((res) => {
if (res.success) {
setCount(res.payload.data?.count || 0)
let tableDatas = res.payload.data?.rows?.map(v => ({
@ -113,10 +97,10 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
updateTime: v.EndTime ? moment(v.EndTime).format("YYYY-MM-DD HH:mm:ss") : "",
confirmTime: v.confirmedTime ? moment(v.confirmedTime).format("YYYY-MM-DD HH:mm:ss") : "",
SourceName: v.SourceName,
AlarmGroupUnit: v.AlarmGroupUnit ? genreData.find(r => r.value == v.AlarmGroupUnit)?.name : "无",
Strategy: v.AlarmGroupUnit ? genreData.find(r => r.value == v.AlarmGroupUnit)?.name : "",
type: route == 'deviceAbnormal' ? v.DeviceStatus == 0 ? "离线" : '' : v.AlarmGroupUnit ? genreData.find(r => r.value == v.AlarmGroupUnit)?.name : "",
cameraKindId: v.AlarmGroupUnit ? genreData.find(r => r.value == v.AlarmGroupUnit)?.name : "",
AlarmGroupUnit: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "无",
Strategy: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "",
type: route == 'deviceAbnormal' ? v.DeviceStatus == 0 ? "离线" : '' : v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "",
cameraKindId: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "",
AlarmCodeName: v.AlarmCodeName,
CurrentLevel: v.CurrentLevel,
detailCount: v.detailCount,
@ -130,16 +114,49 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
}
})
}
break;
}
}, [query, genre, pepProjectId])
useEffect(() => {
if (location) {
search.current = { ...search.current, ...location, state: 'new' }
api.current?.setValues({...location, state: 'new'})
}
if (route !== 'videoAbnormal' && route !== 'useAbnormal') {
dispatch(problem.getAlarmDataGroup()).then((res) => {
if (res.success) {
let data
if (route == 'dataLnterrupt') data = res.payload.data?.filter(v => v.desc == '数据中断')
if (route == 'dataAbnormal') data = res.payload.data?.filter(v => v.desc == '数据异常')
if (route == 'strategyHit') data = res.payload.data?.filter(v => v.desc == '策略命中')
if (route == 'deviceAbnormal') data = res.payload.data?.filter(v => v.desc == '掉线' || v.desc == '不活跃')
groupId.current = data
let genreData = []
data?.map(v => {
v?.unit?.map(vv => {
genreData.push({ name: vv.name, value: vv.id })
})
})
setGenre(genreData)
}
})
}
if (route == 'useAbnormal') {
setGenre({ element: "元素异常", apiError: "接口报错 ", timeout: "加载超时" })
}
if (route == 'videoAbnormal') {
dispatch(problem.getAlarmVideoDeviceKind()).then((res) => {
if (res.success) {
kindName.current = res.payload.data.map(v => ({ name: v.kind, value: v.id }))
setGenre(res.payload.data.map(v => ({ name: v.kind, value: v.id })))
}
})
break;
}
}, [])
}, [query, search, pepProjectId])
// console.log(exhibition);
// console.log(tableData);
return (
<>
@ -234,7 +251,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
style={{ width: 80, height: 32, borderRadius: 3, }}
onClick={() => {
api.current.validate().then((v) => {
setSearch({
search.current = {
state: v.state,
keywordTarget: v.keywordTarget,
keyword: v.keyword,
@ -245,7 +262,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
onlineState: v.onlineState,
sustainTimeStart: v.time && v.time.length > 0 ? moment(v.time[0]).format("YYYY-MM-DD HH:mm:ss") : "",
sustainTimeEnd: v.time && v.time.length > 0 ? moment(v.time[1]).format("YYYY-MM-DD HH:mm:ss") : "",
});
}
setSelected([])
setQuery({ limit: 10, page: 0 })
});
@ -261,7 +278,9 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
active={true}
placeholder={SkeletonScreen()}
>
<Table
{(() => {
// console.log(tableData);
return <Table
columns={exhibition}
dataSource={route == 'useAbnormal' || route == 'videoAbnormal' ? tableData.slice(query.page * query.limit, (query.page + 1) * query.limit) || [] : tableData}
bordered={false}
@ -291,6 +310,8 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
},
}}
/>
})()}
</Skeleton>
<div
style={{

11
web/client/src/sections/problem/containers/dataAlarm.jsx
View File

@ -14,7 +14,8 @@ import { request } from 'screenfull';
import { useRef } from 'react';
import { render } from 'less';
const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb }) => {
const DataAlarm = (props) => {
const { match, dispatch, actions, user, loading, socket, iotVcmpWeb } = props
let route = match.url.substring(match.url.lastIndexOf("/") + 1, match.url.length)
const { problem } = actions
@ -127,10 +128,10 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
{ name: '元素异常', value: 'element' }]
},
{
name: '异常状态', field: 'confirmState',
name: '异常状态', field: 'state',
data: [
{ name: '当前', value: 'unconfirmed' },
{ name: '历史', value: 'confirmd' }]
{ name: '当前', value: 'new' },
{ name: '历史', value: 'histroy' }]
}],
deviceAbnormal: [ // 设备告警(deviceAbnormal)
{ name: '搜索', field: '1' },
@ -427,6 +428,8 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
setQuery={setQuery}
tableData={tableData}
setTableData={setTableData}
genre={genre}
location={props.location?.query}
/>
{setup ? (
<Setup

1
web/package.json
View File

@ -69,7 +69,6 @@
"moment": "^2.29.3",
"npm": "^7.20.6",
"perfect-scrollbar": "^1.5.5",
"qs": "^6.10.5",
"screenfull": "5.2.0",
"socket.io-client": "^1.7.4",
"socket.io-parser": "^3.4.1",

Write Preview
Loading…
Cancel
Save