fix: 标签移除后再打同名标签不再撞唯一键

This commit is contained in:
2026-10-10 16:41:27 +08:00
parent 4b30c88b7f
commit 02d5c24946
3 changed files with 89 additions and 11 deletions
@@ -7,6 +7,7 @@ import com.guo.learningprogresstracker.entity.MarkerEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.Collection;
import java.util.List;
@@ -31,6 +32,34 @@ public interface MarkerMapper extends BaseMapper<MarkerEntity> {
""")
List<MarkerUsage> selectUserTagUsage(@Param("createdBy") String createdBy);
/**
* 按对象 + 标签名取用户标签,<b>含已逻辑删除的行</b>。
*
* <p>唯一键 {@code uk_markers_object_marker} 不含 {@code deleted},被逻辑删除的行仍然占着这个键,
* 所以「移除某标签后再给同一对象打同名标签」不能直接 insert,必须复用(复活)旧行。
* 自定义 SQL 不会被 {@code @TableLogic} 追加 {@code deleted = 0};
* 租户条件 {@code created_by} 仍由 {@code TenantLineInnerInterceptor} 自动追加。</p>
*/
@Select("""
SELECT * FROM markers
WHERE object_type = #{objectType}
AND object_num = #{objectNum}
AND kind = #{kind}
AND marker_name = #{markerName}
LIMIT 1
""")
MarkerEntity selectAnyByObjectAndName(@Param("objectType") String objectType,
@Param("objectNum") String objectNum,
@Param("kind") String kind,
@Param("markerName") String markerName);
/**
* 复用(复活)一条已逻辑删除的标记:把 {@code deleted} 归零。
* <p>避免重新插入时与被逻辑删除的同名行撞唯一键。租户条件由拦截器自动追加。</p>
*/
@Update("UPDATE markers SET deleted = 0, last_modified_time = now() WHERE id = #{id}")
int revive(@Param("id") Integer id);
/**
* 按标签集合统计每个碎片命中的标签数(闭环-04 标签导图取材)。
*
@@ -29,7 +29,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.List;
import java.util.stream.Collectors;
/**
@@ -83,17 +83,21 @@ public class MarkerServiceImpl implements MarkerService {
String name = normalizeTagName(markerName);
String num = normalizeObjectNum(objectNum, objectType);
// 幂等:同一对象上同名同类同值的标记只保留一条
Optional<MarkerEntity> existing = markerMapper.selectList(Wrappers.<MarkerEntity>lambdaQuery()
.eq(MarkerEntity::getObjectType, objectType.name())
.eq(MarkerEntity::getObjectNum, num)
.eq(MarkerEntity::getKind, MarkerKindEnum.USER.name())
.eq(MarkerEntity::getMarkerName, name)
.last("LIMIT 1"))
.stream().findFirst();
if (existing.isPresent()) {
// 幂等:同一对象上同名同类同值的标记只保留一条。
// 查的时候要带上已逻辑删除的行:唯一键不含 deleted,被删掉的行仍占着这个键,
// 直接 insert 会撞唯一键(移除标签后再打同名标签、或删掉自动任务名标签后重新归类都会走到)。
MarkerEntity existing = markerMapper.selectAnyByObjectAndName(
objectType.name(), num, MarkerKindEnum.USER.name(), name);
if (existing != null) {
if (existing.getDeleted() == null || existing.getDeleted() == 0) {
ensureDictionaryEntry(name);
return existing;
}
markerMapper.revive(existing.getId());
ensureDictionaryEntry(name);
return existing.get();
// 碎片多了一个标签 → 相关标签导图置「待更新」(闭环-04,不自动重建)
markTagMindMapsStale(objectType, List.of(name));
return markerMapper.selectById(existing.getId());
}
MarkerEntity marker = new MarkerEntity();