Ver Fonte

查下模板

caixiaofeng há 10 meses atrás
pai
commit
4cdbacc41e

+ 2 - 0
flow-report/flow-report-api/src/main/java/com/flow/service/ReportTemplateService.java

@@ -11,6 +11,8 @@ public interface ReportTemplateService extends BaseService<ReportTemplate> {
 
     PageResult<ReportTemplate> getList(ReportTemplateQuery reportTemplateQuery);
 
+    ReportTemplate getTemplate(String id);
+
     ReportTemplate create(ReportTemplate reportTemplate);
 
     ReportTemplate update(ReportTemplate reportTemplate);

+ 10 - 1
flow-report/flow-report-biz/src/main/java/com/flow/service/impl/ReportTemplateServiceImpl.java

@@ -11,6 +11,7 @@ import com.flow.service.ReportTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
 import java.util.Set;
 
 @Service
@@ -25,13 +26,21 @@ public class ReportTemplateServiceImpl extends BaseServiceImpl<ReportTemplateDao
     public PageResult<ReportTemplate> getList(ReportTemplateQuery reportTemplateQuery) {
         ReportTemplate reportTemplate = reportTemplateMapper.toEntity(reportTemplateQuery);
         Page<ReportTemplate> page = reportTemplateDao.lambdaQueryChain()
-                .setEntity(reportTemplate)
+                .select(ReportTemplate.class, i -> !i.getColumn().equals("data"))
                 .page(
                         new Page<>(reportTemplateQuery.getPage(), reportTemplateQuery.getLimit())
                 );
         return new PageResult<>(page.getTotal(), page.getRecords());
     }
 
+    @Override
+    public ReportTemplate getTemplate(String id) {
+        Optional<ReportTemplate> optional = reportTemplateDao.lambdaQueryChain()
+                .eq(ReportTemplate::getId, id)
+                .oneOpt();
+        return optional.orElse(null);
+    }
+
     @Override
     public ReportTemplate create(ReportTemplate reportTemplate) {
         reportTemplateDao.insert(reportTemplate);

+ 6 - 4
flow-report/flow-report-controller/src/main/java/com/flow/controller/ReportTemplateController.java

@@ -2,12 +2,8 @@ package com.flow.controller;
 
 import com.flow.common.core.model.PageResult;
 import com.flow.common.core.model.Result;
-import com.flow.entity.ReportDatasource;
 import com.flow.entity.ReportTemplate;
-import com.flow.model.ExecSql;
-import com.flow.model.ReportDatasourceQuery;
 import com.flow.model.ReportTemplateQuery;
-import com.flow.service.ReportDatasourceService;
 import com.flow.service.ReportTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,6 +23,12 @@ public class ReportTemplateController {
         return Result.success(list);
     }
 
+    @GetMapping("/{id}")
+    public Result<ReportTemplate> getTemplate(@PathVariable String id) {
+        ReportTemplate template = reportTemplateService.getTemplate(id);
+        return Result.success(template);
+    }
+
     @PreAuthorize("hasAnyAuthority('reportTemplate:add')")
     @PostMapping
     public Result<ReportTemplate> create(@RequestBody ReportTemplate reportTemplate) {