|
|
|
@ -18,6 +18,7 @@ import com.baiye.modules.platform.domain.ModeRecord;
|
|
|
|
|
import com.baiye.modules.platform.repository.ModeRecordRepository;
|
|
|
|
|
import com.baiye.modules.platform.service.DeliveryRecordService;
|
|
|
|
|
import com.baiye.modules.platform.service.ModeRecordService;
|
|
|
|
|
import com.baiye.modules.platform.service.dto.BuildDTO;
|
|
|
|
|
import com.baiye.modules.platform.service.dto.ImeiDTO;
|
|
|
|
|
import com.baiye.modules.platform.service.dto.ModeRecordQueryCriteria;
|
|
|
|
|
import com.baiye.modules.platform.service.dto.ModelRecordDto;
|
|
|
|
@ -167,13 +168,14 @@ public class ModelRecordServiceImpl implements ModeRecordService {
|
|
|
|
|
@SneakyThrows
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public Boolean sendDataByActNameAndActId(List<Long> ids, String actName, String actId) {
|
|
|
|
|
List<String> stringList = Lists.newArrayList();
|
|
|
|
|
List<BuildDTO> buildList = Lists.newArrayList();
|
|
|
|
|
for (Long id : ids) {
|
|
|
|
|
ModeRecord downRecord = modeRecordRepository.findById(id).orElseGet(ModeRecord::new);
|
|
|
|
|
if (ObjectUtil.isNull(downRecord) ||
|
|
|
|
|
downRecord.getRecordStatus() != DefaultNumberConstants.ONE_NUMBER) {
|
|
|
|
|
throw new BadRequestException("该批次暂不能建模!");
|
|
|
|
|
}
|
|
|
|
|
String tagStr = downRecord.getTagStr();
|
|
|
|
|
// 解压文件
|
|
|
|
|
String unzipPath = CompressUtil.unzipFiles
|
|
|
|
|
(deliveryProperties.getFileUrl(), downRecord.getUploadPath(), deliveryProperties.getZipPassword());
|
|
|
|
@ -183,16 +185,19 @@ public class ModelRecordServiceImpl implements ModeRecordService {
|
|
|
|
|
CsvReader reader = CsvUtil.getReader();
|
|
|
|
|
CsvData data = reader.read(parseFile);
|
|
|
|
|
// csv通配
|
|
|
|
|
data.getRows().forEach(str -> stringList.add(str.size() >
|
|
|
|
|
DefaultNumberConstants.THREE_NUMBER ? str.get(DefaultNumberConstants.TWO_NUMBER)
|
|
|
|
|
: str.get(DefaultNumberConstants.ZERO_NUMBER)));
|
|
|
|
|
data.getRows().forEach(str -> {
|
|
|
|
|
BuildDTO build = BuildDTO.builder().nid(str.size() >
|
|
|
|
|
DefaultNumberConstants.THREE_NUMBER ? str.get(DefaultNumberConstants.TWO_NUMBER)
|
|
|
|
|
: str.get(DefaultNumberConstants.ZERO_NUMBER)).tag(tagStr).build();
|
|
|
|
|
buildList.add(build);
|
|
|
|
|
});
|
|
|
|
|
cn.hutool.core.io.FileUtil.del(unzipPath);
|
|
|
|
|
// 修改状态
|
|
|
|
|
modeRecordRepository.updateStatusById(DefaultNumberConstants.TWO_NUMBER, id);
|
|
|
|
|
}
|
|
|
|
|
decryptTask.doRunSendTask(stringList, ids, actId, actName);
|
|
|
|
|
decryptTask.doRunSendTask(buildList, ids, actId, actName);
|
|
|
|
|
// 调用异步任务
|
|
|
|
|
log.info("============= the request str list {} =============", stringList.size());
|
|
|
|
|
log.info("============= the request str list {} =============", buildList.size());
|
|
|
|
|
return Boolean.TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|