Commit cc75d3c6 authored by wujipeng's avatar wujipeng
Browse files

新增编辑模板

parent b154d51a
......@@ -3,6 +3,9 @@ package com.ruzhoukj.integration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.integration.pojo.entity.TemplateExpansionEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author : wujipeng
......@@ -12,4 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface TemplateExpansionMapper extends BaseMapper<TemplateExpansionEntity> {
void removeByCellNumber(@Param("cellNumberList") List<String> cellNumberList, @Param("templateId") String templateId);
void updateByCellNumber(@Param("templateExpansionList") List<TemplateExpansionEntity> templateExpansionList, @Param("templateId") String templateId);
}
......@@ -40,4 +40,8 @@ public class TemplateEntity {
@ApiModelProperty(value = "基本属性")
@TableField(exist = false)
private Map<String, TemplateDetailEntity> basic;
@ApiModelProperty(value = "拓展属性")
@TableField(exist = false)
private Map<String, TemplateExpansionEntity> expansion;
}
......@@ -3,6 +3,8 @@ package com.ruzhoukj.integration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.integration.pojo.entity.TemplateExpansionEntity;
import java.util.List;
/**
* @author : wujipeng
* @date : 2026/3/3 11:03
......@@ -10,4 +12,9 @@ import com.ruzhoukj.integration.pojo.entity.TemplateExpansionEntity;
* @Desc : 描述信息
*/
public interface TemplateExpansionService extends IService<TemplateExpansionEntity> {
void removeByCellNumber(List<String> removeIdList, String templateId);
void updateByCellNumber(List<TemplateExpansionEntity> templateExpansionList, String templateId);
}
......@@ -6,6 +6,8 @@ import com.ruzhoukj.integration.pojo.entity.TemplateExpansionEntity;
import com.ruzhoukj.integration.service.TemplateExpansionService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author : wujipeng
* @date : 2026/3/3 11:04
......@@ -14,4 +16,13 @@ import org.springframework.stereotype.Service;
*/
@Service
public class TemplateExpansionServiceImpl extends ServiceImpl<TemplateExpansionMapper, TemplateExpansionEntity> implements TemplateExpansionService {
@Override
public void removeByCellNumber(List<String> removeIdList, String templateId) {
baseMapper.removeByCellNumber(removeIdList, templateId);
}
@Override
public void updateByCellNumber(List<TemplateExpansionEntity> templateExpansionList, String templateId) {
baseMapper.updateByCellNumber(templateExpansionList,templateId);
}
}
......@@ -10,6 +10,7 @@ import com.ruzhoukj.integration.service.TemplateDetailService;
import com.ruzhoukj.integration.service.TemplateExpansionService;
import com.ruzhoukj.integration.service.TemplateService;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.*;
......@@ -65,10 +66,44 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
List<String> templateDetailList = templateDetailService.getCellNumberList(templateDTO.getId());
//处理模板详情
handleUpdateTemplateDetail(templateDTO.getData(), templateDTO.getBasic(), templateDetailList, templateDTO.getId());
return null;
//处理模板拓展
handleUpdateTemplateExpansion(templateDTO.getExpansion(), templateDetailList, templateDTO.getId());
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);
}
}
//删除旧数据
templateExpansionService.removeByCellNumber(removeIdList, templateId);
//更新数据
templateExpansionService.updateByCellNumber(updateList, templateId);
//新增新数据
List<String> insertIdList = getUniqueKeys(expansion, CellNumberList);
for (String cellNumber : insertIdList) {
TemplateExpansionEntity templateExpansion = expansion.get(cellNumber);
templateExpansion.setTemplateId(templateId);
insertList.add(templateExpansion);
}
templateExpansionService.saveBatch(insertList);
}
private void handleUpdateTemplateDetail(Map<String, String> data, Map<String, TemplateDetailEntity> basic, List<String> CellNumberList, String templateId) {
if (ObjectUtils.isEmpty(data) || ObjectUtils.isEmpty(basic)) {
return;
}
List<String> removeIdList = new ArrayList<>();
List<TemplateDetailEntity> updateList = new ArrayList<>();
List<TemplateDetailEntity> insertList = new ArrayList<>();
......@@ -96,12 +131,12 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
templateDetailService.saveBatch(insertList);
}
public static List<String> getUniqueKeys(Map<String, String> data,
List<String> cellNumberList) {
public static <T> List<String> getUniqueKeys(Map<String, T> 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()) {
for (Map.Entry<String, T> entry : data.entrySet()) {
if (!cellNumberSet.contains(entry.getKey())) {
insertIdList.add(entry.getKey());
}
......
......@@ -2,6 +2,27 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruzhoukj.integration.mapper.TemplateExpansionMapper">
<delete id="removeByCellNumber">
delete from
template_expansion
where
template_id = #{templateId}
and
location in
<foreach collection="cellNumberList" item="cellNumber" separator="," open="(" close=")">
#{cellNumber}
</foreach>
</delete>
<update id="updateByCellNumber">
<foreach collection="templateExpansionList" item="item">
UPDATE
template_expansion
SET
json = #{item.json}
WHERE
template_id = #{templateId}
AND
location = #{item.location}
</foreach>
</update>
</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