Commit 62d37c8d authored by tianbo's avatar tianbo

修改

parent cbd21106
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;
}
}
...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment