Commit 2096feb9 authored by 郭武斌's avatar 郭武斌

*)航空器实现假删除

parent 2fba3f1e
......@@ -171,4 +171,10 @@ public class Aircraft extends BaseEntity {
*/
@TableField("remark")
private String remark;
/**
* 是否删除
*/
@TableField("is_delete")
private Boolean isDelete;
}
......@@ -112,7 +112,7 @@ public class AircraftController extends BaseController {
Page<AircraftDto> page=new Page<AircraftDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftPage(page, aircraftModel, engineType, fuelType));
return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftPage(page, false, aircraftModel, engineType, fuelType));
}
}
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
import com.yeejoin.amos.boot.module.jcs.api.enums.AircraftFileTypeEnum;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AircraftMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.exception.BaseException;
......@@ -18,10 +13,15 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
import com.yeejoin.amos.boot.module.jcs.api.enums.AircraftFileTypeEnum;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AircraftMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
/**
* 航空器信息服务实现类
......@@ -43,6 +43,8 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
* @throws Exception
*/
public AircraftDto createAircraft(String agencyCode, AircraftDto aircraftDto) throws Exception {
aircraftDto.setIsDelete(false);
//持久化航空器信息
aircraftDto = this.createWithModel(aircraftDto);
//持久化航空器附件信息
......@@ -113,11 +115,14 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
public List<Long> multDeleteAircraft(String agencyCode, String ids) throws Exception {
List<Long> seqs = StringUtil.String2LongList(ids);
for (Long id : seqs) {
//删除附件信息
Systemctl.fileInfoClient.deleteByAlias(agencyCode, Aircraft.class.getSimpleName(),
String.valueOf(id), null);
//删除航空器信息
this.deleteBySeq(id);
AircraftDto aircraftDto = this.queryBySeq(id);
aircraftDto.setIsDelete(true);
this.updateWithModel(aircraftDto);
// //删除附件信息
// Systemctl.fileInfoClient.deleteByAlias(agencyCode, Aircraft.class.getSimpleName(),
// String.valueOf(id), null);
// //删除航空器信息
// this.deleteBySeq(id);
}
return seqs;
}
......@@ -131,9 +136,9 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
* @param page
* @return
*/
public Page<AircraftDto> queryForAircraftPage(Page<AircraftDto> page, String aircraftModel,
public Page<AircraftDto> queryForAircraftPage(Page<AircraftDto> page, Boolean isDelete, String aircraftModel,
String engineType, String fuelType) {
return this.queryForPage(page, null, false, aircraftModel, engineType, fuelType);
return this.queryForPage(page, null, false, isDelete, aircraftModel, engineType, fuelType);
}
/**
......
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