Commit 07fe980f authored by wujipeng's avatar wujipeng
Browse files

优化

parent a4b39a84
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.4.6</version> <version>1.4.6</version>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.38</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
......
...@@ -40,7 +40,7 @@ public class ReportDetailBasicEntity { ...@@ -40,7 +40,7 @@ public class ReportDetailBasicEntity {
@ApiModelProperty(value = "值") @ApiModelProperty(value = "值")
private String value; private String value;
@ApiModelProperty(value = "数据类型") @ApiModelProperty(value = "数据类型(静态值、元数据、公式、引用报表)")
private String type; private String type;
@ApiModelProperty(value = "静态值") @ApiModelProperty(value = "静态值")
......
...@@ -36,7 +36,7 @@ public class TemplateDetailBasicEntity { ...@@ -36,7 +36,7 @@ public class TemplateDetailBasicEntity {
@ApiModelProperty(value = "值") @ApiModelProperty(value = "值")
private String value; private String value;
@ApiModelProperty(value = "数据类型") @ApiModelProperty(value = "数据类型(静态值、元数据、公式、引用报表)")
private String type; private String type;
@ApiModelProperty(value = "静态值") @ApiModelProperty(value = "静态值")
......
package com.ruzhoukj.integration.service.impl; package com.ruzhoukj.integration.service.impl;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.ruzhoukj.integration.mapper.TemplateMapper; import com.ruzhoukj.integration.mapper.TemplateMapper;
import com.ruzhoukj.integration.pojo.dto.TemplateDTO; import com.ruzhoukj.integration.pojo.dto.TemplateDTO;
import com.ruzhoukj.integration.pojo.entity.*; import com.ruzhoukj.integration.pojo.entity.TemplateConfigEntity;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailBasicEntity;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailMergeEntity;
import com.ruzhoukj.integration.pojo.entity.TemplateEntity;
import com.ruzhoukj.integration.pojo.vo.TemplateVO; import com.ruzhoukj.integration.pojo.vo.TemplateVO;
import com.ruzhoukj.integration.result.PageResult; import com.ruzhoukj.integration.result.PageResult;
import com.ruzhoukj.integration.service.*; import com.ruzhoukj.integration.service.TemplateConfigService;
import io.swagger.annotations.ApiModelProperty; import com.ruzhoukj.integration.service.TemplateDetailBasicService;
import com.ruzhoukj.integration.service.TemplateDetailMergeService;
import com.ruzhoukj.integration.service.TemplateService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
...@@ -30,7 +34,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -30,7 +34,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Resource @Resource
private TemplateDetailBasicService templateDetailBasicService; private TemplateDetailBasicService templateDetailBasicService;
// @Resource // @Resource
// private TemplateExpansionService templateExpansionService; // private TemplateExpansionService templateExpansionService;
@Resource @Resource
private TemplateDetailMergeService templateDetailMergeService; private TemplateDetailMergeService templateDetailMergeService;
...@@ -43,9 +47,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -43,9 +47,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
//判断是新增还是编辑 //判断是新增还是编辑
if (templateDTO.getId() == null) { if (templateDTO.getId() == null) {
//新增模板 //新增模板
templateDTO.setId("1.0"); templateDTO.setVersion("1.0");
save(templateDTO); save(templateDTO);
//初始化模板所有单元格位置 //初始化模板所有单元格位置
if (!ObjectUtils.isEmpty(templateDTO.getLineNumber()) && !ObjectUtils.isEmpty(templateDTO.getColumnNumber())) {
List<String> locations = new ArrayList<>(); List<String> locations = new ArrayList<>();
for (int row = 1; row <= templateDTO.getLineNumber(); row++) { for (int row = 1; row <= templateDTO.getLineNumber(); row++) {
for (int col = 0; col < templateDTO.getColumnNumber(); col++) { for (int col = 0; col < templateDTO.getColumnNumber(); col++) {
...@@ -68,6 +73,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -68,6 +73,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
} }
templateDetailBasicService.saveBatch(templateDetailList); templateDetailBasicService.saveBatch(templateDetailList);
// templateExpansionService.saveBatch(templateExpansionList); // templateExpansionService.saveBatch(templateExpansionList);
}
} else { } else {
//编辑模板 //编辑模板
updateById(templateDTO); updateById(templateDTO);
...@@ -89,10 +95,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -89,10 +95,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
Map<String, TemplateConfigEntity> rows = templateDTO.getRows(); Map<String, TemplateConfigEntity> rows = templateDTO.getRows();
Map<String, TemplateConfigEntity> columns = templateDTO.getColumns(); Map<String, TemplateConfigEntity> columns = templateDTO.getColumns();
List<TemplateConfigEntity> templateConfigList = new ArrayList<>(); List<TemplateConfigEntity> templateConfigList = new ArrayList<>();
if(!ObjectUtils.isEmpty(rows)){ if (!ObjectUtils.isEmpty(rows)) {
templateConfigList.addAll(rows.values()); templateConfigList.addAll(rows.values());
} }
if(!ObjectUtils.isEmpty(columns)){ if (!ObjectUtils.isEmpty(columns)) {
templateConfigList.addAll(columns.values()); templateConfigList.addAll(columns.values());
} }
templateConfigService.saveOrUpdateBatch(templateConfigList); templateConfigService.saveOrUpdateBatch(templateConfigList);
...@@ -219,7 +225,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -219,7 +225,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
Map<String, TemplateConfigEntity> rows = new HashMap<>(); Map<String, TemplateConfigEntity> rows = new HashMap<>();
Map<String, TemplateConfigEntity> columns = new HashMap<>(); Map<String, TemplateConfigEntity> columns = new HashMap<>();
for (TemplateConfigEntity templateConfigEntity : templateConfigList) { for (TemplateConfigEntity templateConfigEntity : templateConfigList) {
if("row".equals(templateConfigEntity.getType())){ if ("row".equals(templateConfigEntity.getType())) {
rows.put(templateConfigEntity.getNum(), templateConfigEntity); rows.put(templateConfigEntity.getNum(), templateConfigEntity);
} else { } else {
columns.put(templateConfigEntity.getNum(), templateConfigEntity); columns.put(templateConfigEntity.getNum(), templateConfigEntity);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment