From f00c16f2f737ad7083d0c536fcff7c17eecbb337 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 14 Nov 2023 16:24:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/controller/DashboardController.java | 5 +-- .../pmapi/dashboard/manage/CockpitStatsManage.java | 36 ++++++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/controller/DashboardController.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/controller/DashboardController.java index 93c872d..1e376b7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/controller/DashboardController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/controller/DashboardController.java @@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.net.UnknownHostException; +import java.util.List; /** * @author liuxinxin @@ -85,8 +86,8 @@ public class DashboardController { @PostMapping("cockpit-stats-save") @ApiOperation("驾驶舱-统计数据接口 假数据保存") - public String statsSave(@RequestBody CockpitStatsSaveDTO save) { - cockpitStatsManage.save(save); + public String statsSave(@RequestBody List saves) { + cockpitStatsManage.save(saves); return "保存成功"; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java index 76a180d..ddf00aa 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java @@ -65,26 +65,28 @@ public class CockpitStatsManage { return convertCockpitStats.convertCockpitStats(cockpitStats,regionCode,year,aps); } - public void save(CockpitStatsSaveDTO save) { - List cockpitStatsList = cockpitStatsService.list(Wrappers.lambdaUpdate(CockpitStats.class) - .eq(Objects.nonNull(save.getRegionCode()), CockpitStats::getRegionCode, save.getRegionCode()) - .eq(Objects.nonNull(save.getYear()), CockpitStats::getYear, save.getYear())); - if(CollUtil.isNotEmpty(cockpitStatsList)){ - for(CockpitStats cockpitStats : cockpitStatsList){ - BeanUtil.copyProperties(save,cockpitStats, CopyOptions.create().ignoreNullValue()); - cockpitStatsService.updateById(cockpitStats); + public void save(List saves) { + for(CockpitStatsSaveDTO save : saves){ + List cockpitStatsList = cockpitStatsService.list(Wrappers.lambdaUpdate(CockpitStats.class) + .eq(Objects.nonNull(save.getRegionCode()), CockpitStats::getRegionCode, save.getRegionCode()) + .eq(Objects.nonNull(save.getYear()), CockpitStats::getYear, save.getYear())); + if(CollUtil.isNotEmpty(cockpitStatsList)){ + for(CockpitStats cockpitStats : cockpitStatsList){ + BeanUtil.copyProperties(save,cockpitStats, CopyOptions.create().ignoreNullValue()); + cockpitStatsService.updateById(cockpitStats); + } } - } - if(Objects.nonNull(save.getCockpitApplications())){ - cockpitApplicationService.remove(Wrappers.lambdaQuery(CockpitApplication.class)); + if(Objects.nonNull(save.getCockpitApplications())){ + cockpitApplicationService.remove(Wrappers.lambdaQuery(CockpitApplication.class)); - List cockpitApplications = save.getCockpitApplications(); - if(CollUtil.isNotEmpty(cockpitApplications)){ - List applications = cockpitApplications.stream() - .map(a -> BeanUtil.copyProperties(a,CockpitApplication.class)) - .collect(Collectors.toList()); - cockpitApplicationService.saveBatch(applications); + List cockpitApplications = save.getCockpitApplications(); + if(CollUtil.isNotEmpty(cockpitApplications)){ + List applications = cockpitApplications.stream() + .map(a -> BeanUtil.copyProperties(a,CockpitApplication.class)) + .collect(Collectors.toList()); + cockpitApplicationService.saveBatch(applications); + } } } }