调整map
This commit is contained in:
parent
f23a6a94a6
commit
71abb10dfd
|
|
@ -302,7 +302,7 @@ public class SurvStationInfoController {
|
||||||
SurvTransdataAirVo survTransdataAirVo=transdataAirService.getNewestDataWithStation(airList);
|
SurvTransdataAirVo survTransdataAirVo=transdataAirService.getNewestDataWithStation(airList);
|
||||||
ConstructAir constructAir = new ConstructAir();
|
ConstructAir constructAir = new ConstructAir();
|
||||||
SurvTransdataAir survTransdataAir = new SurvTransdataAir();
|
SurvTransdataAir survTransdataAir = new SurvTransdataAir();
|
||||||
BeanUtil.copyProperties(constructAir,survTransdataAir);
|
BeanUtil.copyProperties(survTransdataAirVo,survTransdataAir);
|
||||||
constructAir.setTransdataAir(survTransdataAir);
|
constructAir.setTransdataAir(survTransdataAir);
|
||||||
constructAir.setDeploy(deployMap.get(survTransdataAirVo.getDeployCode()));
|
constructAir.setDeploy(deployMap.get(survTransdataAirVo.getDeployCode()));
|
||||||
jsonArray.addAll(zhAdminFeignClient.constructAir(constructAir));
|
jsonArray.addAll(zhAdminFeignClient.constructAir(constructAir));
|
||||||
|
|
@ -315,7 +315,7 @@ public class SurvStationInfoController {
|
||||||
SurvTransdataSoilVo survTransdataSoilVo = transdataSoilService.getNewestDataWithStation(soilList);
|
SurvTransdataSoilVo survTransdataSoilVo = transdataSoilService.getNewestDataWithStation(soilList);
|
||||||
ConstructSoil constructSoil = new ConstructSoil();
|
ConstructSoil constructSoil = new ConstructSoil();
|
||||||
SurvTransdataSoil survTransdataSoil = new SurvTransdataSoil();
|
SurvTransdataSoil survTransdataSoil = new SurvTransdataSoil();
|
||||||
BeanUtil.copyProperties(constructSoil,survTransdataSoil);
|
BeanUtil.copyProperties(survTransdataSoilVo,survTransdataSoil);
|
||||||
constructSoil.setTransdataSoil(survTransdataSoil);
|
constructSoil.setTransdataSoil(survTransdataSoil);
|
||||||
constructSoil.setDeploy(deployMap.get(survTransdataSoilVo.getDeployCode()));
|
constructSoil.setDeploy(deployMap.get(survTransdataSoilVo.getDeployCode()));
|
||||||
jsonArray.addAll(zhAdminFeignClient.constructSoil(constructSoil));
|
jsonArray.addAll(zhAdminFeignClient.constructSoil(constructSoil));
|
||||||
|
|
@ -328,7 +328,7 @@ public class SurvStationInfoController {
|
||||||
SurvTransdataSoilVo survTransdataSoilVo = transdataSoilService.getNewestDataWithStation(waterList);
|
SurvTransdataSoilVo survTransdataSoilVo = transdataSoilService.getNewestDataWithStation(waterList);
|
||||||
ConstructSoil constructSoil = new ConstructSoil();
|
ConstructSoil constructSoil = new ConstructSoil();
|
||||||
SurvTransdataSoil survTransdataSoil = new SurvTransdataSoil();
|
SurvTransdataSoil survTransdataSoil = new SurvTransdataSoil();
|
||||||
BeanUtil.copyProperties(constructSoil,survTransdataSoil);
|
BeanUtil.copyProperties(survTransdataSoilVo,survTransdataSoil);
|
||||||
constructSoil.setTransdataSoil(survTransdataSoil);
|
constructSoil.setTransdataSoil(survTransdataSoil);
|
||||||
constructSoil.setDeploy(deployMap.get(survTransdataSoilVo.getDeployCode()));
|
constructSoil.setDeploy(deployMap.get(survTransdataSoilVo.getDeployCode()));
|
||||||
jsonArray.addAll(zhAdminFeignClient.constructSoil(constructSoil));
|
jsonArray.addAll(zhAdminFeignClient.constructSoil(constructSoil));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue