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
62d37c8d
Commit
62d37c8d
authored
Nov 26, 2021
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
cbd21106
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
1 deletion
+36
-1
EquipmentStatusEnum.java
...os/boot/module/tzs/flc/api/enums/EquipmentStatusEnum.java
+33
-0
EquipmentServiceImpl.java
...module/tzs/flc/biz/service/impl/EquipmentServiceImpl.java
+3
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/enums/EquipmentStatusEnum.java
0 → 100644
View file @
62d37c8d
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
enums
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.Setter
;
/**
* 设备状态枚举
*/
@Getter
public
enum
EquipmentStatusEnum
{
未安装
(
"uninstalled"
,
"未安装"
),
已安装
(
"installed"
,
"已安装"
);
private
String
code
;
private
String
name
;
EquipmentStatusEnum
(
String
code
,
String
name
)
{
this
.
name
=
name
;
this
.
code
=
code
;
}
public
static
EquipmentStatusEnum
getByCode
(
String
code
)
{
for
(
EquipmentStatusEnum
statusEnum
:
EquipmentStatusEnum
.
values
())
{
if
(
statusEnum
.
getCode
().
equals
(
code
))
{
return
statusEnum
;
}
}
return
null
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/EquipmentServiceImpl.java
View file @
62d37c8d
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentDto
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.entity.Equipment
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.enums.EquipmentStatusEnum
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentMapper
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentMapper
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.service.IEquipmentService
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.service.IEquipmentService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -61,7 +62,8 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
...
@@ -61,7 +62,8 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
@Override
@Override
public
Boolean
deleteById
(
Long
sequenceNbr
)
{
public
Boolean
deleteById
(
Long
sequenceNbr
)
{
EquipmentDto
equipmentDto
=
this
.
queryBySeq
(
sequenceNbr
);
EquipmentDto
equipmentDto
=
this
.
queryBySeq
(
sequenceNbr
);
if
(!
ValidationUtil
.
isEmpty
(
equipmentDto
))
{
// 未安装设备可删除
if
(!
ValidationUtil
.
isEmpty
(
equipmentDto
)
&&
EquipmentStatusEnum
.
未安装
.
getCode
().
equals
(
equipmentDto
.
getStatus
()))
{
equipmentDto
.
setIsDelete
(
true
);
equipmentDto
.
setIsDelete
(
true
);
this
.
updateWithModel
(
equipmentDto
);
this
.
updateWithModel
(
equipmentDto
);
return
true
;
return
true
;
...
...
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