Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
so-operation-api
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
smart-operation
so-operation-api
Commits
6be97b44
Commit
6be97b44
authored
Jul 26, 2023
by
李科
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 我的预警工单,回显使用:内部字段对外覆盖处理
parent
15d68474
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
src/controller/work_order_manage.go
src/controller/work_order_manage.go
+9
-0
src/service/alert.go
src/service/alert.go
+1
-3
No files found.
src/controller/work_order_manage.go
View file @
6be97b44
...
@@ -259,6 +259,15 @@ func WorkOrderListAlert(c *gin.Context) {
...
@@ -259,6 +259,15 @@ func WorkOrderListAlert(c *gin.Context) {
}
}
svc
:=
service
.
AlertSvc
{
User
:
user
}
svc
:=
service
.
AlertSvc
{
User
:
user
}
data
,
err
:=
svc
.
List
(
req
)
data
,
err
:=
svc
.
List
(
req
)
// 回显使用:内部字段对外覆盖处理
// disposed_list[].is_disposed --映射--> is_disposed
for
i
:=
0
;
i
<
len
(
data
.
List
);
i
++
{
for
j
:=
0
;
j
<
len
(
data
.
List
[
i
]
.
DisposedList
);
j
++
{
if
data
.
List
[
i
]
.
DisposedList
[
j
]
.
DisposalUser
==
user
.
SystemAccount
{
data
.
List
[
i
]
.
IsDisposed
=
1
}
}
}
if
err
!=
nil
{
if
err
!=
nil
{
SendJsonResponse
(
c
,
resp
.
FAIL
.
WithError
(
err
),
nil
)
SendJsonResponse
(
c
,
resp
.
FAIL
.
WithError
(
err
),
nil
)
return
return
...
...
src/service/alert.go
View file @
6be97b44
...
@@ -456,7 +456,7 @@ func (a *AlertSvc) DocSearch(req request.ListAlert) (resp response.AlertList, er
...
@@ -456,7 +456,7 @@ func (a *AlertSvc) DocSearch(req request.ListAlert) (resp response.AlertList, er
for
_
,
hit
:=
range
sources
.
Hits
.
Hits
{
for
_
,
hit
:=
range
sources
.
Hits
.
Hits
{
resp
.
List
=
append
(
resp
.
List
,
hit
.
Source
)
resp
.
List
=
append
(
resp
.
List
,
hit
.
Source
)
}
}
resp
.
TotalCount
=
int64
(
len
(
resp
.
List
)
)
resp
.
TotalCount
=
int64
(
sources
.
Hits
.
Total
.
Value
)
return
return
}
}
...
@@ -838,12 +838,10 @@ func (a *AlertSvc) GetDataByAlertRulesIdAndRiskLevel(alertRulesId string, riskLe
...
@@ -838,12 +838,10 @@ func (a *AlertSvc) GetDataByAlertRulesIdAndRiskLevel(alertRulesId string, riskLe
func
(
a
*
AlertSvc
)
List
(
req
request
.
ListAlert
)
(
resp
response
.
AlertList
,
err
error
)
{
func
(
a
*
AlertSvc
)
List
(
req
request
.
ListAlert
)
(
resp
response
.
AlertList
,
err
error
)
{
resp
,
err
=
a
.
DocSearch
(
req
)
resp
,
err
=
a
.
DocSearch
(
req
)
resp
.
TotalCount
=
int64
(
len
(
resp
.
List
))
return
return
}
}
func
(
a
*
AlertSvc
)
DisposeAlert
(
req
request
.
DisposeAlert
)
(
err
error
)
{
func
(
a
*
AlertSvc
)
DisposeAlert
(
req
request
.
DisposeAlert
)
(
err
error
)
{
// TODO 我的预警工单处置
var
(
var
(
sources
response
.
OpenSearchSource
sources
response
.
OpenSearchSource
now
=
jsontime
.
Now
()
now
=
jsontime
.
Now
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment