Commit b777c40a authored by wujipeng's avatar wujipeng
Browse files

模板结构修改

parent 1808b5d4
package com.ruzhoukj.integration.mapper; 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.TemplateDetailBasicEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -14,11 +14,11 @@ import java.util.List; ...@@ -14,11 +14,11 @@ import java.util.List;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
@Mapper @Mapper
public interface TemplateDetailMapper extends BaseMapper<TemplateDetailEntity> { public interface TemplateDetailBasicMapper extends BaseMapper<TemplateDetailBasicEntity> {
List<String> getCellNumberList(@Param("templateId") String templateId); List<String> getCellNumberList(@Param("templateId") String templateId);
void removeByCellNumber(@Param("cellNumberList") List<String> cellNumberList, @Param("templateId") String templateId); void removeByCellNumber(@Param("cellNumberList") List<String> cellNumberList, @Param("templateId") String templateId);
void updateByCellNumber(@Param("templateDetail") TemplateDetailEntity templateDetail); void updateByCellNumber(@Param("templateDetail") TemplateDetailBasicEntity templateDetail);
} }
package com.ruzhoukj.integration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailMergeEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* @author : wujipeng
* @date : 2026/3/6 11:28
* @Version: 1.0
* @Desc : 描述信息
*/
@Mapper
public interface TemplateDetailMergeMapper extends BaseMapper<TemplateDetailMergeEntity> {
}
...@@ -17,11 +17,11 @@ import lombok.NoArgsConstructor; ...@@ -17,11 +17,11 @@ import lombok.NoArgsConstructor;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
@Data @Data
@TableName("template_detail") @TableName("template_detail_basic")
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class TemplateDetailEntity { public class TemplateDetailBasicEntity {
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
......
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author : wujipeng
* @date : 2026/3/6 11:26
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
@TableName(value = "template_detail_merge")
public class TemplateDetailMergeEntity {
@TableId(type = IdType.ASSIGN_ID)
private String id;
@TableField(value = "template_id")
@ApiModelProperty(value = "模板id")
private String templateId;
@TableField(value = "range_cell")
@ApiModelProperty(value = "合并范围")
private String rangeCell;
@TableField(value = "master_cell")
@ApiModelProperty(value = "主单元格")
private String masterCell;
}
...@@ -35,7 +35,7 @@ public class TemplateEntity { ...@@ -35,7 +35,7 @@ public class TemplateEntity {
@ApiModelProperty(value = "基础单元格") @ApiModelProperty(value = "基础单元格")
@TableField(exist = false) @TableField(exist = false)
private Map<String, TemplateDetailEntity> cells; private Map<String, TemplateDetailBasicEntity> cells;
@ApiModelProperty(value = "拓展属性") @ApiModelProperty(value = "拓展属性")
@TableField(exist = false) @TableField(exist = false)
......
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.entity.TemplateDetailEntity; import com.ruzhoukj.integration.pojo.entity.TemplateDetailBasicEntity;
import java.util.List; import java.util.List;
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
* @Version: 1.0 * @Version: 1.0
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
public interface TemplateDetailService extends IService<TemplateDetailEntity> { public interface TemplateDetailBasicService extends IService<TemplateDetailBasicEntity> {
/** /**
* 获取单元格编号集合 * 获取单元格编号集合
...@@ -23,6 +23,6 @@ public interface TemplateDetailService extends IService<TemplateDetailEntity> { ...@@ -23,6 +23,6 @@ public interface TemplateDetailService extends IService<TemplateDetailEntity> {
void removeByCellNumber(List<String> cellNumberList, String templateId); void removeByCellNumber(List<String> cellNumberList, String templateId);
void updateByCellNumber(TemplateDetailEntity templateDetail); void updateByCellNumber(TemplateDetailBasicEntity templateDetail);
} }
package com.ruzhoukj.integration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailMergeEntity;
/**
* @author : wujipeng
* @date : 2026/3/6 11:29
* @Version: 1.0
* @Desc : 描述信息
*/
public interface TemplateDetailMergeService extends IService<TemplateDetailMergeEntity> {
}
package com.ruzhoukj.integration.service.impl; 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.TemplateDetailMapper; import com.ruzhoukj.integration.mapper.TemplateDetailBasicMapper;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailEntity; import com.ruzhoukj.integration.pojo.entity.TemplateDetailBasicEntity;
import com.ruzhoukj.integration.service.TemplateDetailService; import com.ruzhoukj.integration.service.TemplateDetailBasicService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -15,7 +16,7 @@ import java.util.List; ...@@ -15,7 +16,7 @@ import java.util.List;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
@Service @Service
public class TemplateDetailServiceImpl extends ServiceImpl<TemplateDetailMapper, TemplateDetailEntity> implements TemplateDetailService { public class TemplateDetailBasicServiceImpl extends ServiceImpl<TemplateDetailBasicMapper, TemplateDetailBasicEntity> implements TemplateDetailBasicService {
@Override @Override
public List<String> getCellNumberList(String templateId) { public List<String> getCellNumberList(String templateId) {
return baseMapper.getCellNumberList(templateId); return baseMapper.getCellNumberList(templateId);
...@@ -27,7 +28,7 @@ public class TemplateDetailServiceImpl extends ServiceImpl<TemplateDetailMapper, ...@@ -27,7 +28,7 @@ public class TemplateDetailServiceImpl extends ServiceImpl<TemplateDetailMapper,
} }
@Override @Override
public void updateByCellNumber(TemplateDetailEntity templateDetail) { public void updateByCellNumber(TemplateDetailBasicEntity templateDetail) {
baseMapper.updateByCellNumber(templateDetail); baseMapper.updateByCellNumber(templateDetail);
} }
} }
package com.ruzhoukj.integration.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.integration.mapper.TemplateDetailMergeMapper;
import com.ruzhoukj.integration.pojo.entity.TemplateDetailMergeEntity;
import com.ruzhoukj.integration.service.TemplateDetailMergeService;
import org.springframework.stereotype.Service;
/**
* @author : wujipeng
* @date : 2026/3/6 11:29
* @Version: 1.0
* @Desc : 描述信息
*/
@Service
public class TemplateDetailMergeServiceImpl extends ServiceImpl<TemplateDetailMergeMapper, TemplateDetailMergeEntity> implements TemplateDetailMergeService {
}
...@@ -6,13 +6,12 @@ import com.github.pagehelper.Page; ...@@ -6,13 +6,12 @@ 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.TemplateDetailEntity; import com.ruzhoukj.integration.pojo.entity.TemplateDetailBasicEntity;
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.pojo.entity.TemplateExpansionEntity;
import com.ruzhoukj.integration.pojo.vo.MetaDataVO;
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.TemplateDetailService; import com.ruzhoukj.integration.service.TemplateDetailBasicService;
import com.ruzhoukj.integration.service.TemplateExpansionService; 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;
...@@ -32,7 +31,7 @@ import java.util.*; ...@@ -32,7 +31,7 @@ import java.util.*;
public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEntity> implements TemplateService { public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEntity> implements TemplateService {
@Resource @Resource
private TemplateDetailService templateDetailService; private TemplateDetailBasicService templateDetailBasicService;
@Resource @Resource
private TemplateExpansionService templateExpansionService; private TemplateExpansionService templateExpansionService;
...@@ -52,10 +51,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -52,10 +51,10 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
} }
} }
//初始化模板详情和模板拓展 //初始化模板详情和模板拓展
List<TemplateDetailEntity> templateDetailList = new ArrayList<>(); List<TemplateDetailBasicEntity> templateDetailList = new ArrayList<>();
List<TemplateExpansionEntity> templateExpansionList = new ArrayList<>(); List<TemplateExpansionEntity> templateExpansionList = new ArrayList<>();
for (String location : locations) { for (String location : locations) {
templateDetailList.add(TemplateDetailEntity.builder() templateDetailList.add(TemplateDetailBasicEntity.builder()
.templateId(templateDTO.getId()) .templateId(templateDTO.getId())
.location(location) .location(location)
.build()); .build());
...@@ -64,14 +63,14 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -64,14 +63,14 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
.location(location) .location(location)
.build()); .build());
} }
templateDetailService.saveBatch(templateDetailList); templateDetailBasicService.saveBatch(templateDetailList);
templateExpansionService.saveBatch(templateExpansionList); templateExpansionService.saveBatch(templateExpansionList);
} else { } else {
//编辑模板 //编辑模板
updateById(templateDTO); updateById(templateDTO);
} }
//查询模板详情单元格编号集合 //查询模板详情单元格编号集合
List<String> templateDetailList = templateDetailService.getCellNumberList(templateDTO.getId()); List<String> templateDetailList = templateDetailBasicService.getCellNumberList(templateDTO.getId());
//处理模板详情 //处理模板详情
handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId()); handleUpdateTemplateDetail(templateDTO.getCells(), templateDetailList, templateDTO.getId());
//查询模板拓展单元格编号集合 //查询模板拓展单元格编号集合
...@@ -114,16 +113,16 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -114,16 +113,16 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
} }
} }
private void handleUpdateTemplateDetail(Map<String, TemplateDetailEntity> basic, List<String> CellNumberList, String templateId) { private void handleUpdateTemplateDetail(Map<String, TemplateDetailBasicEntity> basic, List<String> CellNumberList, String templateId) {
if (ObjectUtils.isEmpty(basic)) { if (ObjectUtils.isEmpty(basic)) {
return; return;
} }
List<String> removeIdList = new ArrayList<>(); List<String> removeIdList = new ArrayList<>();
List<TemplateDetailEntity> updateList = new ArrayList<>(); List<TemplateDetailBasicEntity> updateList = new ArrayList<>();
List<TemplateDetailEntity> insertList = new ArrayList<>(); List<TemplateDetailBasicEntity> insertList = new ArrayList<>();
for (String cellNumber : CellNumberList) { for (String cellNumber : CellNumberList) {
if (basic.containsKey(cellNumber)) { if (basic.containsKey(cellNumber)) {
TemplateDetailEntity templateDetail = basic.get(cellNumber); TemplateDetailBasicEntity templateDetail = basic.get(cellNumber);
updateList.add(templateDetail); updateList.add(templateDetail);
} else { } else {
removeIdList.add(cellNumber); removeIdList.add(cellNumber);
...@@ -131,19 +130,19 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -131,19 +130,19 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
} }
//删除旧数据 //删除旧数据
if (!ObjectUtils.isEmpty(removeIdList)) { if (!ObjectUtils.isEmpty(removeIdList)) {
templateDetailService.removeByCellNumber(removeIdList, templateId); templateDetailBasicService.removeByCellNumber(removeIdList, templateId);
} }
//更新数据 //更新数据
templateDetailService.updateBatchById(updateList); templateDetailBasicService.updateBatchById(updateList);
//新增新数据 //新增新数据
List<String> insertIdList = getUniqueKeys(basic, CellNumberList); List<String> insertIdList = getUniqueKeys(basic, CellNumberList);
for (String cellNumber : insertIdList) { for (String cellNumber : insertIdList) {
TemplateDetailEntity templateDetail = basic.get(cellNumber); TemplateDetailBasicEntity templateDetail = basic.get(cellNumber);
templateDetail.setTemplateId(templateId); templateDetail.setTemplateId(templateId);
insertList.add(templateDetail); insertList.add(templateDetail);
} }
if (!ObjectUtils.isEmpty(insertList)) { if (!ObjectUtils.isEmpty(insertList)) {
templateDetailService.saveBatch(insertList); templateDetailBasicService.saveBatch(insertList);
} }
} }
...@@ -172,15 +171,15 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -172,15 +171,15 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Override @Override
public TemplateVO getTemplateDetail(String id) { public TemplateVO getTemplateDetail(String id) {
Map<String, TemplateDetailEntity> basic = new HashMap<>(); Map<String, TemplateDetailBasicEntity> basic = new HashMap<>();
Map<String, TemplateExpansionEntity> expansion = new HashMap<>(); Map<String, TemplateExpansionEntity> expansion = new HashMap<>();
TemplateVO result = baseMapper.getTemplateDetail(id); TemplateVO result = baseMapper.getTemplateDetail(id);
//查询模板详情 //查询模板详情
List<TemplateDetailEntity> templateDetailList = templateDetailService List<TemplateDetailBasicEntity> templateDetailList = templateDetailBasicService
.list(new LambdaQueryWrapper<TemplateDetailEntity>() .list(new LambdaQueryWrapper<TemplateDetailBasicEntity>()
.eq(TemplateDetailEntity::getTemplateId, id)); .eq(TemplateDetailBasicEntity::getTemplateId, id));
for (TemplateDetailEntity templateDetailEntity : templateDetailList) { for (TemplateDetailBasicEntity templateDetailBasicEntity : templateDetailList) {
basic.put(templateDetailEntity.getLocation(), templateDetailEntity); basic.put(templateDetailBasicEntity.getLocation(), templateDetailBasicEntity);
} }
//查询模板拓展 //查询模板拓展
List<TemplateExpansionEntity> templateExpansionList = templateExpansionService List<TemplateExpansionEntity> templateExpansionList = templateExpansionService
...@@ -197,7 +196,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt ...@@ -197,7 +196,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, TemplateEnt
@Override @Override
@Transactional @Transactional
public Boolean deleteTemplate(String id) { public Boolean deleteTemplate(String id) {
templateDetailService.remove(new LambdaQueryWrapper<TemplateDetailEntity>().eq(TemplateDetailEntity::getTemplateId, 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));
return removeById(id); return removeById(id);
} }
......
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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.TemplateDetailBasicMapper">
<select id="getCellNumberList" resultType="java.lang.String"> <select id="getCellNumberList" resultType="java.lang.String">
select select
location location
......
<?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.TemplateDetailMergeMapper">
</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