|
@@ -22,7 +22,9 @@ import jakarta.annotation.Resource;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
+
|
|
|
import java.io.IOException;
|
|
|
+
|
|
|
import org.eco.als.mapper.MaintenanceMapper;
|
|
|
import org.eco.als.domain.Maintenance;
|
|
|
import org.eco.als.domain.bo.MaintenanceBo;
|
|
@@ -30,6 +32,7 @@ import org.eco.als.domain.vo.MaintenanceVo;
|
|
|
import org.eco.als.domain.vo.MaintenanceImportVo;
|
|
|
import org.eco.als.listener.MaintenanceImportListener;
|
|
|
import org.eco.als.service.IMaintenanceService;
|
|
|
+
|
|
|
import static org.eco.als.domain.table.MaintenanceTableDef.MAINTENANCE;
|
|
|
|
|
|
/**
|
|
@@ -58,43 +61,43 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
|
|
|
private QueryWrapper buildQueryWrapper(MaintenanceBo maintenanceBo) {
|
|
|
QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
|
|
|
queryWrapper.and(MAINTENANCE.AIRCRAFT_CODE.eq
|
|
|
- (maintenanceBo.getAircraftCode()));
|
|
|
+ (maintenanceBo.getAircraftCode()));
|
|
|
queryWrapper.and(MAINTENANCE.FAULT_CODE.eq
|
|
|
- (maintenanceBo.getFaultCode()));
|
|
|
+ (maintenanceBo.getFaultCode()));
|
|
|
queryWrapper.and(MAINTENANCE.FAULT_NAME.like
|
|
|
- (maintenanceBo.getFaultName()));
|
|
|
+ (maintenanceBo.getFaultName()));
|
|
|
queryWrapper.and(MAINTENANCE.LOCATION.eq
|
|
|
- (maintenanceBo.getLocation()));
|
|
|
+ (maintenanceBo.getLocation()));
|
|
|
queryWrapper.and(MAINTENANCE.LEVEL.eq
|
|
|
- (maintenanceBo.getLevel()));
|
|
|
+ (maintenanceBo.getLevel()));
|
|
|
queryWrapper.and(MAINTENANCE.FAULT_DATE.eq
|
|
|
- (maintenanceBo.getFaultDate()));
|
|
|
+ (maintenanceBo.getFaultDate()));
|
|
|
queryWrapper.and(MAINTENANCE.SYMPTOMS.eq
|
|
|
- (maintenanceBo.getSymptoms()));
|
|
|
+ (maintenanceBo.getSymptoms()));
|
|
|
queryWrapper.and(MAINTENANCE.FAULT_CAUSE.eq
|
|
|
- (maintenanceBo.getFaultCause()));
|
|
|
+ (maintenanceBo.getFaultCause()));
|
|
|
queryWrapper.and(MAINTENANCE.STATUS.eq
|
|
|
- (maintenanceBo.getStatus()));
|
|
|
+ (maintenanceBo.getStatus()));
|
|
|
queryWrapper.and(MAINTENANCE.SUPERVISOR.eq
|
|
|
- (maintenanceBo.getSupervisor()));
|
|
|
+ (maintenanceBo.getSupervisor()));
|
|
|
queryWrapper.and(MAINTENANCE.MAINTENANCE_TIME.eq
|
|
|
- (maintenanceBo.getMaintenanceTime()));
|
|
|
+ (maintenanceBo.getMaintenanceTime()));
|
|
|
queryWrapper.and(MAINTENANCE.BEFORE_EQUIPMENT_CODE.eq
|
|
|
- (maintenanceBo.getBeforeEquipmentCode()));
|
|
|
+ (maintenanceBo.getBeforeEquipmentCode()));
|
|
|
queryWrapper.and(MAINTENANCE.BEFORE_EQUIPMENT_NAME.like
|
|
|
- (maintenanceBo.getBeforeEquipmentName()));
|
|
|
+ (maintenanceBo.getBeforeEquipmentName()));
|
|
|
queryWrapper.and(MAINTENANCE.BEFORE_MODEL_NUMBER.eq
|
|
|
- (maintenanceBo.getBeforeModelNumber()));
|
|
|
+ (maintenanceBo.getBeforeModelNumber()));
|
|
|
queryWrapper.and(MAINTENANCE.AFTER_EQUIPMENT_CODE.eq
|
|
|
- (maintenanceBo.getAfterEquipmentCode()));
|
|
|
+ (maintenanceBo.getAfterEquipmentCode()));
|
|
|
queryWrapper.and(MAINTENANCE.AFTER_EQUIPMENT_NAME.eq
|
|
|
- (maintenanceBo.getAfterEquipmentName()));
|
|
|
+ (maintenanceBo.getAfterEquipmentName()));
|
|
|
queryWrapper.and(MAINTENANCE.AFTER_MODEL_NUMBER.eq
|
|
|
- (maintenanceBo.getAfterModelNumber()));
|
|
|
+ (maintenanceBo.getAfterModelNumber()));
|
|
|
queryWrapper.and(MAINTENANCE.QUANTITY.eq
|
|
|
- (maintenanceBo.getQuantity()));
|
|
|
+ (maintenanceBo.getQuantity()));
|
|
|
queryWrapper.and(MAINTENANCE.REMARKS.eq
|
|
|
- (maintenanceBo.getRemarks()));
|
|
|
+ (maintenanceBo.getRemarks()));
|
|
|
|
|
|
return queryWrapper;
|
|
|
}
|
|
@@ -107,7 +110,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
|
|
|
*/
|
|
|
@Override
|
|
|
public MaintenanceVo selectById(Long id) {
|
|
|
- return this.getOneAs(query().where(MAINTENANCE.ID.eq(id)), MaintenanceVo.class);
|
|
|
+ return this.getOneAs(query().where(MAINTENANCE.ID.eq(id)), MaintenanceVo.class);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -121,7 +124,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
|
|
|
@Override
|
|
|
public List<MaintenanceVo> selectList(MaintenanceBo maintenanceBo) {
|
|
|
QueryWrapper queryWrapper = buildQueryWrapper(maintenanceBo);
|
|
|
- return this.listAs(queryWrapper, MaintenanceVo.class);
|
|
|
+ return this.listAs(queryWrapper, MaintenanceVo.class);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -133,7 +136,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
|
|
|
@Override
|
|
|
public PageResult<MaintenanceVo> selectPage(MaintenanceBo maintenanceBo) {
|
|
|
QueryWrapper queryWrapper = buildQueryWrapper(maintenanceBo);
|
|
|
- Page<MaintenanceVo> page = this.pageAs(PageQuery.build(), queryWrapper, MaintenanceVo.class);
|
|
|
+ Page<MaintenanceVo> page = this.pageAs(PageQuery.build(), queryWrapper, MaintenanceVo.class);
|
|
|
return PageResult.build(page);
|
|
|
}
|
|
|
|
|
@@ -145,7 +148,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
|
|
|
*/
|
|
|
@Override
|
|
|
public boolean insert(MaintenanceBo maintenanceBo) {
|
|
|
- Maintenance maintenance =MapstructUtils.convert(maintenanceBo, Maintenance. class);
|
|
|
+ Maintenance maintenance = MapstructUtils.convert(maintenanceBo, Maintenance.class);
|
|
|
|
|
|
return this.save(maintenance);//使用全局配置的雪花算法主键生成器生成ID值
|
|
|
}
|
|
@@ -157,12 +160,11 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
|
|
|
* @return 结果:true 操作成功,false 操作失败
|
|
|
*/
|
|
|
@Override
|
|
|
- public boolean insertWithPk(MaintenanceBo maintenanceBo)
|
|
|
- {
|
|
|
+ public boolean insertWithPk(MaintenanceBo maintenanceBo) {
|
|
|
Maintenance maintenance = MapstructUtils.convert(maintenanceBo, Maintenance.class);
|
|
|
|
|
|
|
|
|
- return maintenanceMapper.insertWithPk(maintenance) > 0;//前台传来主键值
|
|
|
+ return maintenanceMapper.insertWithPk(maintenance) > 0;//前台传来主键值
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -173,10 +175,10 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, M
|
|
|
*/
|
|
|
@Override
|
|
|
public boolean update(MaintenanceBo maintenanceBo) {
|
|
|
- Maintenance maintenance =MapstructUtils.convert(maintenanceBo, Maintenance. class);
|
|
|
- if (ObjectUtil.isNotNull(maintenance) && ObjectUtil.isNotNull(maintenance.getId())){
|
|
|
+ Maintenance maintenance = MapstructUtils.convert(maintenanceBo, Maintenance.class);
|
|
|
+ if (ObjectUtil.isNotNull(maintenance) && ObjectUtil.isNotNull(maintenance.getId())) {
|
|
|
boolean updated = this.updateById(maintenance);
|
|
|
- return updated;
|
|
|
+ return updated;
|
|
|
}
|
|
|
return false;
|
|
|
}
|