|
|
@@ -65,7 +65,6 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
@Autowired
|
|
|
private AnemometerTowerService anemometerTowerService;
|
|
|
|
|
|
-
|
|
|
@Autowired
|
|
|
private WindEngineGroupMapper windEngineGroupMapper;
|
|
|
|
|
|
@@ -123,7 +122,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
@SneakyThrows
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode,Integer userId) {
|
|
|
+ public ResultResp windEngineGroupImportData(MultipartFile file, String fieldCode, Integer userId) {
|
|
|
List<WindEngineGroupExcelVo> windEngineGroupExcelVos = EasyExcel.read(file.getInputStream()).head(WindEngineGroupExcelVo.class).sheet().doReadSync();
|
|
|
if (CollectionUtils.isEmpty(windEngineGroupExcelVos)) {
|
|
|
return ResultResp.FAIL("未读取到文件数据,请核对数据准确性!");
|
|
|
@@ -134,30 +133,30 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
|
|
|
// 校验数据非空
|
|
|
for (WindEngineGroupExcelVo exceVo : windEngineGroupExceVoList) {
|
|
|
- if (exceVo.getLongitude() == null || exceVo.getLatitude() == null||StringUtils.isEmpty(exceVo.getMachineTypeCode())) {
|
|
|
+ if (exceVo.getLongitude() == null || exceVo.getLatitude() == null || StringUtils.isEmpty(exceVo.getMachineTypeCode())) {
|
|
|
return ResultResp.FAIL("当前导入风机数据未填写经纬度,请核查导入数据!");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 校验是否有重复的风机编号
|
|
|
Set<String> engineNames = windEngineGroupExceVoList.stream().map(item -> item.getEngineName()).collect(Collectors.toSet());
|
|
|
- if(windEngineGroupExceVoList.size()!=engineNames.size()){
|
|
|
+ if (windEngineGroupExceVoList.size() != engineNames.size()) {
|
|
|
return ResultResp.FAIL("当前导入风机数据有重复风机编号,请核查导入数据!");
|
|
|
}
|
|
|
|
|
|
// 处理机型编号
|
|
|
List<String> millTypeCodes = windEngineGroupExceVoList.stream().map(item -> item.getMachineTypeCode()).collect(Collectors.toList());
|
|
|
- List<WindEngineMillVo> windEngineMillVoList = windEngineMillService.getWindEngineMillListByInMachineTypeCode(millTypeCodes);
|
|
|
+ List<WindEngineMillVo> windEngineMillVoList = windEngineMillService.getWindEngineMillListByInMachineTypeCode(millTypeCodes);
|
|
|
//校验机型准确性
|
|
|
- for(String millTypeCode : millTypeCodes){
|
|
|
- boolean flg = windEngineMillVoList.stream().anyMatch(item -> item.getMachineTypeCode().equals(millTypeCode));
|
|
|
- if(!flg){
|
|
|
- return ResultResp.FAIL("当前导入机型编号系统中不存在,请核查导入数据!");
|
|
|
- }
|
|
|
+ for (String millTypeCode : millTypeCodes) {
|
|
|
+ boolean flg = windEngineMillVoList.stream().anyMatch(item -> item.getMachineTypeCode().equals(millTypeCode));
|
|
|
+ if (!flg) {
|
|
|
+ return ResultResp.FAIL("当前导入机型编号系统中不存在,请核查导入数据!");
|
|
|
+ }
|
|
|
}
|
|
|
- for(WindEngineGroupExcelVo windEngineGroupExcelVo : windEngineGroupExceVoList){
|
|
|
- for(WindEngineMillVo windEngineMillVo : windEngineMillVoList){
|
|
|
- if(windEngineGroupExcelVo.getMachineTypeCode().equals(windEngineMillVo.getMachineTypeCode())){
|
|
|
+ for (WindEngineGroupExcelVo windEngineGroupExcelVo : windEngineGroupExceVoList) {
|
|
|
+ for (WindEngineMillVo windEngineMillVo : windEngineMillVoList) {
|
|
|
+ if (windEngineGroupExcelVo.getMachineTypeCode().equals(windEngineMillVo.getMachineTypeCode())) {
|
|
|
windEngineGroupExcelVo.setMillTypeCode(windEngineMillVo.getMillTypeCode());
|
|
|
}
|
|
|
}
|
|
|
@@ -187,10 +186,10 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
windEngineGroupPO.setUpdateTime(new Date());
|
|
|
windEngineGroupPO.setState(Constants.GLOBAL_IN_USE);
|
|
|
windEngineGroupPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
|
|
|
- if(windFieldExceVos.getSightcingString().equals("是")){
|
|
|
+ if (windFieldExceVos.getSightcingString().equals("是")) {
|
|
|
windEngineGroupPO.setSightcing(1);
|
|
|
}
|
|
|
- if(windFieldExceVos.getSightcingString().equals("否")){
|
|
|
+ if (windFieldExceVos.getSightcingString().equals("否")) {
|
|
|
windEngineGroupPO.setSightcing(2);
|
|
|
}
|
|
|
windEngineGroupPO.setCreateBy(userId);
|
|
|
@@ -216,7 +215,12 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public WindFieldGroupTowerVo getWindEngineGroupByFieldCode(String fieldCode,String batchCode) {
|
|
|
+ public List<WindEngineGroupPageVo> getWindEngineGroupListByFieldCode(WindEngineGroupPageDto windEngineGroupPageDto) {
|
|
|
+ return windEngineGroupMapper.selectWindEngineGroupListByFieldCode(windEngineGroupPageDto.getFieldCode());
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public WindFieldGroupTowerVo getWindEngineGroupByFieldCode(String fieldCode, String batchCode) {
|
|
|
|
|
|
WindFieldGroupTowerVo windFieldGroupTowerVo = new WindFieldGroupTowerVo();
|
|
|
|
|
|
@@ -233,7 +237,7 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
List<WindEngineGroupVo> engineGroupVoArrayList = Lists.newArrayList();
|
|
|
for (WindEngineGroupPO po : engineGroupPOS) {
|
|
|
windEngineGroupVo = new WindEngineGroupVo();
|
|
|
- BeanUtil.copyProperties(po,windEngineGroupVo);
|
|
|
+ BeanUtil.copyProperties(po, windEngineGroupVo);
|
|
|
if (windEngineGroupVo.getLongitude() != null && windEngineGroupVo.getLatitude() != null) {
|
|
|
DecimalFormat df = new DecimalFormat("#.00000");
|
|
|
String longitude = df.format(windEngineGroupVo.getLongitude());
|
|
|
@@ -246,8 +250,8 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
|
|
|
// 处理测风塔信息
|
|
|
List<AnemometerTowerByFieldVo> anemometerTowerByFields = anemometerTowerService.getAnemometerTowerByField(fieldCode);
|
|
|
- if(!CollectionUtils.isEmpty(anemometerTowerByFields)){
|
|
|
- for(AnemometerTowerByFieldVo vo : anemometerTowerByFields){
|
|
|
+ if (!CollectionUtils.isEmpty(anemometerTowerByFields)) {
|
|
|
+ for (AnemometerTowerByFieldVo vo : anemometerTowerByFields) {
|
|
|
if (vo.getLongitude() != null && vo.getLatitude() != null) {
|
|
|
DecimalFormat df = new DecimalFormat("#.00000");
|
|
|
String longitude = df.format(vo.getLongitude());
|
|
|
@@ -259,11 +263,11 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
}
|
|
|
|
|
|
// 处理批次异常状体
|
|
|
- List<AnalysisErrorCodeVo> analysisErrorCodeVoList = analysisErrService.AnalysisErrorCodeQuery(batchCode);
|
|
|
- if(!CollectionUtils.isEmpty(analysisErrorCodeVoList)){
|
|
|
- for(WindEngineGroupVo wgVo : windFieldGroupTowerVo.getWindEngineGroupVoList()){
|
|
|
- for(AnalysisErrorCodeVo errorCodeVo :analysisErrorCodeVoList ){
|
|
|
- if(wgVo.getEngineCode().equals(errorCodeVo.getEngineCode())){
|
|
|
+ List<AnalysisErrorCodeVo> analysisErrorCodeVoList = analysisErrService.AnalysisErrorCodeQuery(batchCode);
|
|
|
+ if (!CollectionUtils.isEmpty(analysisErrorCodeVoList)) {
|
|
|
+ for (WindEngineGroupVo wgVo : windFieldGroupTowerVo.getWindEngineGroupVoList()) {
|
|
|
+ for (AnalysisErrorCodeVo errorCodeVo : analysisErrorCodeVoList) {
|
|
|
+ if (wgVo.getEngineCode().equals(errorCodeVo.getEngineCode())) {
|
|
|
wgVo.setErrorState(true);
|
|
|
}
|
|
|
}
|
|
|
@@ -370,6 +374,11 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ public boolean updateWindEngineGroupList(WindEngineGroupBathUpdateDto windEngineGroupBathUpdateDto) {
|
|
|
+ return windEngineGroupMapper.updateWindEngineGroupList(windEngineGroupBathUpdateDto.getWindEngineGroupUpdateDtoList()) > 0 ? true : false;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public WindEngineGroupVo getWindEngineGroup(WindEngineGroupCodeDto windEngineGroupCodeDto) {
|
|
|
WindEngineGroupPO po = new WindEngineGroupPO();
|
|
|
po.setEngineCode(windEngineGroupCodeDto.getEngineCode());
|