Merge branch 'master-500-dev-lzc' into 'master-500-dev'

导入导出

1.【无】导入导出逻辑修改

See merge request !103

@@ -162,6 +162,7 @@ public class ExportServiceImpl implements ExportService {
         }
         List<String> reportCodeList = reportList.stream().map(Report::getReportCode).collect(Collectors.toList());
         reportService.delete(new LambdaQueryWrapper<Report>().in(Report::getReportCode, reportCodeList));
+        reportList.forEach(item->{item.setId(null);});
         reportService.insertBatch(reportList);
 
         //新增大屏配置
@@ -169,6 +170,7 @@ public class ExportServiceImpl implements ExportService {
         reportList.stream().map(Report::getReportDashboardList).distinct().forEach(reportDashboardList::addAll);
         if (reportDashboardList.size() != 0) {
             reportDashboardService.delete(new LambdaQueryWrapper<ReportDashboard>().in(ReportDashboard::getReportCode, reportCodeList));
+            reportDashboardList.forEach(item->{item.setId(null);});
             reportDashboardService.insertBatch(reportDashboardList);
         }
 
@@ -179,6 +181,7 @@ public class ExportServiceImpl implements ExportService {
             return;
         }
         reportDashboardWidgetService.delete(new LambdaQueryWrapper<ReportDashboardWidget>().in(ReportDashboardWidget::getReportCode, reportCodeList));
+        reportDashboardWidgetList.forEach(item->{item.setId(null);});
         reportDashboardWidgetService.insertBatch(reportDashboardWidgetList);
 
         //新增数据集
@@ -192,6 +195,7 @@ public class ExportServiceImpl implements ExportService {
                     dataSet.setSourceCode(dataSet.getSourceCodeChange());
                 }
             }
+            dataSetList.forEach(item->{item.setId(null);});
             dataSetService.insertBatch(dataSetList);
         }
 
@@ -200,6 +204,7 @@ public class ExportServiceImpl implements ExportService {
         dataSetList.stream().map(DataSet::getDataSetParamList).distinct().forEach(dataSetParamList::addAll);
         if (dataSetParamList.size() != 0) {
             dataSetParamService.delete(new LambdaQueryWrapper<DataSetParam>().in(DataSetParam::getSetCode, setCodeList));
+            dataSetParamList.forEach(item->{item.setId(null);});
             dataSetParamService.insertBatch(dataSetParamList);
         }
 
@@ -208,6 +213,7 @@ public class ExportServiceImpl implements ExportService {
         dataSetList.stream().map(DataSet::getDataSetTransformList).distinct().forEach(dataSetTransformList::addAll);
         if (dataSetTransformList.size() != 0) {
             dataSetTransformService.delete(new LambdaQueryWrapper<DataSetTransform>().in(DataSetTransform::getSetCode, setCodeList));
+            dataSetTransformList.forEach(item->{item.setId(null);});
             dataSetTransformService.insertBatch(dataSetTransformList);
         }
     }