Commit b154d51a authored by wujipeng's avatar wujipeng
Browse files

新增编辑模板

parent 43d693b1
package com.ruzhoukj.integration.controller;
import com.ruzhoukj.integration.pojo.dto.TemplateDTO;
import com.ruzhoukj.integration.result.Result;
import com.ruzhoukj.integration.service.TemplateService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @author : wujipeng
* @date : 2026/3/3 11:46
* @Version: 1.0
* @Desc : 描述信息
*/
@RestController
@RequestMapping("/template")
public class TemplateController {
@Resource
private TemplateService templateService;
@ApiOperation("新增编辑")
@RequestMapping("/saveOrUpdate")
public Result<Boolean> saveOrUpdateTemplate(@RequestBody TemplateDTO templateDTO) {
return Result.success(templateService.saveOrUpdateTemplate(templateDTO));
}
}
...@@ -3,6 +3,9 @@ package com.ruzhoukj.integration.mapper; ...@@ -3,6 +3,9 @@ package com.ruzhoukj.integration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity; import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -12,4 +15,10 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,4 +15,10 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface TemplateDetailMapper extends BaseMapper<TemplateDetailEntity> { public interface TemplateDetailMapper extends BaseMapper<TemplateDetailEntity> {
List<String> getCellNumberList(@Param("templateId") String templateId);
void removeByCellNumber(@Param("cellNumberList") List<String> cellNumberList, @Param("templateId") String templateId);
void updateByCellNumber(@Param("templateDetailList") List<TemplateDetailEntity> templateDetailList, @Param("templateId") String templateId);
} }
package com.ruzhoukj.integration.pojo.dto;
import com.ruzhoukj.integration.pojo.entity.TemplateEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author : wujipeng
* @date : 2026/3/3 13:50
* @Version: 1.0
* @Desc : 描述信息
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class TemplateDTO extends TemplateEntity {
}
...@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -15,6 +18,9 @@ import lombok.Data; ...@@ -15,6 +18,9 @@ import lombok.Data;
*/ */
@Data @Data
@TableName("template_detail") @TableName("template_detail")
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class TemplateDetailEntity { public class TemplateDetailEntity {
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
...@@ -28,7 +34,7 @@ public class TemplateDetailEntity { ...@@ -28,7 +34,7 @@ public class TemplateDetailEntity {
private String location; private String location;
@ApiModelProperty(value = "值") @ApiModelProperty(value = "值")
private Double value; private String value;
@ApiModelProperty(value = "数据类型") @ApiModelProperty(value = "数据类型")
private String type; private String type;
......
...@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; ...@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Map;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2026/3/3 10:40 * @date : 2026/3/3 10:40
...@@ -24,11 +26,18 @@ public class TemplateEntity { ...@@ -24,11 +26,18 @@ public class TemplateEntity {
private String name; private String name;
@ApiModelProperty(value = "行数") @ApiModelProperty(value = "行数")
@TableField("line_number") @TableField("row_number")
private Integer lineNumber; private Integer rowNumber;
@ApiModelProperty(value = "列数") @ApiModelProperty(value = "列数")
@TableField("column_name") @TableField("column_number")
private Integer columnName; private Integer columnNumber;
@ApiModelProperty(value = "数据")
@TableField(exist = false)
private Map<String, String> data;
@ApiModelProperty(value = "基本属性")
@TableField(exist = false)
private Map<String, TemplateDetailEntity> basic;
} }
...@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -15,6 +18,9 @@ import lombok.Data; ...@@ -15,6 +18,9 @@ import lombok.Data;
*/ */
@Data @Data
@TableName("template_expansion") @TableName("template_expansion")
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class TemplateExpansionEntity { public class TemplateExpansionEntity {
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
......
...@@ -3,6 +3,8 @@ package com.ruzhoukj.integration.service; ...@@ -3,6 +3,8 @@ package com.ruzhoukj.integration.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity; import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2026/3/3 10:59 * @date : 2026/3/3 10:59
...@@ -10,4 +12,17 @@ import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity; ...@@ -10,4 +12,17 @@ import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
public interface TemplateDetailService extends IService<TemplateDetailEntity> { public interface TemplateDetailService extends IService<TemplateDetailEntity> {
/**
* 获取单元格编号集合
*
* @param templateId 模板id
* @return List<String>
*/
List<String> getCellNumberList(String templateId);
void removeByCellNumber(List<String> cellNumberList, String templateId);
void updateByCellNumber(List<TemplateDetailEntity> templateDetailList, String templateId);
} }
package com.ruzhoukj.integration.service; package com.ruzhoukj.integration.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.integration.pojo.dto.TemplateDTO;
import com.ruzhoukj.integration.pojo.entity.TemplateEntity; import com.ruzhoukj.integration.pojo.entity.TemplateEntity;
/** /**
...@@ -10,4 +11,6 @@ import com.ruzhoukj.integration.pojo.entity.TemplateEntity; ...@@ -10,4 +11,6 @@ import com.ruzhoukj.integration.pojo.entity.TemplateEntity;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
public interface TemplateService extends IService<TemplateEntity> { public interface TemplateService extends IService<TemplateEntity> {
Boolean saveOrUpdateTemplate(TemplateDTO templateDTO);
} }
...@@ -6,6 +6,8 @@ import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity; ...@@ -6,6 +6,8 @@ import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity;
import com.ruzhoukj.integration.service.TemplateDetailService; import com.ruzhoukj.integration.service.TemplateDetailService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2026/3/3 11:00 * @date : 2026/3/3 11:00
...@@ -14,4 +16,18 @@ import org.springframework.stereotype.Service; ...@@ -14,4 +16,18 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class TemplateDetailServiceImpl extends ServiceImpl<TemplateDetailMapper, TemplateDetailEntity> implements TemplateDetailService { public class TemplateDetailServiceImpl extends ServiceImpl<TemplateDetailMapper, TemplateDetailEntity> implements TemplateDetailService {
@Override
public List<String> getCellNumberList(String templateId) {
return baseMapper.getCellNumberList(templateId);
}
@Override
public void removeByCellNumber(List<String> cellNumberList, String templateId) {
baseMapper.removeByCellNumber(cellNumberList, templateId);
}
@Override
public void updateByCellNumber(List<TemplateDetailEntity> templateDetailList, String templateId) {
baseMapper.updateByCellNumber(templateDetailList, templateId);
}
} }
...@@ -2,10 +2,18 @@ package com.ruzhoukj.integration.service.impl; ...@@ -2,10 +2,18 @@ package com.ruzhoukj.integration.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.integration.mapper.TemplateMapper; import com.ruzhoukj.integration.mapper.TemplateMapper;
import com.ruzhoukj.integration.pojo.dto.TemplateDTO;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity;
import com.ruzhoukj.integration.pojo.entity.TemplateEntity; import com.ruzhoukj.integration.pojo.entity.TemplateEntity;
import com.ruzhoukj.integration.pojo.entity.TemplateExpansionEntity;
import com.ruzhoukj.integration.service.TemplateDetailService;
import com.ruzhoukj.integration.service.TemplateExpansionService;
import com.ruzhoukj.integration.service.TemplateService; import com.ruzhoukj.integration.service.TemplateService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2026/3/3 10:57 * @date : 2026/3/3 10:57
...@@ -14,4 +22,100 @@ import org.springframework.stereotype.Service; ...@@ -14,4 +22,100 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEntity> implements TemplateService { public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEntity> implements TemplateService {
@Resource
private TemplateDetailService templateDetailService;
@Resource
private TemplateExpansionService templateExpansionService;
@Override
public Boolean saveOrUpdateTemplate(TemplateDTO templateDTO) {
//判断是新增还是编辑
if (templateDTO.getId() == null) {
//新增模板
save(templateDTO);
//初始化模板所有单元格位置
List<String> locations = new ArrayList<>();
for (int row = 1; row <= templateDTO.getRowNumber(); row++) {
for (int col = 0; col < templateDTO.getRowNumber(); col++) {
String columnLabel = getExcelColumnLabel(col);
locations.add(columnLabel + row + ":" + columnLabel + row);
}
}
//初始化模板详情和模板拓展
List<TemplateDetailEntity> templateDetailList = new ArrayList<>();
List<TemplateExpansionEntity> templateExpansionList = new ArrayList<>();
for (String location : locations) {
templateDetailList.add(TemplateDetailEntity.builder()
.templateId(templateDTO.getId())
.location(location)
.build());
templateExpansionList.add(TemplateExpansionEntity.builder()
.templateId(templateDTO.getId())
.location(location)
.build());
}
templateDetailService.saveBatch(templateDetailList);
templateExpansionService.saveBatch(templateExpansionList);
} else {
//编辑模板
updateById(templateDTO);
}
//查询模板详情单元格编号集合
List<String> templateDetailList = templateDetailService.getCellNumberList(templateDTO.getId());
//处理模板详情
handleUpdateTemplateDetail(templateDTO.getData(), templateDTO.getBasic(), templateDetailList, templateDTO.getId());
return null;
}
private void handleUpdateTemplateDetail(Map<String, String> data, Map<String, TemplateDetailEntity> basic, List<String> CellNumberList, String templateId) {
List<String> removeIdList = new ArrayList<>();
List<TemplateDetailEntity> updateList = new ArrayList<>();
List<TemplateDetailEntity> insertList = new ArrayList<>();
for (String cellNumber : CellNumberList) {
if (data.containsKey(cellNumber)) {
TemplateDetailEntity templateDetail = basic.get(cellNumber);
templateDetail.setValue(data.get(cellNumber));
updateList.add(templateDetail);
} else {
removeIdList.add(cellNumber);
}
}
//删除旧数据
templateDetailService.removeByCellNumber(removeIdList, templateId);
//更新数据
templateDetailService.updateByCellNumber(updateList, templateId);
//新增新数据
List<String> insertIdList = getUniqueKeys(data, CellNumberList);
for (String cellNumber : insertIdList) {
TemplateDetailEntity templateDetail = basic.get(cellNumber);
templateDetail.setValue(data.get(cellNumber));
templateDetail.setTemplateId(templateId);
insertList.add(templateDetail);
}
templateDetailService.saveBatch(insertList);
}
public static List<String> getUniqueKeys(Map<String, String> data,
List<String> cellNumberList) {
// 将List转换为Set以提高查找效率
Set<String> cellNumberSet = new HashSet<>(cellNumberList);
List<String> insertIdList = new ArrayList<>();
for (Map.Entry<String, String> entry : data.entrySet()) {
if (!cellNumberSet.contains(entry.getKey())) {
insertIdList.add(entry.getKey());
}
}
return insertIdList;
}
//生成Excel列标签
public static String getExcelColumnLabel(int colIndex) {
StringBuilder label = new StringBuilder();
while (colIndex >= 0) {
label.insert(0, (char) ('A' + colIndex % 26));
colIndex = (colIndex / 26) - 1;
}
return label.toString();
}
} }
...@@ -2,6 +2,45 @@ ...@@ -2,6 +2,45 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruzhoukj.integration.mapper.TemplateDetailMapper"> <mapper namespace="com.ruzhoukj.integration.mapper.TemplateDetailMapper">
<select id="getCellNumberList" resultType="java.lang.String">
select
location
from
template_detail
where
template_id = #{templateId}
</select>
<delete id="removeByCellNumber">
delete from
template_detail
where
template_id = #{templateId}
and
location in
<foreach collection="cellNumberList" item="cellNumber" separator="," open="(" close=")">
#{cellNumber}
</foreach>
</delete>
<update id="updateByCellNumber">
<foreach collection="templateDetailList" item="item">
UPDATE
template_detail
SET
value = #{item.value},
type = #{item.type},
static_value = #{item.staticValue},
format = #{item.format},
meta_id = #{item.metaId},
formula = #{item.formula},
report_id = #{item.reportId},
report_name = #{item.reportName},
report_location = #{item.reportLocation},
offset = #{item.offset},
offset_number = #{item.offsetNumber}
WHERE
template_id = #{templateId}
AND
location = #{item.location}
</foreach>
</update>
</mapper> </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