Commit a5cf2b71 authored by wujipeng's avatar wujipeng
Browse files

模板结构修改

parent b777c40a
package com.ruzhoukj.integration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.integration.pojo.entity.TemplateConfigEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* @author : wujipeng
* @date : 2026/3/6 11:50
* @Version: 1.0
* @Desc : 描述信息
*/
@Mapper
public interface TemplateConfigMapper extends BaseMapper<TemplateConfigEntity> {
}
package com.ruzhoukj.integration.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author : wujipeng
* @date : 2026/3/6 11:47
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
@TableName("template_config")
@JsonInclude(JsonInclude.Include.NON_NULL)
public class TemplateConfigEntity {
@TableId(type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "模板id")
@TableField(value = "template_id")
private String templateId;
private String num;
@ApiModelProperty(value = "row, col")
private String type;
@ApiModelProperty(value = "高度")
private Integer height;
@ApiModelProperty(value = "宽度")
private Integer width;
@ApiModelProperty(value = "是否隐藏")
private Boolean hidden;
}
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
......@@ -33,11 +34,27 @@ public class TemplateEntity {
@TableField("column_number")
private Integer columnNumber;
@ApiModelProperty(value = "版本")
@TableField("version")
private String version;
@ApiModelProperty(value = "基础单元格")
@TableField(exist = false)
private Map<String, TemplateDetailBasicEntity> cells;
@ApiModelProperty(value = "拓展属性")
@ApiModelProperty(value = "复合单元格")
@TableField(exist = false)
private List<TemplateDetailMergeEntity> merges;
// @ApiModelProperty(value = "拓展属性")
// @TableField(exist = false)
// private Map<String, TemplateExpansionEntity> expansion;
@ApiModelProperty(value = "行配置")
@TableField(exist = false)
private Map<String, TemplateConfigEntity> rows;
@ApiModelProperty(value = "列配置")
@TableField(exist = false)
private Map<String, TemplateExpansionEntity> expansion;
private Map<String, TemplateConfigEntity> columns;
}
package com.ruzhoukj.integration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.integration.pojo.entity.TemplateConfigEntity;
/**
* @author : wujipeng
* @date : 2026/3/6 11:51
* @Version: 1.0
* @Desc : 描述信息
*/
public interface TemplateConfigService extends IService<TemplateConfigEntity> {
}
package com.ruzhoukj.integration.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.integration.mapper.TemplateConfigMapper;
import com.ruzhoukj.integration.pojo.entity.TemplateConfigEntity;
import com.ruzhoukj.integration.service.TemplateConfigService;
import org.springframework.stereotype.Service;
/**
* @author : wujipeng
* @date : 2026/3/6 11:51
* @Version: 1.0
* @Desc : 描述信息
*/
@Service
public class TemplateConfigServiceImpl extends ServiceImpl<TemplateConfigMapper, TemplateConfigEntity> implements TemplateConfigService {
}
package com.ruzhoukj.integration.service.impl;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.ruzhoukj.integration.mapper.TemplateMapper;
import com.ruzhoukj.integration.pojo.dto.TemplateDTO;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailBasicEntity;
import com.ruzhoukj.integration.pojo.entity.TemplateEntity;
import com.ruzhoukj.integration.pojo.entity.TemplateExpansionEntity;
import com.ruzhoukj.integration.pojo.entity.*;
import com.ruzhoukj.integration.pojo.vo.TemplateVO;
import com.ruzhoukj.integration.result.PageResult;
import com.ruzhoukj.integration.service.TemplateDetailBasicService;
import com.ruzhoukj.integration.service.TemplateExpansionService;
import com.ruzhoukj.integration.service.TemplateService;
import com.ruzhoukj.integration.service.*;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
......@@ -32,8 +30,12 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Resource
private TemplateDetailBasicService templateDetailBasicService;
// @Resource
// private TemplateExpansionService templateExpansionService;
@Resource
private TemplateExpansionService templateExpansionService;
private TemplateDetailMergeService templateDetailMergeService;
@Resource
private TemplateConfigService templateConfigService;
@Override
@Transactional
......@@ -52,19 +54,19 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
}
//初始化模板详情和模板拓展
List<TemplateDetailBasicEntity> templateDetailList = new ArrayList<>();
List<TemplateExpansionEntity> templateExpansionList = new ArrayList<>();
// List<TemplateExpansionEntity> templateExpansionList = new ArrayList<>();
for (String location : locations) {
templateDetailList.add(TemplateDetailBasicEntity.builder()
.templateId(templateDTO.getId())
.location(location)
.build());
templateExpansionList.add(TemplateExpansionEntity.builder()
.templateId(templateDTO.getId())
.location(location)
.build());
// templateExpansionList.add(TemplateExpansionEntity.builder()
// .templateId(templateDTO.getId())
// .location(location)
// .build());
}
templateDetailBasicService.saveBatch(templateDetailList);
templateExpansionService.saveBatch(templateExpansionList);
// templateExpansionService.saveBatch(templateExpansionList);
} else {
//编辑模板
updateById(templateDTO);
......@@ -74,45 +76,61 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
//处理模板详情
handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId());
//查询模板拓展单元格编号集合
List<String> templateExpansionList = templateExpansionService.getCellNumberList(templateDTO.getId());
// List<String> templateExpansionList = templateExpansionService.getCellNumberList(templateDTO.getId());
//处理模板拓展
handleUpdateTemplateExpansion(templateDTO.getExpansion(), templateExpansionList, templateDTO.getId());
return Boolean.TRUE;
}
private void handleUpdateTemplateExpansion(Map<String, TemplateExpansionEntity> expansion, List<String> CellNumberList, String templateId) {
if (ObjectUtils.isEmpty(expansion)) {
return;
// handleUpdateTemplateExpansion(templateDTO.getExpansion(), templateExpansionList, templateDTO.getId());
//处理模板详情复合
List<TemplateDetailMergeEntity> merges = templateDTO.getMerges();
if (!ObjectUtils.isEmpty(merges)) {
templateDetailMergeService.saveOrUpdateBatch(merges);
}
List<String> removeIdList = new ArrayList<>();
List<TemplateExpansionEntity> updateList = new ArrayList<>();
List<TemplateExpansionEntity> insertList = new ArrayList<>();
for (String cellNumber : CellNumberList) {
if (expansion.containsKey(cellNumber)) {
TemplateExpansionEntity templateExpansion = expansion.get(cellNumber);
updateList.add(templateExpansion);
} else {
removeIdList.add(cellNumber);
}
//处理模板详情行列配置
Map<String, TemplateConfigEntity> rows = templateDTO.getRows();
Map<String, TemplateConfigEntity> columns = templateDTO.getColumns();
List<TemplateConfigEntity> templateConfigList = new ArrayList<>();
if(!ObjectUtils.isEmpty(rows)){
templateConfigList.addAll(rows.values());
}
//删除旧数据
if (!ObjectUtils.isEmpty(removeIdList)) {
templateExpansionService.removeByCellNumber(removeIdList, templateId);
}
//更新数据
templateExpansionService.updateBatchById(updateList);
//新增新数据
List<String> insertIdList = getUniqueKeys(expansion, CellNumberList);
for (String cellNumber : insertIdList) {
TemplateExpansionEntity templateExpansion = expansion.get(cellNumber);
templateExpansion.setTemplateId(templateId);
insertList.add(templateExpansion);
}
if (!ObjectUtils.isEmpty(insertList)) {
templateExpansionService.saveBatch(insertList);
if(!ObjectUtils.isEmpty(columns)){
templateConfigList.addAll(columns.values());
}
templateConfigService.saveOrUpdateBatch(templateConfigList);
return Boolean.TRUE;
}
// private void handleUpdateTemplateExpansion(Map<String, TemplateExpansionEntity> expansion, List<String> CellNumberList, String templateId) {
// if (ObjectUtils.isEmpty(expansion)) {
// return;
// }
// List<String> removeIdList = new ArrayList<>();
// List<TemplateExpansionEntity> updateList = new ArrayList<>();
// List<TemplateExpansionEntity> insertList = new ArrayList<>();
// for (String cellNumber : CellNumberList) {
// if (expansion.containsKey(cellNumber)) {
// TemplateExpansionEntity templateExpansion = expansion.get(cellNumber);
// updateList.add(templateExpansion);
// } else {
// removeIdList.add(cellNumber);
// }
// }
// //删除旧数据
// if (!ObjectUtils.isEmpty(removeIdList)) {
// templateExpansionService.removeByCellNumber(removeIdList, templateId);
// }
// //更新数据
// templateExpansionService.updateBatchById(updateList);
// //新增新数据
// List<String> insertIdList = getUniqueKeys(expansion, CellNumberList);
// for (String cellNumber : insertIdList) {
// TemplateExpansionEntity templateExpansion = expansion.get(cellNumber);
// templateExpansion.setTemplateId(templateId);
// insertList.add(templateExpansion);
// }
// if (!ObjectUtils.isEmpty(insertList)) {
// templateExpansionService.saveBatch(insertList);
// }
// }
private void handleUpdateTemplateDetail(Map<String, TemplateDetailBasicEntity> basic, List<String> CellNumberList, String templateId) {
if (ObjectUtils.isEmpty(basic)) {
return;
......@@ -172,9 +190,9 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Override
public TemplateVO getTemplateDetail(String id) {
Map<String, TemplateDetailBasicEntity> basic = new HashMap<>();
Map<String, TemplateExpansionEntity> expansion = new HashMap<>();
// Map<String, TemplateExpansionEntity> expansion = new HashMap<>();
TemplateVO result = baseMapper.getTemplateDetail(id);
//查询模板详情
//查询模板详情基础
List<TemplateDetailBasicEntity> templateDetailList = templateDetailBasicService
.list(new LambdaQueryWrapper<TemplateDetailBasicEntity>()
.eq(TemplateDetailBasicEntity::getTemplateId, id));
......@@ -182,14 +200,32 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
basic.put(templateDetailBasicEntity.getLocation(), templateDetailBasicEntity);
}
//查询模板拓展
List<TemplateExpansionEntity> templateExpansionList = templateExpansionService
.list(new LambdaQueryWrapper<TemplateExpansionEntity>()
.eq(TemplateExpansionEntity::getTemplateId, id));
for (TemplateExpansionEntity templateExpansionEntity : templateExpansionList) {
expansion.put(templateExpansionEntity.getLocation(), templateExpansionEntity);
}
// List<TemplateExpansionEntity> templateExpansionList = templateExpansionService
// .list(new LambdaQueryWrapper<TemplateExpansionEntity>()
// .eq(TemplateExpansionEntity::getTemplateId, id));
// for (TemplateExpansionEntity templateExpansionEntity : templateExpansionList) {
// expansion.put(templateExpansionEntity.getLocation(), templateExpansionEntity);
// }
result.setCells(basic);
result.setExpansion(expansion);
// result.setExpansion(expansion);
//获取模板详情复合
List<TemplateDetailMergeEntity> templateDetailMergeList = templateDetailMergeService.list(new LambdaQueryWrapper<TemplateDetailMergeEntity>()
.eq(TemplateDetailMergeEntity::getTemplateId, id));
result.setMerges(templateDetailMergeList);
//查询模板配置
List<TemplateConfigEntity> templateConfigList = templateConfigService.list(new LambdaQueryWrapper<TemplateConfigEntity>()
.eq(TemplateConfigEntity::getTemplateId, id));
Map<String, TemplateConfigEntity> rows = new HashMap<>();
Map<String, TemplateConfigEntity> columns = new HashMap<>();
for (TemplateConfigEntity templateConfigEntity : templateConfigList) {
if("row".equals(templateConfigEntity.getType())){
rows.put(templateConfigEntity.getNum(), templateConfigEntity);
} else {
columns.put(templateConfigEntity.getNum(), templateConfigEntity);
}
}
result.setRows(rows);
result.setColumns(columns);
return result;
}
......@@ -197,7 +233,9 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Transactional
public Boolean deleteTemplate(String id) {
templateDetailBasicService.remove(new LambdaQueryWrapper<TemplateDetailBasicEntity>().eq(TemplateDetailBasicEntity::getTemplateId, id));
templateExpansionService.remove(new LambdaQueryWrapper<TemplateExpansionEntity>().eq(TemplateExpansionEntity::getTemplateId, id));
// templateExpansionService.remove(new LambdaQueryWrapper<TemplateExpansionEntity>().eq(TemplateExpansionEntity::getTemplateId, id));
templateDetailMergeService.remove(new LambdaQueryWrapper<TemplateDetailMergeEntity>().eq(TemplateDetailMergeEntity::getTemplateId, id));
templateConfigService.remove(new LambdaQueryWrapper<TemplateConfigEntity>().eq(TemplateConfigEntity::getTemplateId, id));
return removeById(id);
}
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruzhoukj.integration.mapper.TemplateConfigMapper">
</mapper>
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