Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
afc60d68
Commit
afc60d68
authored
Feb 18, 2022
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.设备编辑调整所属系统后新增插入的告警日志系统未原来的bug修改
parent
02725513
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
EquipmentSpecificIndex.java
...oin/equipmanage/common/entity/EquipmentSpecificIndex.java
+8
-0
EquipmentDetailController.java
...oin/equipmanage/controller/EquipmentDetailController.java
+0
-3
MqttReceiveServiceImpl.java
...join/equipmanage/service/impl/MqttReceiveServiceImpl.java
+0
-0
EquipmentSpecificIndexMapper.xml
...rc/main/resources/mapper/EquipmentSpecificIndexMapper.xml
+3
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java
View file @
afc60d68
...
@@ -101,4 +101,12 @@ public class EquipmentSpecificIndex extends BaseEntity {
...
@@ -101,4 +101,12 @@ public class EquipmentSpecificIndex extends BaseEntity {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
valueEnum
;
private
String
valueEnum
;
@ApiModelProperty
(
value
=
"设备CODE"
)
@TableField
(
exist
=
false
)
private
String
equipmentSpecificCode
;
@ApiModelProperty
(
value
=
"设备所属系统ids"
)
@TableField
(
exist
=
false
)
private
String
systemId
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @
afc60d68
...
@@ -70,9 +70,6 @@ public class EquipmentDetailController extends AbstractBaseController {
...
@@ -70,9 +70,6 @@ public class EquipmentDetailController extends AbstractBaseController {
IEquipmentSpecificSerivce
equipmentSpecificSerivce
;
IEquipmentSpecificSerivce
equipmentSpecificSerivce
;
@Autowired
@Autowired
private
IEquipmentDetailService
equipmentDetailService
;
@Autowired
private
IExcelService
excelService
;
private
IExcelService
excelService
;
@Autowired
@Autowired
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @
afc60d68
This diff is collapsed.
Click to expand it.
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
View file @
afc60d68
...
@@ -55,7 +55,9 @@
...
@@ -55,7 +55,9 @@
wesi.update_date AS updateDate,
wesi.update_date AS updateDate,
ed.code AS equipmentCode,
ed.code AS equipmentCode,
ed.equipment_id AS equipmentId,
ed.equipment_id AS equipmentId,
ed.id AS equipmentDetailId
ed.id AS equipmentDetailId,
wes.code as equipmentSpecificCode,
wes.system_id as systemId
FROM
FROM
wl_equipment_specific_index AS wesi
wl_equipment_specific_index AS wesi
LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id
LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id
...
...
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