Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
YeeAmosFireAutoSysRoot
Commits
78a10157
Commit
78a10157
authored
Feb 17, 2023
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug及去掉三维初始化告警信息请求头验证
parent
c3671cac
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
EquipmentSpecificIndexController.java
...business/controller/EquipmentSpecificIndexController.java
+0
-1
dbTemplate_equipment_specific_index.xml
...sources/db/mapper/dbTemplate_equipment_specific_index.xml
+1
-1
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EquipmentSpecificIndexController.java
View file @
78a10157
...
@@ -52,7 +52,6 @@ public class EquipmentSpecificIndexController extends BaseController {
...
@@ -52,7 +52,6 @@ public class EquipmentSpecificIndexController extends BaseController {
return
CommonResponseUtil
.
success
(
equipmentSpecificIndexService
.
queryInitAlarm
(
value
,
nameKeys
,
status
));
return
CommonResponseUtil
.
success
(
equipmentSpecificIndexService
.
queryInitAlarm
(
value
,
nameKeys
,
status
));
}
}
@Permission
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"获取三维初始化告警信息"
,
notes
=
"获取三维初始化告警信息"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"获取三维初始化告警信息"
,
notes
=
"获取三维初始化告警信息"
)
@RequestMapping
(
value
=
"/getInitAlarm"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/getInitAlarm"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
GET
)
public
CommonResponse
getInitAlarm
(
@ApiParam
(
value
=
"物联采集属性值"
)
@RequestParam
(
required
=
false
)
String
value
,
public
CommonResponse
getInitAlarm
(
@ApiParam
(
value
=
"物联采集属性值"
)
@RequestParam
(
required
=
false
)
String
value
,
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific_index.xml
View file @
78a10157
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
wl_equipment_specific wes
wl_equipment_specific wes
LEFT JOIN wl_equipment_index ei ON ei.id = wes.realtime_iot_index_id
LEFT JOIN wl_equipment_index ei ON ei.id = wes.realtime_iot_index_id
WHERE
WHERE
ei.is_iot = 1 and substr(
cat.code ,1,
4) = '9204'
ei.is_iot = 1 and substr(
wes.equipment_code, 1,
4) = '9204'
<if
test=
"value != null and value != ''"
>
<if
test=
"value != null and value != ''"
>
AND wes.realtime_iot_index_value = #{value}
AND wes.realtime_iot_index_value = #{value}
</if>
</if>
...
...
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